URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2ef72cb7aa87854037defa1fdb91979f01b925cb
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
2ef72cb by Gerald Combs (gerald@xxxxxxxxxxxxx):
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 <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 436a064 MP2T: restore addresses once fragments are added to the hash table
adds 2ef72cb CMake: Add a top-level nsis_package target.
Summary of changes:
CMakeLists.txt | 78 ++++-
Makefile.nmake | 2 +-
cmake/modules/FindNSIS.cmake | 15 +
cmake/modules/WiresharkPlugin.cmake | 1 +
make-version.pl | 5 +-
packaging/nsis/CMakeLists.txt | 234 +++++++++++++++
packaging/nsis/Makefile.nmake | 32 +-
packaging/nsis/common.nsh | 4 +
packaging/nsis/config.nsh.in | 93 +-----
packaging/nsis/uninstall.nsi | 2 +-
packaging/nsis/wireshark.nsi | 566 +++++++++++++++++------------------
plugins/Makefile.nmake | 5 +-
ui/qt/Wireshark.pro | 4 +-
13 files changed, 639 insertions(+), 402 deletions(-)
create mode 100644 cmake/modules/FindNSIS.cmake
create mode 100644 packaging/nsis/CMakeLists.txt