osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/packaging/nsis/CMakeLists.txt

242 lines
8.9 KiB
CMake
Raw Normal View History

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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
# CMakeLists.txt
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
spdx: more licenses converted. Change-Id: Ia1650bc02511f7bd47fb90be91b623177f05bcbd Reviewed-on: https://code.wireshark.org/review/26337 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07 14:28:51 +00:00
# SPDX-License-Identifier: GPL-2.0-or-later
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
#
# We should use CPack to generate the NSIS package. Even better,
# we should use CPack to create a .msi using WIX.
CMake: Initial PortableApps targets. Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 19:55:42 +00:00
set(NSIS_GENERATED_FILES
${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh
${CMAKE_CURRENT_BINARY_DIR}/config.nsh
${CMAKE_CURRENT_BINARY_DIR}/qt-dll-manifest.nsh
)
CMake: Fix an NSIS dependency. Change-Id: I514243727da1fed52c78a4cbd8c82c68bf724c8a Reviewed-on: https://code.wireshark.org/review/8070 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14 21:34:00 +00:00
set(NSIS_GENERATED_FILES ${NSIS_GENERATED_FILES} PARENT_SCOPE)
CMake: Initial PortableApps targets. Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 19:55:42 +00:00
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
set(NSIS_FILES
wireshark.nsi
uninstall.nsi
common.nsh
GetWindowsVersion.nsh
servicelib.nsh
AdditionalTasksPage.ini
NSIS: Install NPcap instead of WinPcap. Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update and/or remove installer text, variables, and variable names accordingly. Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f Reviewed-on: https://code.wireshark.org/review/30829 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-29 01:08:27 +00:00
NpcapPage.ini
Add USBPcapPage.ini file to distribution Change-Id: I05ed2c561818fd4293543199063551dd65fb5c55 Reviewed-on: https://code.wireshark.org/review/10871 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-08 05:29:25 +00:00
USBPcapPage.ini
CMake: Initial PortableApps targets. Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 19:55:42 +00:00
${NSIS_GENERATED_FILES}
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
PARENT_SCOPE
)
# Variables required for config.nsh
set(PROGRAM_NAME ${CMAKE_PROJECT_NAME})
file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}" TOP_SRC_DIR)
# STAGING_DIR depends on the build configuration so we pass it
# on the command line below.
Convert the FAQ to Asciidoctor and remove old help files. Convert our self-generating FAQ to Asciidoctor via the following steps: - `help/faq.py > /tmp/faq.html`. - `pandoc -t asciidoc -o docbook/faq.adoc /tmp/faq.html`. - Manually clean up the markup using a text editor. Question and answer content was left intact. Removing or updating obsolete content will have to be done in a separate change. The Asciidoctor project uses the .adoc extension, so start using it here as well. The contents of the "help" directory appear to have been used for offline support in help_url.c, but that functionality was removed in 2008 in 242e3b78bc. Its content is covered in the User's Guide and man pages so remove it. Change-Id: I9060eefe97cfc137f8b414077c30f814379b576a Reviewed-on: https://code.wireshark.org/review/32014 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-11 22:24:18 +00:00
file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/docbook" DOCBOOK_DIR)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(WIRESHARK_TARGET_PLATFORM STREQUAL "win32")
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
set(TARGET_MACHINE x86)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
elseif(WIRESHARK_TARGET_PLATFORM STREQUAL "win64")
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
set(TARGET_MACHINE x64)
else()
message(FATAL_ERROR "Your mysterious moon-man architecture \"${WIRESHARK_TARGET_PLATFORM}\" frightens and confuses us.")
endif()
Add MaxMindDB 1.3.2 library to Windows Change-Id: I328b6a05cc356be59ac63e80eae55a832bf76a47 Reviewed-on: https://code.wireshark.org/review/26347 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-07 21:10:31 +00:00
set (MMDBRESOLVE_EXE ${MAXMINDDB_FOUND})
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
NSIS: Install NPcap instead of WinPcap. Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update and/or remove installer text, variables, and variable names accordingly. Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f Reviewed-on: https://code.wireshark.org/review/30829 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-29 01:08:27 +00:00
# Path to the Npcap installer.
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
# XXX Come up with a better variable, e.g. cache WIRESHARK_LIB_DIR in FindWSWinLibs.
file(TO_NATIVE_PATH "${GLIB2_DLL_DIR}/../.." _wireshark_lib_dir)
set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}")
NSIS: Install NPcap instead of WinPcap. Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update and/or remove installer text, variables, and variable names accordingly. Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f Reviewed-on: https://code.wireshark.org/review/30829 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-29 01:08:27 +00:00
# Must match ${WIRESHARK_LIB_DIR}/Npcap-X.Y.Z.exe
Windows: upgrade Npcap to 0.99-r9 Change-Id: Ie2b90a448415d7b8637aac03cee07fa9e5ab217f Reviewed-on: https://code.wireshark.org/review/31691 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2019-01-23 11:09:43 +00:00
set(NPCAP_PACKAGE_VERSION "0.99-r9")
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
NSIS: Install NPcap instead of WinPcap. Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update and/or remove installer text, variables, and variable names accordingly. Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f Reviewed-on: https://code.wireshark.org/review/30829 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-29 01:08:27 +00:00
set(USBPCAP_PACKAGE_VERSION "1.2.0.4")
Blind attempt trying to fix CMake based installer Looks like Petri-Dish does not generate it Change-Id: I90823d82ac9d223d840ab20331a856550dffdc87 Reviewed-on: https://code.wireshark.org/review/10872 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-08 05:48:50 +00:00
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})
# To do:
Remove Nmake build system Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-08 13:57:00 +00:00
# - Sync the various version names between CMake and NSIS.
Move make-version.pl to tools. Move make-version.pl to the tools directory. Change-Id: I7c3ec8951a682d45d650e3fdb1580d90bf19e8b4 Reviewed-on: https://code.wireshark.org/review/31473 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-09 22:47:02 +00:00
# - Set CMakeLists.txt version strings in tools/make-version.pl
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
# - Add a VERSION_EXTRA cmake option
set (VERSION "${PROJECT_VERSION}")
set (PRODUCT_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUILD})
#add_custom_target(build_nsis_package
# DEPENDS
# wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
#)
if(BUILD_wireshark AND QT_FOUND)
set (QT_DIR "\${STAGING_DIR}")
endif()
CMake: Look for vcredist_x??.exe in more places. Look for the redistributable installer in the project library directory before %VCINSTALLDIR%. This lets us ship a specific version of the redistributable. Change-Id: I70e5aa90ac5addba5355d1964aeb50e277d1a8d4 Ping-Bug: 12712 Reviewed-on: https://code.wireshark.org/review/16922 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 22:39:26 +00:00
# Look for the Visual C++ Redistributable packages in the following locations:
# - _PROJECT_LIB_DIR
# - _PROJECT_LIB_DIR/vcredist_MSVCxx
# - %VCINSTALLDIR%
NSIS: Add support for Visual Studio 2017. Also fixes a bug where vcredist was found in C:\Program Files\Wireshark Change-Id: I0bc5c7410a95677d21c2e28ba66d6a9d186fe2a9 Reviewed-on: https://code.wireshark.org/review/22044 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-08 17:39:05 +00:00
# - %VCINSTALLDIR%/redist/1033 (<= Visual Studio 2015)
# - %VCINSTALLDIR%/Redist/MSVC/* (>= Visual Studio 2017)
NSIS: try harder to find VS2015/VS2017 vcredist The vcredist version (directory name) has changed. Instead of listing all possible versions, just glob for it. I only observed a single directory anyway. As CMake can find compilers without vcvarsall.bat, it is possible that env var VCINSTALLDIR is not set. Fallback to querying the location from the registry (as was done in VS2015). The MSVC_VERSION/VS/VCRT table is partially based on https://blogs.msdn.microsoft.com/vcblog/2017/11/15/side-by-side-minor-version-msvc-toolsets-in-visual-studio-2017/ Change-Id: I58107597c5037ab597a0d620925cb870e6ef7793 Reviewed-on: https://code.wireshark.org/review/28980 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-08-05 17:44:02 +00:00
# MSVC_VERSION (_MSC_VER) = Visual Studio Version / MSVC Toolset Version
# 1900 = VS2015 14.0 / 14.00
# 1910 = VS2017 15.1, 15.2 / 14.10
# 1911 = VS2017 15.3, 15.4 / 14.11
# 1912 = VS2017 15.5 / 14.12
# 1913 = VS2017 15.6 / 14.13
# 1914 = VS2017 15.7 / 14.14
[MSVC2015] Fix finding of vcredist when using MSVC2015. Change-Id: I23ddc8c7601e61c7c092a258e4e540bc475e020a Reviewed-on: https://code.wireshark.org/review/14831 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-06 15:25:18 +00:00
set(_vcredist_name "vcredist_${TARGET_MACHINE}.exe")
NSIS: Add support for Visual Studio 2017. Also fixes a bug where vcredist was found in C:\Program Files\Wireshark Change-Id: I0bc5c7410a95677d21c2e28ba66d6a9d186fe2a9 Reviewed-on: https://code.wireshark.org/review/22044 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-08 17:39:05 +00:00
if(MSVC_VERSION GREATER_EQUAL 1910)
set(_ws_vcredist_subdir "vcredist_MSVC2017")
NSIS: try harder to find VS2015/VS2017 vcredist The vcredist version (directory name) has changed. Instead of listing all possible versions, just glob for it. I only observed a single directory anyway. As CMake can find compilers without vcvarsall.bat, it is possible that env var VCINSTALLDIR is not set. Fallback to querying the location from the registry (as was done in VS2015). The MSVC_VERSION/VS/VCRT table is partially based on https://blogs.msdn.microsoft.com/vcblog/2017/11/15/side-by-side-minor-version-msvc-toolsets-in-visual-studio-2017/ Change-Id: I58107597c5037ab597a0d620925cb870e6ef7793 Reviewed-on: https://code.wireshark.org/review/28980 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-08-05 17:44:02 +00:00
set(_msvs_version 15.0)
NSIS: Add support for Visual Studio 2017. Also fixes a bug where vcredist was found in C:\Program Files\Wireshark Change-Id: I0bc5c7410a95677d21c2e28ba66d6a9d186fe2a9 Reviewed-on: https://code.wireshark.org/review/22044 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-08 17:39:05 +00:00
elseif(MSVC_VERSION GREATER_EQUAL 1900)
set(_ws_vcredist_subdir "vcredist_MSVC2015")
set(_ms_vcredist_subdir "redist/1033")
NSIS: try harder to find VS2015/VS2017 vcredist The vcredist version (directory name) has changed. Instead of listing all possible versions, just glob for it. I only observed a single directory anyway. As CMake can find compilers without vcvarsall.bat, it is possible that env var VCINSTALLDIR is not set. Fallback to querying the location from the registry (as was done in VS2015). The MSVC_VERSION/VS/VCRT table is partially based on https://blogs.msdn.microsoft.com/vcblog/2017/11/15/side-by-side-minor-version-msvc-toolsets-in-visual-studio-2017/ Change-Id: I58107597c5037ab597a0d620925cb870e6ef7793 Reviewed-on: https://code.wireshark.org/review/28980 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-08-05 17:44:02 +00:00
set(_msvs_version 14.0)
endif()
# Try to find the Redist folder in VCINSTALLDIR which is set by vcvarsall.bat.
# If it is not set, query it within the registry. VS2015 looks for the "VC7" key
# in two locations (four if you count HKCU instead of HKLM). However, VS2017
# does not use "VC7" (it sets a directory relative to vsdevcmd_start.bat). As
# both versions do set "VS7", use that instead.
find_path(VCINSTALLDIR Redist PATHS
"$ENV{VCINSTALLDIR}"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;${_msvs_version}]\\VC"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Microsoft\\VisualStudio\\SxS\\VS7;${_msvs_version}]\\VC"
NO_DEFAULT_PATH
)
CMake output: Show Windows paths for the VC redist files Purely cosmetic, show the various VC redist paths using the native format. Change-Id: I96d0b088f703e3e8dea6623ec258139eff066d90 Reviewed-on: https://code.wireshark.org/review/31251 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-29 19:51:08 +00:00
file(TO_NATIVE_PATH "${VCINSTALLDIR}" VCINSTALLDIR_NATIVE)
message(STATUS "Using VCINSTALLDIR: ${VCINSTALLDIR_NATIVE}")
NSIS: try harder to find VS2015/VS2017 vcredist The vcredist version (directory name) has changed. Instead of listing all possible versions, just glob for it. I only observed a single directory anyway. As CMake can find compilers without vcvarsall.bat, it is possible that env var VCINSTALLDIR is not set. Fallback to querying the location from the registry (as was done in VS2015). The MSVC_VERSION/VS/VCRT table is partially based on https://blogs.msdn.microsoft.com/vcblog/2017/11/15/side-by-side-minor-version-msvc-toolsets-in-visual-studio-2017/ Change-Id: I58107597c5037ab597a0d620925cb870e6ef7793 Reviewed-on: https://code.wireshark.org/review/28980 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-08-05 17:44:02 +00:00
# Visual Studio Community 2017 version 15.7.5 uses VCRT 14.14.26405, but an
# earlier version used 14.10.25008. Let's just glob for the right value.
if(MSVC_VERSION GREATER_EQUAL 1910 AND VCINSTALLDIR)
file(GLOB _ms_vcredist_subdir RELATIVE "${VCINSTALLDIR}"
"${VCINSTALLDIR}/Redist/MSVC/14.*.*")
CMake: Look for vcredist_x??.exe in more places. Look for the redistributable installer in the project library directory before %VCINSTALLDIR%. This lets us ship a specific version of the redistributable. Change-Id: I70e5aa90ac5addba5355d1964aeb50e277d1a8d4 Ping-Bug: 12712 Reviewed-on: https://code.wireshark.org/review/16922 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 22:39:26 +00:00
endif()
[MSVC2015] Fix finding of vcredist when using MSVC2015. Change-Id: I23ddc8c7601e61c7c092a258e4e540bc475e020a Reviewed-on: https://code.wireshark.org/review/14831 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-06 15:25:18 +00:00
find_program(VCREDIST_EXE "${_vcredist_name}"
NSIS: try harder to find VS2015/VS2017 vcredist The vcredist version (directory name) has changed. Instead of listing all possible versions, just glob for it. I only observed a single directory anyway. As CMake can find compilers without vcvarsall.bat, it is possible that env var VCINSTALLDIR is not set. Fallback to querying the location from the registry (as was done in VS2015). The MSVC_VERSION/VS/VCRT table is partially based on https://blogs.msdn.microsoft.com/vcblog/2017/11/15/side-by-side-minor-version-msvc-toolsets-in-visual-studio-2017/ Change-Id: I58107597c5037ab597a0d620925cb870e6ef7793 Reviewed-on: https://code.wireshark.org/review/28980 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-08-05 17:44:02 +00:00
PATHS "${_PROJECT_LIB_DIR}" $ENV{VCToolsRedistDir} "${VCINSTALLDIR}"
NSIS: Add support for Visual Studio 2017. Also fixes a bug where vcredist was found in C:\Program Files\Wireshark Change-Id: I0bc5c7410a95677d21c2e28ba66d6a9d186fe2a9 Reviewed-on: https://code.wireshark.org/review/22044 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-08 17:39:05 +00:00
PATH_SUFFIXES ${_ws_vcredist_subdir} ${_ms_vcredist_subdir}
NO_DEFAULT_PATH
[MSVC2015] Fix finding of vcredist when using MSVC2015. Change-Id: I23ddc8c7601e61c7c092a258e4e540bc475e020a Reviewed-on: https://code.wireshark.org/review/14831 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-06 15:25:18 +00:00
)
if(VCREDIST_EXE)
Fix a typo Change-Id: I32c551fc39ef496e8bbaba288c4ad4dafa2412c9 Reviewed-on: https://code.wireshark.org/review/14862 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-08 07:56:28 +00:00
file(TO_NATIVE_PATH "${VCREDIST_EXE}" VCREDIST_EXE)
Look in %VCToolsRedistDir% for the VC++ redistributable. Look in %VCToolsRedistDir% for the redistributable that we ship with the NSIS installer. Clarify a couple of status messages. Change-Id: I965d15947c3d3422d7c722afa581f4f7dfc2725a Reviewed-on: https://code.wireshark.org/review/25804 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-15 16:38:34 +00:00
message(STATUS "Using ${VCREDIST_EXE} for the NSIS installer.")
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
endif()
# Ideally we would generate this at compile time using a separate cmake
# module, e.g. cmake/modules/configure_nsis_file.cmake. However we would
# have to figure out a clean way to pass in the variables above.
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/config.nsh.in" _config_nsh_contents)
string(CONFIGURE "${_config_nsh_contents}" _config_nsh_contents)
string(REPLACE "#define" "!define" _config_nsh_contents "${_config_nsh_contents}")
string(REPLACE "#undef" "!undef" _config_nsh_contents "${_config_nsh_contents}")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.nsh" "${_config_nsh_contents}")
# all-manifest.nsh. Can be created at configure time.
set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh")
set(_all_manifest_contents "# Files required for all sections. Generated by CMake.\n")
Drop JSON-GLib completely JSON-GLib was added in v2.9.0rc0-201-g511c2e166a, but is no longer necessary since we have a home-grown JSON dumper (wsutil/json_dumper.h). Remove the remaining traces and additionally remove GObject from FindGLIB2.cmake since it was only added for JSON-GLib. Change-Id: If9dfd2c60cec130f98109d100bdb6618bde06ba0 Reviewed-on: https://code.wireshark.org/review/30733 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20 02:15:47 +00:00
foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS}
Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:18:29 +00:00
${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL}
Add SBC decoding support to Windows Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131 Reviewed-on: https://code.wireshark.org/review/18394 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22 16:15:51 +00:00
${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL}
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL}
${ZLIB_DLL}
# Needed for mmdbresolve
${MAXMINDDB_DLL}
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
)
set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n")
endforeach()
Fix CMake install of lua scripts The CMake generation of all-manifest.nsh is missing the 3 lua scripts, init.lua, console.lua and dtd_gen.lua. Change-Id: I2d34cfe075c5195d1d8816c0d816015195756fa2 Reviewed-on: https://code.wireshark.org/review/9551 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-08 07:07:24 +00:00
foreach(_script "init.lua" "console.lua" "dtd_gen.lua")
set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_script}\"\n")
endforeach()
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
file(WRITE "${_all_manifest}" "${_all_manifest_contents}")
file(TO_NATIVE_PATH "${DATAFILE_DIR}" _staging_dir)
Write our NSIS installer to the build directory. Write our NSIS installer to ${CMAKE_BINARY_DIR}/packaging/nsis instead of ${CMAKE_SOURCE_DIR}/packaging/nsis. Change-Id: I6d662b2726dc61fb199509575797b5dfe0d8fdfa Reviewed-on: https://code.wireshark.org/review/25725 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-10 21:26:57 +00:00
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" _outfile_dir)
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" _nsis_include_dir)
# Variables we can't set via config.nsh.
NSIS: Increase our verbosity. Pass /V4 to makensis so that we can see what files are in our package. Change-Id: I4d1225f8cfce66945d086bc6481f739a56f16549 Reviewed-on: https://code.wireshark.org/review/31023 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12 20:37:21 +00:00
set(NSIS_OPTIONS
/DSTAGING_DIR=${_staging_dir}
/DOUTFILE_DIR=${_outfile_dir}
/DNSIS_INCLUDE_DIR=${_nsis_include_dir}
/V4
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
PARENT_SCOPE
)
CMake: Fix an uninstall.exe dependency. Make sure building nsis_package doesn't clobber uninstall.exe. Change-Id: I8d00adb7fd3813c48118a0690feccb6a06bf15cb Reviewed-on: https://code.wireshark.org/review/7710 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-16 20:09:58 +00:00
# We want to sign all of the executables that we ship in the official
# installers. This means that uninstall.exe must be built separately AND
# that building the installer itself won't overwrite uninstall.exe
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
macro( ADD_NSIS_UNINSTALLER_TARGET )
set (_nsis_source_dir ${CMAKE_SOURCE_DIR}/packaging/nsis )
set (_nsis_binary_dir ${CMAKE_BINARY_DIR}/packaging/nsis )
add_custom_command(OUTPUT ${DATAFILE_DIR}/uninstall.exe
DEPENDS ${_nsis_source_dir}/uninstall.nsi
${_nsis_source_dir}/common.nsh
NSIS: Increase our verbosity. Pass /V4 to makensis so that we can see what files are in our package. Change-Id: I4d1225f8cfce66945d086bc6481f739a56f16549 Reviewed-on: https://code.wireshark.org/review/31023 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12 20:37:21 +00:00
COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS}
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
uninstall.nsi
COMMAND ${DATAFILE_DIR}/uninstall_installer.exe
COMMAND ${CMAKE_COMMAND} -E remove ${DATAFILE_DIR}/uninstall_installer.exe
WORKING_DIRECTORY ${_nsis_source_dir}
)
endmacro( ADD_NSIS_UNINSTALLER_TARGET )
macro( ADD_NSIS_PACKAGE_TARGET )
Try to fix NSIS packaging dependencies. Split the nsis_package target into nsis_package_prep which has dependencies and nsis_package which has no dependencies and as a result blindly builds the package. Remove the nsis_uninstaller target since that's now handled by nsis_package_prep. Nsis_package_prep *should* also take care of the dependencies for portableapps_package, but that hasn't been tested. Update the Developer's Guide. This requires coordination with the Windows buildbots. Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1 Reviewed-on: https://code.wireshark.org/review/9217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-29 17:00:37 +00:00
#set (_nsis_package ${CMAKE_BINARY_DIR}/packaging/nsis/Wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe)
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
# qt-dll-manifest.nsh. Created using Wireshark.exe.
Don't allow NSIS or WiX installers if we aren't building Wireshark. In both cases, a file used in the process of building the installer is generated from the Wireshark binary, so, unless we also arrange not to put that file in the installer if Wireshark isn't being built, we can't build the installer. Have ADD_NSIS_PACKAGE_TARGET and ADD_WIX_PACKAGE_TARGET check whether we're building Wireshark and fail if we aren't. That way, *if* we're including the NSIS or WiX packages in the build files, we fail if we aren't building Wireshark. Change-Id: Icfe4d2491bd721cdd5fef424e9a7565c4990defa Reviewed-on: https://code.wireshark.org/review/32053 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-16 01:00:52 +00:00
#
# XXX - if we're not building Wireshark, we can't build this
# manifest. On the other hand, if we're not building
# Wireshark, we have no need to include Qt in the installer,
# so it's not clear we need this manifest.
#
# This should probably be fixed, so that people can produce
# command-line-only installer packages.
if(NOT BUILD_wireshark)
message(FATAL_ERROR "The NSIS installer cannot be built if the Wireshark program isn't built.")
endif()
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
add_custom_command(OUTPUT ${_nsis_binary_dir}/qt-dll-manifest.nsh
Fix the build when a different version of Qt is in PATH When we add our Qt to PATH, prepend it so that it will be found first. Change-Id: I405496d6a08d676b5a2e0d9bd792de7ba9abe7f9 Reviewed-on: https://code.wireshark.org/review/18988 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-11-29 23:11:06 +00:00
COMMAND set "PATH=${QT_BIN_PATH};%PATH%"
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/windeployqt-to-nsis.ps1"
-Executable $<TARGET_FILE:wireshark>
-FilePath ${_nsis_binary_dir}/qt-dll-manifest.nsh
)
Try to fix NSIS packaging dependencies. Split the nsis_package target into nsis_package_prep which has dependencies and nsis_package which has no dependencies and as a result blindly builds the package. Remove the nsis_uninstaller target since that's now handled by nsis_package_prep. Nsis_package_prep *should* also take care of the dependencies for portableapps_package, but that hasn't been tested. Update the Developer's Guide. This requires coordination with the Windows buildbots. Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1 Reviewed-on: https://code.wireshark.org/review/9217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-29 17:00:37 +00:00
# Build NSIS package dependencies. We build the package in two stages
# so that nsis_package below doesn't trigger any dependencies that
# might clobber any signed executables.
add_custom_target(nsis_package_prep
CMake: Fix an uninstall.exe dependency. Make sure building nsis_package doesn't clobber uninstall.exe. Change-Id: I8d00adb7fd3813c48118a0690feccb6a06bf15cb Reviewed-on: https://code.wireshark.org/review/7710 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-16 20:09:58 +00:00
DEPENDS
${NSIS_FILES}
copy_data_files
Switch from AsciiDoc to Asciidoctor. Switch the markup text processor for files in the docbook directory from AsciiDoc to Asciidoctor. Asciidoctor has several useful features (such as direct PDF output) and is actively developed. It's written in Ruby but that dependency can be sidestepped with AsciidoctorJ, a self-contained bundle that only depends on the JRE. The current toolchain targets require Python, AsciiDoc, DocBook XML, DocBook XSL, Java, FOP, xsltproc, lynx, and the HTMLHelp compiler: HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL Chunked HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL PDF: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → FOP HTMLHelp: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → HHC This change removes the AsciiDoc and FOP requirements and adds either AsciidoctorJ or Asciidoctor + Ruby: HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL Chunked HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL PDF: Asciidoctor HTMLHelp: Asciidoctor → DocBook XML → xsltproc + DocBook XSL → HHC Ideally we could generate all of these using AsciidoctorJ, Java, and lynx. Unfortunately we're not there yet. The release notes depend on several macros (ws-buglink, ws-salink, cve-idlink, sort-and-group). Add Asciidoctor (Ruby) equivalents. Remove the BUILD_xxx_GUIDES CMake options and add various output targets automatically. This means that you have to build the various documentation targets explicitly. Change-Id: I31930677a656b99b1c6839bb6c33a13db951eb9a Reviewed-on: https://code.wireshark.org/review/25668 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-19 22:03:55 +00:00
user_guide_chm
Convert the FAQ to Asciidoctor and remove old help files. Convert our self-generating FAQ to Asciidoctor via the following steps: - `help/faq.py > /tmp/faq.html`. - `pandoc -t asciidoc -o docbook/faq.adoc /tmp/faq.html`. - Manually clean up the markup using a text editor. Question and answer content was left intact. Removing or updating obsolete content will have to be done in a separate change. The Asciidoctor project uses the .adoc extension, so start using it here as well. The contents of the "help" directory appear to have been used for offline support in help_url.c, but that functionality was removed in 2008 in 242e3b78bc. Its content is covered in the User's Guide and man pages so remove it. Change-Id: I9060eefe97cfc137f8b414077c30f814379b576a Reviewed-on: https://code.wireshark.org/review/32014 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-11 22:24:18 +00:00
faq_html
Try to fix NSIS packaging dependencies. Split the nsis_package target into nsis_package_prep which has dependencies and nsis_package which has no dependencies and as a result blindly builds the package. Remove the nsis_uninstaller target since that's now handled by nsis_package_prep. Nsis_package_prep *should* also take care of the dependencies for portableapps_package, but that hasn't been tested. Update the Developer's Guide. This requires coordination with the Windows buildbots. Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1 Reviewed-on: https://code.wireshark.org/review/9217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-29 17:00:37 +00:00
${DATAFILE_DIR}/uninstall.exe
)
Cosmetic tidy up for the projects in the Visual Studio solution Change-Id: Ie4ed28ee7e59def2e8a15433334988b4d0225d1d Reviewed-on: https://code.wireshark.org/review/10675 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-09-28 14:29:55 +00:00
set_target_properties(nsis_package_prep PROPERTIES FOLDER "Packaging")
Try to fix NSIS packaging dependencies. Split the nsis_package target into nsis_package_prep which has dependencies and nsis_package which has no dependencies and as a result blindly builds the package. Remove the nsis_uninstaller target since that's now handled by nsis_package_prep. Nsis_package_prep *should* also take care of the dependencies for portableapps_package, but that hasn't been tested. Update the Developer's Guide. This requires coordination with the Windows buildbots. Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1 Reviewed-on: https://code.wireshark.org/review/9217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-29 17:00:37 +00:00
Remove Nmake build system Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-08 13:57:00 +00:00
# Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/nsis
Try to fix NSIS packaging dependencies. Split the nsis_package target into nsis_package_prep which has dependencies and nsis_package which has no dependencies and as a result blindly builds the package. Remove the nsis_uninstaller target since that's now handled by nsis_package_prep. Nsis_package_prep *should* also take care of the dependencies for portableapps_package, but that hasn't been tested. Update the Developer's Guide. This requires coordination with the Windows buildbots. Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1 Reviewed-on: https://code.wireshark.org/review/9217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-29 17:00:37 +00:00
# Note that executables and DLLs *must* be built separately
add_custom_target(nsis_package
NSIS: Increase our verbosity. Pass /V4 to makensis so that we can see what files are in our package. Change-Id: I4d1225f8cfce66945d086bc6481f739a56f16549 Reviewed-on: https://code.wireshark.org/review/31023 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12 20:37:21 +00:00
COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS}
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
wireshark.nsi
WORKING_DIRECTORY ${_nsis_source_dir}
)
Try to fix NSIS packaging dependencies. Split the nsis_package target into nsis_package_prep which has dependencies and nsis_package which has no dependencies and as a result blindly builds the package. Remove the nsis_uninstaller target since that's now handled by nsis_package_prep. Nsis_package_prep *should* also take care of the dependencies for portableapps_package, but that hasn't been tested. Update the Developer's Guide. This requires coordination with the Windows buildbots. Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1 Reviewed-on: https://code.wireshark.org/review/9217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-29 17:00:37 +00:00
set_target_properties(nsis_package PROPERTIES FOLDER "Packaging")
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@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
endmacro( ADD_NSIS_PACKAGE_TARGET )
set(CLEAN_FILES
all-manifest.nsh
config.nsh
#NEWS.txt
qt-dll-manifest.nsh
#user-guide.chm
${DATAFILE_DIR}/uninstall.exe
wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
)