diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-04-21 00:38:20 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-04-21 18:59:40 +0000 |
| commit | 7c6e859ccf210a45e1cc0f6da17692845e6b5a23 (patch) | |
| tree | 28190bb08ca312ca86e5ab3522ac7ca381648aa7 | |
| parent | eeded812f727e6b49e5b1049640a4a29a02d0d46 (diff) | |
Add "-git" tag to version
Add a static "-git" extra version tag for VCS snapshot builds, to be
replaced when running 'make-version -r'.
Change-Id: If29fca04029ed3129aa2332492dc536091049955
Reviewed-on: https://code.wireshark.org/review/15032
Reviewed-by: João Valverde <j@v6e.pt>
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rwxr-xr-x | make-version.pl | 8 |
3 files changed, 17 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a473b67095..9a4800ae9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,7 +180,16 @@ set(PROJECT_MAJOR_VERSION 2) set(PROJECT_MINOR_VERSION 1) set(PROJECT_PATCH_VERSION 0) set(PROJECT_BUILD_VERSION ${GIT_REVISION}) -set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}") +# Updated by make-version.pl +set(PROJECT_VERSION_EXTENSION) +if(NOT DEFINED PROJECT_VERSION_EXTENSION) + if (DEFINED ENV{WIRESHARK_VERSION_EXTRA}) + set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}") + else() + set(PROJECT_VERSION_EXTENSION "-git") + endif() +endif() + set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}") # Banner shown at top right of Qt welcome screen. diff --git a/configure.ac b/configure.ac index 89b1ee48f6..07690a6d20 100644 --- a/configure.ac +++ b/configure.ac @@ -8,8 +8,9 @@ m4_define([version_major], [2]) m4_define([version_minor], [1]) m4_define([version_micro], [0]) -m4_define([version_micro_extra], version_micro) -m4_append([version_micro_extra], []) +dnl Updated by make-version.pl +m4_define([version_extra], [-git]) +m4_define([version_micro_extra], m4_join([], version_micro, version_extra)) AC_INIT(wireshark, [version_major.version_minor.version_micro_extra], http://bugs.wireshark.org/, , http://www.wireshark.org/) CONFIG_ARGS="$*" diff --git a/make-version.pl b/make-version.pl index fc1cb5709c..684581bdfe 100755 --- a/make-version.pl +++ b/make-version.pl @@ -421,8 +421,8 @@ sub update_cmakelists_txt $line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_pref{"version_minor"}); } elsif ($line =~ /^set *\( *PROJECT_PATCH_VERSION .*([\r\n]+)$/) { $line = sprintf("set(PROJECT_PATCH_VERSION %d)$1", $version_pref{"version_micro"}); - } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION.*([\r\n]+)$/) { - $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $cmake_package_string); + } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION\b.*\) *$/) { + $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")\n", $cmake_package_string); } $contents .= $line } @@ -452,8 +452,8 @@ sub update_configure_ac $line = sprintf("m4_define([version_minor], [%d])$1", $version_pref{"version_minor"}); } elsif ($line =~ /^m4_define\( *\[?version_micro\]? *,.*([\r\n]+)$/) { $line = sprintf("m4_define([version_micro], [%d])$1", $version_pref{"version_micro"}); - } elsif ($line =~ /^m4_append\( *\[?version_micro_extra\]? *,.*([\r\n]+)$/) { - $line = sprintf("m4_append([version_micro_extra], [%s])$1", $package_string); + } elsif ($line =~ /^m4_define\( *\[?version_extra\]? *,.*([\r\n]+)$/) { + $line = sprintf("m4_define([version_extra], [%s])$1", $package_string); } $contents .= $line } |