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>
This commit is contained in:
parent
eeded812f7
commit
7c6e859ccf
|
@ -180,7 +180,16 @@ set(PROJECT_MAJOR_VERSION 2)
|
||||||
set(PROJECT_MINOR_VERSION 1)
|
set(PROJECT_MINOR_VERSION 1)
|
||||||
set(PROJECT_PATCH_VERSION 0)
|
set(PROJECT_PATCH_VERSION 0)
|
||||||
set(PROJECT_BUILD_VERSION ${GIT_REVISION})
|
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}")
|
set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
|
||||||
|
|
||||||
# Banner shown at top right of Qt welcome screen.
|
# Banner shown at top right of Qt welcome screen.
|
||||||
|
|
|
@ -8,8 +8,9 @@
|
||||||
m4_define([version_major], [2])
|
m4_define([version_major], [2])
|
||||||
m4_define([version_minor], [1])
|
m4_define([version_minor], [1])
|
||||||
m4_define([version_micro], [0])
|
m4_define([version_micro], [0])
|
||||||
m4_define([version_micro_extra], version_micro)
|
dnl Updated by make-version.pl
|
||||||
m4_append([version_micro_extra], [])
|
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/)
|
AC_INIT(wireshark, [version_major.version_minor.version_micro_extra], http://bugs.wireshark.org/, , http://www.wireshark.org/)
|
||||||
CONFIG_ARGS="$*"
|
CONFIG_ARGS="$*"
|
||||||
|
|
|
@ -421,8 +421,8 @@ sub update_cmakelists_txt
|
||||||
$line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_pref{"version_minor"});
|
$line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_pref{"version_minor"});
|
||||||
} elsif ($line =~ /^set *\( *PROJECT_PATCH_VERSION .*([\r\n]+)$/) {
|
} elsif ($line =~ /^set *\( *PROJECT_PATCH_VERSION .*([\r\n]+)$/) {
|
||||||
$line = sprintf("set(PROJECT_PATCH_VERSION %d)$1", $version_pref{"version_micro"});
|
$line = sprintf("set(PROJECT_PATCH_VERSION %d)$1", $version_pref{"version_micro"});
|
||||||
} elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION.*([\r\n]+)$/) {
|
} elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION\b.*\) *$/) {
|
||||||
$line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $cmake_package_string);
|
$line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")\n", $cmake_package_string);
|
||||||
}
|
}
|
||||||
$contents .= $line
|
$contents .= $line
|
||||||
}
|
}
|
||||||
|
@ -452,8 +452,8 @@ sub update_configure_ac
|
||||||
$line = sprintf("m4_define([version_minor], [%d])$1", $version_pref{"version_minor"});
|
$line = sprintf("m4_define([version_minor], [%d])$1", $version_pref{"version_minor"});
|
||||||
} elsif ($line =~ /^m4_define\( *\[?version_micro\]? *,.*([\r\n]+)$/) {
|
} elsif ($line =~ /^m4_define\( *\[?version_micro\]? *,.*([\r\n]+)$/) {
|
||||||
$line = sprintf("m4_define([version_micro], [%d])$1", $version_pref{"version_micro"});
|
$line = sprintf("m4_define([version_micro], [%d])$1", $version_pref{"version_micro"});
|
||||||
} elsif ($line =~ /^m4_append\( *\[?version_micro_extra\]? *,.*([\r\n]+)$/) {
|
} elsif ($line =~ /^m4_define\( *\[?version_extra\]? *,.*([\r\n]+)$/) {
|
||||||
$line = sprintf("m4_append([version_micro_extra], [%s])$1", $package_string);
|
$line = sprintf("m4_define([version_extra], [%s])$1", $package_string);
|
||||||
}
|
}
|
||||||
$contents .= $line
|
$contents .= $line
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue