Skip to content

Add forced-version string override for releases and packaging #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add forced-version string override for releases and packaging #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ asan-build
release-nodebug-build
debug-noopt-build
release-asan-build
release-info.cmake
43 changes: 28 additions & 15 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,35 @@ endif()
# Git is used for git-describe based version generation if we have it
find_package(Git)

#Set up versioning (with a dummy string for now if Git isn't present)
if(Git_FOUND)
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --always --tags
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE NGSCOPECLIENT_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
message("Git reports scopehal-apps version ${NGSCOPECLIENT_VERSION}")


execute_process(
COMMAND ${GIT_EXECUTABLE} describe --always --tags --long
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE NGSCOPECLIENT_VERSION_LONG
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/release-info.cmake")
message("Release-info file is present")
include("${CMAKE_CURRENT_SOURCE_DIR}/release-info.cmake")
endif ()

#Set up versioning (with a dummy string for now if Git isn't present)
if(Git_FOUND OR NGSCOPECLIENT_PACKAGE_VERSION)
if(NOT NGSCOPECLIENT_PACKAGE_VERSION)
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --always --tags
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE NGSCOPECLIENT_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
message("Git reports scopehal-apps version ${NGSCOPECLIENT_VERSION}")
else ()
set(NGSCOPECLIENT_VERSION "${NGSCOPECLIENT_PACKAGE_VERSION}")
message("External release version is ${NGSCOPECLIENT_VERSION}")
endif ()

if(NOT NGSCOPECLIENT_PACKAGE_VERSION_LONG)
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --always --tags --long
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE NGSCOPECLIENT_VERSION_LONG
OUTPUT_STRIP_TRAILING_WHITESPACE)
else()
set(NGSCOPECLIENT_VERSION_LONG "${NGSCOPECLIENT_PACKAGE_VERSION_LONG}")
message("External long release version is ${NGSCOPECLIENT_VERSION_LONG}")
endif ()
# TODO: if/when we have a point release, make MSI version 10x+9
# ex: 0.1.2-rc2 is 0.1.22
# ex: 0.1.2 is 0.1.29
Expand Down
Loading