fix updater not using --stable param for stable releases

Return-To-The-Roots · Jul 22, 2021 · 7273dd8 · 7273dd8
1 parent 8fbbc1e
commit 7273dd8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,6 +56,13 @@ if(NOT RTTR_VERSION)
     string(TIMESTAMP RTTR_VERSION "%Y%m%d")
 endif()
 
+# stable build? then set rttr.bat/rttr.sh parameter
+set(STABLE_PARAM)
+if(${RTTR_VERSION} MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
+	message(STATUS "Creating a stable version ${RTTR_VERSION}")
+	set(STABLE_PARAM "--stable")
+endif()
+
 if(checkSubmodules)
     include(CheckGitSubmodules)
     check_git_submodules()
@@ -393,7 +400,7 @@ if(WIN32)
 endif()
 
 # stable build?
-if(${RTTR_VERSION} MATCHES "([0-9]+)\.([0-9]+)\.([0-9]+)")
+if(${RTTR_VERSION} MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
     set(CPACK_PACKAGE_VERSION_MAJOR "${CMAKE_MATCH_1}")
     set(CPACK_PACKAGE_VERSION_MINOR "${CMAKE_MATCH_2}")
     set(CPACK_PACKAGE_VERSION_PATCH "${CMAKE_MATCH_3}")

diff --git a/tools/release/CMakeLists.txt b/tools/release/CMakeLists.txt
@@ -2,12 +2,14 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+include(ConfigureExecutable)
+
 # Start script
 if(WIN32)
-    install(PROGRAMS "bin/rttr.bat" DESTINATION "${RTTR_BINDIR}")
+    configure_executable("bin/rttr.bat.cmake" ${CMAKE_CURRENT_BINARY_DIR} rttr.bat)
+    install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/rttr.bat" DESTINATION "${RTTR_BINDIR}")
     if(PLATFORM_ARCH)
-        include(ConfigureExecutable)
-        configure_executable("bundleWinFiles.sh.cmake" . bundleWinFiles.sh)
+        configure_executable("bundleWinFiles.sh.cmake" ${CMAKE_CURRENT_BINARY_DIR} bundleWinFiles.sh)
 
         install(CODE "
             set(ENV{CMAKE_INSTALL_PREFIX} \${CMAKE_INSTALL_PREFIX})
@@ -52,7 +54,8 @@ elseif(APPLE)
         )
     endif()
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CYGWIN)
-    install(PROGRAMS "bin/rttr.sh" DESTINATION "${RTTR_BINDIR}")
+    configure_executable("bin/rttr.sh.cmake" ${CMAKE_CURRENT_BINARY_DIR} rttr.sh)
+    install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/rttr.sh" DESTINATION "${RTTR_BINDIR}")
     # copy miniupnpc
     get_filename_component(MINIUPNPC_DIR ${MINIUPNPC_LIBRARY} DIRECTORY)
     find_library(MINIUPNPC_BIN NAMES miniupnpc.so libminiupnpc.so HINTS ${MINIUPNPC_DIR})

diff --git a/tools/release/bin/rttr.bat → tools/release/bin/rttr.bat.cmake b/tools/release/bin/rttr.bat → tools/release/bin/rttr.bat.cmake
@@ -8,7 +8,7 @@ IF EXIST RTTR\s25update.exe GOTO UPDATE
 GOTO START
 
 :UPDATE
-RTTR\s25update.exe --dir %CD%
+RTTR\s25update.exe --dir %CD% @STABLE_PARAM@
 
 :START
 s25client.exe

diff --git a/tools/release/bin/rttr.sh → tools/release/bin/rttr.sh.cmake b/tools/release/bin/rttr.sh → tools/release/bin/rttr.sh.cmake
@@ -41,7 +41,7 @@ if [ $noupdate -eq 0 ] ; then
 		echo "checking for an update ..."
 		cp $DIR/../libexec/s25rttr/s25update /tmp/s25update.$$
 		chmod 0755 /tmp/s25update.$$
-		/tmp/s25update.$$ --verbose --dir "$DIR/../"
+		/tmp/s25update.$$ --verbose --dir "$DIR/../" @STABLE_PARAM@
 		if [ -z "$(diff -q /tmp/s25update.$$ $DIR/../libexec/s25rttr/s25update)" ] ; then
 			PARAM=noupdate
 		fi