references #169: building interface/bril library in order to have a version check

.gitlab-ci.yml

@@ -228,6 +228,7 @@ dipbridge:
 
 oms:
   before_script:
+  - export DEPENDENCY_LIST="interface/bril"
   <<: *build_package_definition
 
 d2s/fedemulator:

interface/bril/Makefile

@@ -5,6 +5,7 @@ PROJECT_NAME=worksuite
 
 include $(XDAQ_ROOT)/$(BUILD_SUPPORT)/mfAutoconf.rules
 include $(XDAQ_ROOT)/$(BUILD_SUPPORT)/mfDefs.$(XDAQ_OS)
+include $(BUILD_HOME)/mfDefs.$(PROJECT_NAME)
 
 Project=$(PROJECT_NAME)
 Package=interface/bril
@@ -13,7 +14,10 @@ PackageName=interfacebril
 Sources=version.cc
 IncludeDirs=$(CONFIG_INCLUDE_PREFIX)
 
-# interface requires no compilation
+#
+# Compile the source files and create a shared library
+#
+DynamicLibrary=interfacebril
 
 include $(XDAQ_ROOT)/$(BUILD_SUPPORT)/Makefile.rules
 include $(XDAQ_ROOT)/$(BUILD_SUPPORT)/mfRPM.rules

interface/bril/include/interface/bril/version.h

@@ -5,7 +5,7 @@
 // !!! Edit this line to reflect the latest package version !!!
 // version definition moved to DataFormat.h to synchronize rpm and dataversion numbers
 #define BRIL_INTERFACEBRIL_VERSION_MAJOR 3
-#define BRIL_INTERFACEBRIL_VERSION_MINOR 0
+#define BRIL_INTERFACEBRIL_VERSION_MINOR 1
 #define BRIL_INTERFACEBRIL_VERSION_PATCH 0
 
 // If any previous versions available E.g. #define INTERFACEBRIL_PREVIOUS_VERSIONS "3.8.0,3.8.1"

mfDefs.worksuite

@@ -93,6 +93,7 @@ ifndef INTERFACE_BRIL_PREFIX
 INTERFACE_BRIL_PREFIX=$(BUILD_HOME)/interface/bril
 endif
 INTERFACE_BRIL_INCLUDE_PREFIX=$(INTERFACE_BRIL_PREFIX)/include $(INTERFACE_BRIL_PREFIX)/include/$(XDAQ_OS)
+INTERFACE_BRIL_LIB_PREFIX=$(INTERFACE_BRIL_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
 
 ifndef INTERFACE_DFC_PREFIX
 INTERFACE_DFC_PREFIX=$(BUILD_HOME)/interface/dfc

oms/Makefile

@@ -117,6 +117,10 @@ TestLibraryDirs = \
 	$(XOAP_LIB_PREFIX) \
 	/usr/lib64/boost169
 
+DependentLibraryDirs=$(INTERFACE_BRIL_LIB_PREFIX)
+
+DependentLibraries=interfacebril
+
 #
 # Compile the source files and create a shared library
 #

oms/include/oms/version.h

@@ -4,9 +4,9 @@
 #include "config/PackageInfo.h"
 
 #define WORKSUITE_OMS_VERSION_MAJOR 1
-#define WORKSUITE_OMS_VERSION_MINOR 0
-#define WORKSUITE_OMS_VERSION_PATCH 3
-#define WORKSUITE_OMS_PREVIOUS_VERSIONS "1.0.0,1.0.1,1.0.2"
+#define WORKSUITE_OMS_VERSION_MINOR 1
+#define WORKSUITE_OMS_VERSION_PATCH 0
+#define WORKSUITE_OMS_PREVIOUS_VERSIONS "1.0.0,1.0.1,1.0.2,1.0.3"
 
 #define WORKSUITE_OMS_VERSION_CODE PACKAGE_VERSION_CODE(WORKSUITE_OMS_VERSION_MAJOR,WORKSUITE_OMS_VERSION_MINOR,WORKSUITE_OMS_VERSION_PATCH)
 #ifndef WORKSUITE_OMS_PREVIOUS_VERSIONS