Skip to content
Snippets Groups Projects
Commit 956e7cb4 authored by Jens Georg's avatar Jens Georg
Browse files

Use Version mechanism from ApplictionCore

parent 9f715f7e
No related branches found
No related tags found
No related merge requests found
......@@ -6,8 +6,7 @@ set(${PROJECT_NAME}_MAJOR_VERSION 02)
set(${PROJECT_NAME}_MINOR_VERSION 05)
set(${PROJECT_NAME}_PATCH_VERSION 03)
include(cmake/set_version_numbers.cmake)
configure_file(version.py.in ${PROJECT_BINARY_DIR}/bam/settings/version.py)
include(cmake/config_generator_project.cmake)
include(ConfigVersion/prepare)
file(CREATE_LINK "${PROJECT_SOURCE_DIR}/shared" "${PROJECT_BINARY_DIR}/shared" SYMBOLIC)
......@@ -25,12 +25,6 @@ def getMotorForStation(station: str) -> str:
except KeyError:
return 'MOTOR_DEVICE'
def getConfigVersion() -> str:
try:
return configVersion
except NameError:
return "***UNKNOWN***"
# Names of the properties for the different flattops on the Toroid server
TOROID_FT = {
'XFEL' : ['SAMPLE.SA1', 'SAMPLE.SA2', 'SAMPLE.SA3'],
......
......@@ -19,7 +19,7 @@ except KeyError:
%>
<configuration>
<variable name="version" type="string" value="${getConfigVersion()}" />
<%include file="ConfigVersion.xml.include"/>
<module name="Motor">
<variable name="motorCount" type="int32" value="${number_of_motors}" />
<variable name="dummyMotor" type="int8" value="0" />
......
......@@ -9,7 +9,11 @@ number_of_motors = len(motors)
<has_history>false</has_history>
<location name="${MAIN_LOCATION}">
<property name="location" source="/Configuration/Server/location" />
<%include file="doocs/100-arrival-time" />
<property name="SERVER.major" source="/Application/majorVersion" />
<property name="SERVER.minor" source="/Application/minorVersion" />
<property name="SERVER.patch" source="/Application/patchVersion" />
<property name="SERVER.version" source="/Application/fullVersion" />
<%include file="doocs/100-arrival-time" />
<%include file="doocs/110-status" />
<%include file="doocs/115-health" />
<%include file="doocs/120-raw" />
......
##mako
<location name="${MAIN_LOCATION}">
<property name="location" source="/Configuration/Server/location" />
<property name="SERVER.version" source="/Versions/bamServerVersionString" />
<property name="SERVER.config" source="/Configuration/version" />
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment