diff options
author | Davide Beatrici <git@davidebeatrici.dev> | 2021-01-06 21:42:48 +0300 |
---|---|---|
committer | Davide Beatrici <git@davidebeatrici.dev> | 2021-01-06 21:42:48 +0300 |
commit | 27471118b58e281d305cc95eda8a262dbbd19bd5 (patch) | |
tree | 8ef1dbe7b87662b7c947564027e0a1455b825b67 /overlay | |
parent | fe086b41d83d6f488b5b91167c806a87094e32c0 (diff) |
BUILD(versioning): Make use of the 4th part (build/tweak) of the version
The build number can be specified through the new "BUILD_NUMBER" variable.
This change is very important on Windows, for two reasons:
- It allows to easily identify binaries simply by looking at their version.
More specifically, we can guess what build they're part of.
- Right now snapshots can not be updated without uninstalling first, because the version is the same (i.e. 1.4.0).
By increasing the 4th digit of the version for every build we can solve the issue.
This commit also takes care of renaming a few variables so that they're consistent and also clearer.
For example, "version" is now "RELEASE_ID".
Diffstat (limited to 'overlay')
-rw-r--r-- | overlay/CMakeLists.txt | 2 | ||||
-rw-r--r-- | overlay/mumble_ol.rc.in | 4 | ||||
-rw-r--r-- | overlay/overlay_exe/overlay_exe.rc.in | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt index 7dc197699..733f7e450 100644 --- a/overlay/CMakeLists.txt +++ b/overlay/CMakeLists.txt @@ -162,6 +162,7 @@ if(64_BIT AND MSVC) "-DCMAKE_CXX_COMPILER=cl.exe" "-DBUILD_OVERLAY_XCOMPILE=ON" "-Dsymbols=${symbols}" + "-Dversion=${PROJECT_VERSION}" ${CMAKE_SOURCE_DIR}/overlay CMAKE_GENERATOR_PLATFORM "Win32" WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/overlay/overlay_xcompile-prefix @@ -184,6 +185,7 @@ if(64_BIT AND MSVC) "-DCMAKE_CXX_COMPILER=cl.exe" "-DBUILD_OVERLAY_XCOMPILE=ON" "-Dsymbols=${symbols}" + "-Dversion=${PROJECT_VERSION}" ${CMAKE_SOURCE_DIR}/overlay WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/overlay/overlay_xcompile-prefix INSTALL_COMMAND "" diff --git a/overlay/mumble_ol.rc.in b/overlay/mumble_ol.rc.in index 065d64cf0..736e8b561 100644 --- a/overlay/mumble_ol.rc.in +++ b/overlay/mumble_ol.rc.in @@ -18,8 +18,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 - PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 + FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@PROJECT_VERSION_TWEAK@ + PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@PROJECT_VERSION_TWEAK@ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 diff --git a/overlay/overlay_exe/overlay_exe.rc.in b/overlay/overlay_exe/overlay_exe.rc.in index b3ab0ace5..d88dda921 100644 --- a/overlay/overlay_exe/overlay_exe.rc.in +++ b/overlay/overlay_exe/overlay_exe.rc.in @@ -18,8 +18,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 - PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 + FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@PROJECT_VERSION_TWEAK@ + PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@PROJECT_VERSION_TWEAK@ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS (VER_DEBUG|VER_RELEASE) FILEOS VOS_NT_WINDOWS32 |