aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2016-11-30Fix the build when a different version of Qt is in PATHРоман Донченко2-2/+2
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-24RADIUS: Add RFC7930 dictionnaryAlexis La Goutte1-0/+1
From FreeRADIUS master commit 42e55cca4cee6524475f0461b00f0f96769ab40b Author: Alan T. DeKok <aland@freeradius.org> Date: Wed Oct 12 10:13:00 2016 -0400 added RFC 7930 Change-Id: Icb69117cad84fcaf9d9ffe8040962afb33709441 Reviewed-on: https://code.wireshark.org/review/18913 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-24RADIUS: Add Microsemi dictionnaryAlexis La Goutte1-0/+1
commit 503e1e78daaa51d9a47e85bd7c9f5fb096a25b87 Author: Alan T. DeKok <aland@freeradius.org> Date: Fri Nov 11 06:56:23 2016 -0500 from Microsemi Change-Id: Icc5e5f74f7d34aaebdb192c83908856189082cf0 Reviewed-on: https://code.wireshark.org/review/18914 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-18Create /etc/paths.d and /etc/manpaths.d if they don't exist.Guy Harris1-0/+8
Bug: 13152 Change-Id: I6ecfd1e3f7f10a3a63b44b0d8bf137f0b3450391 Reviewed-on: https://code.wireshark.org/review/18871 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-02Packaging: Add dependencies for lz4 and snappy packagesBenoît Canet1-0/+18
Do it for Debian-like, RPM-based, and MacOS (via Homebrew) systems. Signed-off-by: Benoît Canet <benoit@scylladb.com> Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Change-Id: I52802301815243021c039da6a27af6c534792439 Reviewed-on: https://code.wireshark.org/review/18272 Reviewed-by: Benoît Canet <benoit@scylladb.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-22Add SBC decoding support to WindowsPascal Quantin2-3/+3
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-18CQL: add LZ4/Snappy decompression support on WindowsPascal Quantin2-3/+6
Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d Reviewed-on: https://code.wireshark.org/review/18249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-15Add the directory containing the executables to a file in /etc/paths.d.Guy Harris1-0/+7
Do for executables what we do for man pages. Change-Id: I066f0199fd6064cae21e6ad079a1f344e1002c66 Reviewed-on: https://code.wireshark.org/review/18205 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey3-6/+16
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-10-05macOS: extend MANPATH for Wireshark.appUli Heilmeier1-0/+7
Modify postinstall.sh script to add file /etc/manpaths.d/Wireshark during installation. Content of the file is the current path of the Wireshark manpages. Bug: 12746 Change-Id: I1dc0dc9a2acf56c39c78c709294f1a6804c6ec5c Reviewed-on: https://code.wireshark.org/review/17916 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-26WiX: Try to fix development upgrades.Gerald Combs1-1/+11
Try enabling the MajorUpgrade:AllowSameVersionUpgrades attribute. This should keep the .msi packages from installing side by side when only the micro version differs. Change-Id: I37e8971d965ec1909c6baacb55d6a8062b13ff70 Reviewed-on: https://code.wireshark.org/review/17945 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-24WiX: Disable desktop icon and shortcut checkboxes.Gerald Combs2-8/+31
Enable and disable the Wireshark and Wireshark-gtk desktop icon and shortcut checkboxes depending on our feature selections to match the NSIS installer behavior (and make sense). Set the level of "Fe.WiresharkGTK" to 2 so that it's disabled by default. This roughly matches the behavior of the NSIS installer. Note that we can't enable or disable radio buttons. Change-Id: I1c73f901344e21bd62e67890ce544f644c0cdda6 Reviewed-on: https://code.wireshark.org/review/17898 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: Michael Mann <mmann78@netscape.net>
2016-09-22WiX: Fix condition logic.Gerald Combs1-24/+16
The condition expressions in g630b646 were incorrect. Fix them. This also lets us make the error messages more verbose, so do so. Add a hint about debugging. Change-Id: I74d4b9cfb1bc9afb23be4d61ac190f90e7048745 Reviewed-on: https://code.wireshark.org/review/17849 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-19WiX: add SSHdump, Ciscodump and UDPdump to installerPascal Quantin2-7/+50
Change-Id: Iae2a222db8e9359fd8440b59f43ec90c3b7f8243 Reviewed-on: https://code.wireshark.org/review/17747 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-19WiX: Add NSIS installer checks.Gerald Combs2-2/+73
Look for an existing NSIS installation and cancel the installation if we find one. Add a note about making this process more friendly. Change-Id: Id6ea4d511bc813a38fa834931f5e677d3d6a4319 Reviewed-on: https://code.wireshark.org/review/17702 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: Gilbert Ramirez <gram@alumni.rice.edu>
2016-09-17NSIS: add UDPdump to installerPascal Quantin2-0/+11
Change-Id: Ic340d7de5de2573bf1e4ee97c8f7ef9af822d225 Reviewed-on: https://code.wireshark.org/review/17746 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-13NSIS: Disable a debugging MessageBox.Gerald Combs1-1/+1
Disable a MessageBox added in gec5f578. Change-Id: I4a1ad044836a9363b2e4d9f80df419e7c81f73dd Reviewed-on: https://code.wireshark.org/review/17694 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-13NSIS: Look for an installed WiX package.Gerald Combs2-4/+63
Dig through the registry and look for a WiX / Windows Installer package. Offer to uninstall it if we find one. Change-Id: I513ce4184880571c484461483a3d25e6d90a85e0 Reviewed-on: https://code.wireshark.org/review/17613 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-13NSIS: Disable GTK+ by default.Gerald Combs2-52/+38
Disable the legacy UI by default. Associate our Programs and Features icon with Wireshark.exe. Move some GTK+-specific code to SecWiresharkGtk. Make sure the /desktopicon and /quicklaunchicon apply to Wireshark.exe. Remove unneeded parentheses in the display name. Change-Id: Ia7662d003d15afd809d81631e059e249a93d0999 Reviewed-on: https://code.wireshark.org/review/17593 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-11WiX: Add a warning and increase compression.Gerald Combs4-3/+12
Note that you should probably uninstall the NSIS package first if it's installed. Set the compression level to "high". Change-Id: I10de8df580f8410fd13cdf414db1b1812a9fcf02 Reviewed-on: https://code.wireshark.org/review/17566 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: Michael Mann <mmann78@netscape.net>
2016-09-09PortableApps: Allow multiple instances.Gerald Combs1-0/+3
The documentation for the [Launch]SingleAppInstance key doesn't seem to match its behavior in that its default value (true) keeps multiple portable instances from running, at least for us. Set it to false since we're happy with users running as many concurrent instances as they can stand. Set the related SinglePortableAppInstance key to false while we're here in case its default value ever changes. Change-Id: Iea1a6a80d5b204814b7569776734e0b0e254d657 Reviewed-on: https://code.wireshark.org/review/17616 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-07Autotools: Distribute packaging/wix.Gerald Combs2-2/+23
…otherwise you can't compile from the tarball on Windows. Change-Id: I99c73b09d9468f0da753c05451fa54348680963f Reviewed-on: https://code.wireshark.org/review/17543 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-17RPM: distribute the wireshark.pc file.Jeff Morriss1-0/+4
It's been installed since Idb60157a51ea1dd0afd6cfac695bfa5760485241. Change-Id: I2171f2a0bc9b05059b8ecf4451715f7f6d9506e3 Reviewed-on: https://code.wireshark.org/review/17113 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-08-06CMake: Look for vcredist_x??.exe in more places.Gerald Combs1-3/+13
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-03Update USBPcap installer packaged in our Windows installerPascal Quantin3-3/+3
This new version contains kernel drivers with an EV certificate that is cross-signed by Microsoft as it will become mandatory. See https://blogs.msdn.microsoft.com/windows_hardware_certification/2016/07/26/driver-signing-changes-in-windows-10-version-1607/ for details. Change-Id: I76bb1005ea540f39dca8874abb88d71a3ad53625 Reviewed-on: https://code.wireshark.org/review/16862 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-08-02RPM: Download from https://www.wireshark.org/.Gerald Combs1-2/+2
Download from https://www.wireshark.org/ instead of https://wireshark.org/. This conforms to README.packaging and avoids a redirect. Change-Id: I0ed63f446bc16cbd501444c8743809672c4a084b Reviewed-on: https://code.wireshark.org/review/16829 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-29WiX: Set the "Programs and Features" icon.Gerald Combs3-6/+10
Use our normal application icon in "Programs and Features". Change-Id: I480fcd16b9de1b58852ee8fb5226062da8ed7419 Reviewed-on: https://code.wireshark.org/review/16768 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: Michael Mann <mmann78@netscape.net>
2016-07-29Use xz to compress the source tarball.Gerald Combs1-2/+2
Compress the source tarball using xz instead of bzip2. Other open source projects (including many of our dependencies) have been using xz for a while so hopefully this won't be too much of a shock. Remove the patch-bzip2 Autotools target while we're here. Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d Reviewed-on: https://code.wireshark.org/review/16735 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-29Give the WiX installer a full name.Gerald Combs1-1/+2
Append the platform and version to the WiX installer name similar to our other installers. Change-Id: Idb3e7917dda3a8e831062538d3e7d1b1c8b78d42 Reviewed-on: https://code.wireshark.org/review/16757 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-11osx-app: small improvement in packaging script.Dario Lombardo1-10/+7
Change-Id: I484ab1b001f7fd578e734b4e006137f590a750a9 Reviewed-on: https://code.wireshark.org/review/16379 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-08Handle extcap binaries and the libssh upon which some depend.Guy Harris1-0/+8
Search the extcap binaries for shared libraries they require. Treat libssh specially - for some reason, when built by macosx-setup.sh (which just does a standard cmake build of libssh), libssh's shared library has just libssh.4.dylib, not {installation directory}/libssh.4.dylib, as its shared library ID, so we don't find its binary using otool -L. Bug: 12471 Change-Id: I3e5632d7520f1bbeca1a8faae3a012938ef9dee7 Reviewed-on: https://code.wireshark.org/review/16329 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-08osx-app.sh: add ciscodump.Dario Lombardo1-0/+4
Ping-Bug: 12471 Change-Id: I7326e43ce8b294c8065e09120d85b4743f1659a9 Reviewed-on: https://code.wireshark.org/review/16321 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-05extcap: Remove g_spawn_helper supportRoland Knall2-10/+0
Move g_spawn to separate file and implement functions to use Windows based method of spawning, instead of the glib based version Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f Reviewed-on: https://code.wireshark.org/review/16049 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-06-30Recompress PNGs.Gerald Combs2-0/+0
Recompress PNGs using the current versions of various compressors: optipng 0.7.6 advpng 1.20 advdef 1.20 pngcrush 1.8.1 Parallelize PNG compression. Note why we're not using a couple of other compression utilities. Change-Id: I52757d0bc2d424013e7f00b693a0f5378427cc31 Reviewed-on: https://code.wireshark.org/review/16209 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-30Remove Makefile.common filesJoão Valverde1-2/+2
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-22Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dllPascal Quantin5-8/+2
This aligns the name with what is done for other Wireshark shared libraries. Moreover it allows to compile a wiretap plugin once per major release, without the need to recompile it each time ${PROJECT_VERSION} changes (each nightly build / official release). Change-Id: I53c82277223a4f323079cf695168ac85c2fba523 Reviewed-on: https://code.wireshark.org/review/16058 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: Michael Mann <mmann78@netscape.net>
2016-06-15Remove Nmake build systemPascal Quantin9-481/+4
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-14Don't register Wireshark for .pfx (IPFIX) files.Jeff Morriss4-22/+4
(As pointed out by Gerald) .pfx files are (more commonly) PKCS#12 files. People may be upset if we start grabbing them. Change-Id: Iecf857d082b7f2a0ad4fdd1a932332fc3c9d9498 Reviewed-on: https://code.wireshark.org/review/15886 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-13RADIUS: Add Sangoma dictionaryAlexis La Goutte1-0/+1
From FreeRADIUS master commit ba4b4402588ae87497a0b7c87e26eb5cb433c8a7 Author: Alan T. DeKok <aland@freeradius.org> Date: Fri Jun 10 14:38:55 2016 -0400 Added dictionary.sangoma from http://wiki.sangoma.com/files/NSC-Radius-Support/dictionary.sangoma.txt Change-Id: Ie51ea6343a2a8a5b286d70451abce81ca920261f Reviewed-on: https://code.wireshark.org/review/15823 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-08Synchronize file type registrations from freedesktop to OS X.Jeff Morriss1-9/+117
... at least for files for which have file extensions, including the gzip'd versions of these files. Add .pkt (Savvius) file extensions to our freedesktop.org registrations. Change-Id: I0fb72909a1e9e3073451de06a64503fcfc6b57ed Reviewed-on: https://code.wireshark.org/review/15694 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-06-04Since Wireshark has also supported Npcap in Npcap mode,Yang Luo1-2/+2
let's make WinPcap installing option unchecked by default. Change-Id: Iea5efd9d9a66b988d515bd03b52c1d719e621232 Reviewed-on: https://code.wireshark.org/review/15716 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-01Create unique GUIDs for recently added file associations.Michael Mann1-3/+3
Change-Id: Ia07cb14995c3f06d8a32330209bb17fde344350a Reviewed-on: https://code.wireshark.org/review/15688 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-01Terminate last <dict> in Info.plistStig Bjørlykke1-0/+1
This bug was introduced in g162edec9. Change-Id: Ia7c6ab0ae35b9b0116c6c9396dfa6e5173967726 Reviewed-on: https://code.wireshark.org/review/15676 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-06-01Register a few more file extensions as belonging to Wireshark.Jeff Morriss4-4/+109
Register Wireshark for PacketLogger, ERF, IPFIX, and VWR files on freedesktop.org, OS X, and Windows (we were already registered for ERF and VWR files on Windows). Change-Id: I8105997cb15ea06e1c078489fd88763d4ce9e40c Reviewed-on: https://code.wireshark.org/review/15635 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-20Add CiscoSystems, vendor id 9 AVPsAndersBroman1-0/+1
Bug 12459 Change-Id: I9ebe7f4a9e6ae03539bd74e535c95c85a8efa55b Reviewed-on: https://code.wireshark.org/review/15506 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-05-12WiX banner and dialog images.Gerald Combs8-6/+161
Add initial Wireshark-branded artwork to the WiX installer. Change-Id: I1997023784112890f5366a577ca3b8101be530da Reviewed-on: https://code.wireshark.org/review/15383 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-12Add ${LIBSSH_DLL} for generating Wix component group listMichael Mann1-1/+1
copy/paste error missed ${LIBSSH_DLL} when looping second time. Change-Id: Iccb32c0d32b328828e4da13f745fb0bc9bdc16ae Reviewed-on: https://code.wireshark.org/review/15395 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-12RPM: make autoconf (and a few other build dependencies) optional.Jeff Morriss1-4/+21
Most people building RPMs don't need autoconf, automake, flex, or bison. But enough people do patch Wireshark (in the spec file) to make it an option. Based on Joao's Ib3f85b59c26c25c83fe6a939aee1a2dc75dd28f9. Change-Id: I62bf2a0c5cbe0a1abd680322ab82fcb14aedd0c3 Reviewed-on: https://code.wireshark.org/review/15313 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-05-11Create a Wix InstallerMichael Mann15-101/+2707
This is intended to replace the NSIS installer for Windows. It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together) TODO: 1. Customize installer with Wireshark graphics 2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. 3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns. 4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. Many thanks to Brian Pratt for all the Wix help. Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c Reviewed-on: https://code.wireshark.org/review/14858 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-28Register Wireshark as the reader of mplog files on freedesktop, OS X, and ↵Jeff Morriss3-1/+14
Windows. (Doing this for freedesktop.org-compliant systems requires adding a MIME type; yes, I just made the application/x-micropross-mplog MIME type up.) Change-Id: I11d8cc22571dd39984f8237d0ef995922bdfd15f Reviewed-on: https://code.wireshark.org/review/15012 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 06:34:16 +0000