Automate generation of app_info.xml

Agbar · Feb 5, 2019 · 2cd1f69 · 2cd1f69
1 parent 9ada2a9
commit 2cd1f69
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/BOINC/CMakeLists.txt b/BOINC/CMakeLists.txt
@@ -0,0 +1,7 @@
+if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+    add_subdirectory(Windows)
+elseif(CMAKE_SYSTEM_NAME STREQUAL Linux)
+    add_subdirectory(Linux)
+endif()
+
+
diff --git a/BOINC/Linux/CMakeLists.txt b/BOINC/Linux/CMakeLists.txt
@@ -0,0 +1,4 @@
+configure_file (
+    "app_info.in.xml"
+    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/app_info.xml"
+)
diff --git a/BOINC/Linux/app_info.xml → BOINC/Linux/app_info.in.xml b/BOINC/Linux/app_info.xml → BOINC/Linux/app_info.in.xml
@@ -1,12 +1,12 @@
 <app_info>
 	<app>
 		<name>enigma_m4_2</name>
-		<user_friendly_name>Enigma Optima v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<app>
 		<name>enigma_m4_3</name>
-		<user_friendly_name>Enigma Optima AV v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima AV ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<file_info>

diff --git a/BOINC/Windows/CMakeLists.txt b/BOINC/Windows/CMakeLists.txt
@@ -0,0 +1,10 @@
+if(ENIGMA_BUILD_32_BIT)
+    set(APP_INFO_FOLDER x86)
+else()
+    set(APP_INFO_FOLDER x64)
+endif()
+
+configure_file (
+    "${APP_INFO_FOLDER}/app_info.in.xml"
+    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/app_info.xml"
+)
diff --git a/BOINC/Windows/x64/app_info.xml → BOINC/Windows/x64/app_info.in.xml b/BOINC/Windows/x64/app_info.xml → BOINC/Windows/x64/app_info.in.xml
@@ -1,12 +1,12 @@
 <app_info>
 	<app>
 		<name>enigma_m4_2</name>
-		<user_friendly_name>Enigma Optima v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<app>
 		<name>enigma_m4_3</name>
-		<user_friendly_name>Enigma Optima AV v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima AV ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<file_info>

diff --git a/BOINC/Windows/x86/app_info.xml → BOINC/Windows/x86/app_info.in.xml b/BOINC/Windows/x86/app_info.xml → BOINC/Windows/x86/app_info.in.xml
@@ -1,12 +1,12 @@
 <app_info>
 	<app>
 		<name>enigma_m4_2</name>
-		<user_friendly_name>Enigma Optima v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<app>
 		<name>enigma_m4_3</name>
-		<user_friendly_name>Enigma Optima AV v1.1.0</user_friendly_name>
+		<user_friendly_name>Enigma Optima AV ${ENIGMA_GIT_DESCRIBE_VERSION}</user_friendly_name>
 		<non_cpu_intensive>0</non_cpu_intensive>
 	</app>
 	<file_info>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,12 +107,19 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU")
         -Wnon-virtual-dtor)
 endif()
 
+find_package(Git REQUIRED)
+execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty 
+    OUTPUT_VARIABLE ENIGMA_GIT_DESCRIBE_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
 add_subdirectory(libEnigma)
 
 add_subdirectory(optima)
 
 add_subdirectory(benchmark)
 
+add_subdirectory(BOINC)
+
 enable_testing()
 add_subdirectory(tests)
 

diff --git a/optima/CMakeLists.txt b/optima/CMakeLists.txt
@@ -24,11 +24,6 @@ endif()
 
 target_link_libraries(EnigmaOptima Enigma)
 
-
-find_package(Git REQUIRED)
-execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty 
-    OUTPUT_VARIABLE ENIGMA_GIT_DESCRIBE_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
 configure_file (
     "${CMAKE_CURRENT_SOURCE_DIR}/config/releaseVersion.cpp.in"
     "${CMAKE_CURRENT_SOURCE_DIR}/config/releaseVersion.cpp"