forked from osmocom/wireshark
262a84c384
This sets the scope of the static build option to Wireshark support libraries only. Before the patch: Static plugins don't work with CMake and autotools. autotools static build is broken, and most likely will always be, as building Wireshark all-static is difficult and time-consuming. After the patch: For CMake Wireshark will be built with static or shared libraries and dynamic plugins. Everything just works. CMake apparently doesn't want you building static and shared libraries at the same time. For autotools Wireshark will be built with shared libraries by default. --disable-shared and --enable-static options work as usual. Dlopened plugins are not built if --disable-shared is given to configure (to disable shared libraries). This is a limitations imposed by libtool. Tested on Linux. This removes broken support for building plugins statically. Change-Id: Ib8e8176976f136eea93a2ce8f9857b6cf9bec64c Reviewed-on: https://code.wireshark.org/review/24241 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| COPYING.rtf | ||
| ComponentGroups.wxi | ||
| DirectoryStructure.wxi | ||
| Features.wxi | ||
| InputPaths.wxi | ||
| Makefile.am | ||
| Plugins.wxi | ||
| Prerequisites.wxi | ||
| README | ||
| StringOverrides.wxl | ||
| UserInterface.wxi | ||
| Wireshark.wxs | ||
| WiresharkOptionsDlg.wxs | ||
| WiresharkWixUI.wxs | ||
| banner.bmp | ||
| banner.svg | ||
| dialog.bmp | ||
| dialog.svg | ||
| windeployqt-to-wix.ps1 | ||
README
WiX installer for Wireshark This is currently an experimental feature to provide Wireshark with an .msi installer. It is intended to replace the NSIS installer, but needs to be a little more complete before doing so. (Developer) Differences/notes compared to NSIS installer: 1. You need the WiX toolset to build the installer. See http://wixtoolset.org/releases/ (v3.10 is recommended) 2. SNMP, Radius, Diameter, and Qt translations files are harvested to be included in the installer. Any custom/additional files just need to be written to the appropriate build output directory and the installer will pick them up. NSIS required modifying a file (custom_mibs.txt, etc) for inclusion 3. Plugin DLLs are not automatically harvested. To include your DLL, modify Plugins.wxi 4. To build the WiX installer run: > msbuild /m /p:Configuration=RelWithDebInfo wix_package_prep.vcxproj > msbuild /m /p:Configuration=RelWithDebInfo wix_package.vcxproj Known issues: 1. It does not include installing WinPcap or USBPcap (the NSIS installer does). These currently come as NSIS installers and it seems it would make more sense to "bundle" them with WiX rather than include them as part of the Wireshark.msi. 2. Needs more flexible handling of VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. Currently only VS2013 / CRT120 and VS 2015 / CRT140 are supported. 3. Uninstalling previous versions. NSIS installer did things more "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. The .msi architecture uses an "UpgradeCode" help facilitate install/uninstall/upgrade and NSIS installer doesn't have that. The NSIS installer also removed whole directories instead of just removing what it installed (still not sure if this is better or worse) Patches welcome to address any of the issues above or improvements you think can be made.