diff options
| author | Gerald Combs <gerald@wireshark.org> | 2022-07-04 17:40:26 -0500 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2022-07-05 15:00:06 +0000 |
| commit | f17d39db1e716a7a4ec9b344ed4ad07c37bcafe6 (patch) | |
| tree | e40c864dd91b0734e45a040d836d1a2869f39d54 /tools | |
| parent | 5e3a7e9ab8f4e5cabf2c0aec5039b74e2583810f (diff) | |
CMake+tools: Clean up our build version variables.
In the top-level CMakeLists.txt, fill in PROJECT_BUILD_VERSION directly.
Clean up the WiX PRODUCT_VERSION variable.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/make-version.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/make-version.pl b/tools/make-version.pl index c4bdeebc8b..121fe1e18e 100755 --- a/tools/make-version.pl +++ b/tools/make-version.pl @@ -318,10 +318,10 @@ Fin # Read CMakeLists.txt, then write it back out with updated "set(PROJECT_..._VERSION ...) # lines -# set(GIT_REVISION 999) # set(PROJECT_MAJOR_VERSION 1) # set(PROJECT_MINOR_VERSION 99) # set(PROJECT_PATCH_VERSION 0) +# set(PROJECT_BUILD_VERSION 999) # set(PROJECT_VERSION_EXTENSION "-rc5") sub update_cmakelists_txt { @@ -334,14 +334,14 @@ sub update_cmakelists_txt open(CFGIN, "< $filepath") || die "Can't read $filepath!"; while ($line = <CFGIN>) { - if ($line =~ /^set *\( *GIT_REVISION .*?([\r\n]+)$/) { - $line = sprintf("set(GIT_REVISION %d)$1", $num_commits); - } elsif ($line =~ /^set *\( *PROJECT_MAJOR_VERSION .*?([\r\n]+)$/) { + if ($line =~ /^set *\( *PROJECT_MAJOR_VERSION .*?([\r\n]+)$/) { $line = sprintf("set(PROJECT_MAJOR_VERSION %d)$1", $version_major); } elsif ($line =~ /^set *\( *PROJECT_MINOR_VERSION .*?([\r\n]+)$/) { $line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_minor); } elsif ($line =~ /^set *\( *PROJECT_PATCH_VERSION .*?([\r\n]+)$/) { $line = sprintf("set(PROJECT_PATCH_VERSION %d)$1", $version_micro); + } elsif ($line =~ /^set *\( *PROJECT_BUILD_VERSION .*?([\r\n]+)$/) { + $line = sprintf("set(PROJECT_BUILD_VERSION %d)$1", $num_commits); } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION .*?([\r\n]+)$/) { $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $package_string); } |