Skip to content

Commit

Permalink
BF: disabled autoupdate of version string in installer
Browse files Browse the repository at this point in the history
  • Loading branch information
ernst-bablick committed Jan 18, 2025
1 parent d586dbf commit b29234d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ string(REGEX REPLACE "#define OCS_VERSION_PATCH ([0-9]*)" "\\1" VERSION_PATCH "$
string(REGEX REPLACE "#define OCS_VERSION_SUFFIX \"([a-z0-0\-]*)\"" "\\1" VERSION_SUFFIX "${VERSION_SUFFIX}")

# Set the version string and use it to set the version within inst_sge
set(OCS_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}")
configure_file(
"${CMAKE_SOURCE_DIR}/source/dist/inst_sge.in"
"${CMAKE_SOURCE_DIR}/source/dist/inst_sge"
@ONLY
)
#set(OCS_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}")
#configure_file(
# "${CMAKE_SOURCE_DIR}/source/dist/inst_sge.in"
# "${CMAKE_SOURCE_DIR}/source/dist/inst_sge"
# @ONLY
#)

# Set the version string and use it also for the cmake project
project(
Expand Down
2 changes: 1 addition & 1 deletion source/dist/inst_sge
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# set -x

SCRIPT_VERSION="9"
SGE_VERSION="9.0.3alpha"
SGE_VERSION="9.0.2"

#Reset PATH to a safe value
#
Expand Down
4 changes: 2 additions & 2 deletions source/libs/sgeobj/ocs_Version.cc
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
// CMakeList.txt and dist/inst_sge will be updated automatically during the next cmake run
#define OCS_VERSION_MAJOR 9
#define OCS_VERSION_MINOR 0
#define OCS_VERSION_PATCH 3
#define OCS_VERSION_SUFFIX "alpha"
#define OCS_VERSION_PATCH 2
#define OCS_VERSION_SUFFIX ""

const std::string ocs::Version::OCS_VERSION_STRING = std::to_string(OCS_VERSION_MAJOR) + "."
+ std::to_string(OCS_VERSION_MINOR) + "." + std::to_string(OCS_VERSION_PATCH) + OCS_VERSION_SUFFIX;
Expand Down

0 comments on commit b29234d

Please sign in to comment.