From 2ef72cb7aa87854037defa1fdb91979f01b925cb Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 6 Jan 2015 15:07:50 -0800 Subject: CMake: Add a top-level nsis_package target. Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- make-version.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'make-version.pl') diff --git a/make-version.pl b/make-version.pl index 53d3094364..00452c5856 100755 --- a/make-version.pl +++ b/make-version.pl @@ -380,6 +380,7 @@ 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) @@ -398,7 +399,9 @@ sub update_cmakelists_txt open(CFGIN, "< $filepath") || die "Can't read $filepath!"; while ($line = ) { - if ($line =~ /^set *\( *PROJECT_MAJOR_VERSION .*([\r\n]+)$/) { + if ($line =~ /^set *\( *GIT_REVISION .*([\r\n]+)$/) { + $line = sprintf("set(GIT_REVISION %d)$1", $num_commits); + } elsif ($line =~ /^set *\( *PROJECT_MAJOR_VERSION .*([\r\n]+)$/) { $line = sprintf("set(PROJECT_MAJOR_VERSION %d)$1", $version_pref{"version_major"}); } elsif ($line =~ /^set *\( *PROJECT_MINOR_VERSION .*([\r\n]+)$/) { $line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_pref{"version_minor"}); -- cgit v1.2.1