aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2017-06-17WiX: Fixup merge module configuration.Gerald Combs2-5/+15
Set the merge module path based on our platform and version of Visual Studio. Change-Id: Ic866447f36d5264d61fc988f3f9d8b4d2e5c0827 Reviewed-on: https://code.wireshark.org/review/22192 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>
2017-06-09NSIS: Add support for Visual Studio 2017.Gerald Combs1-6/+24
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-07WiX: Switch to Visual Studio 2015.Gerald Combs2-4/+4
The Windows builders now use Visual Studio 2015. Change-Id: I0fe4defd090930a0b8531e544d03ad4f3b36dac1 Reviewed-on: https://code.wireshark.org/review/22018 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 316d09a5aee68904ba0348c2017647b4dea3aab1) Reviewed-on: https://code.wireshark.org/review/22019
2017-05-31Sort the RADIUS dictionaries and account for a rename of one of them.Guy Harris1-9/+9
Change-Id: Ieea5349a38366a68cd313e70c8f1d28828982d7b Reviewed-on: https://code.wireshark.org/review/21862 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-31Fix nsis intallerGraham Bloice1-1/+1
The radius erx disctionary has been renamed to unisphere. Change-Id: I3d8a4b9d8f6a5340f3a92274816e66bdaa55ffd3 Reviewed-on: https://code.wireshark.org/review/21858 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-05-30Add Inovar specific Diameter AVP codesMichael Mann1-0/+1
Bug: 13349 Change-Id: I2a06ee3bd7ab1f81414ad8e4155c1430a7287644 Reviewed-on: https://code.wireshark.org/review/21778 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-29radius: Sync with FreeRADIUSAlexis La Goutte1-0/+1
add Dell EMC dictonary commit 2b2a7dc5654abf740ff7ffb52fc0807a5e0f1781 Author: Alan T. DeKok <aland@freeradius.org> Date: Wed May 24 15:55:05 2017 -0400 as posted to the list Change-Id: If3e7e7f401c6f1eca5292f0f323c2cd86dfd3fcc Reviewed-on: https://code.wireshark.org/review/21787 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-05-12Windows: update LZ4 to 1.7.5 and USBPcap to 1.2.0.1Pascal Quantin3-3/+3
Change-Id: I02eb4c255a0794b650f566abdadcac16e97196af Reviewed-on: https://code.wireshark.org/review/21609 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>
2017-04-19[Diameter] Add Juniper SCG AVPsGuy Davies1-0/+1
Change-Id: I832a82b4edbfce26e3edceb0f6baed3b7a1c8b62 Reviewed-on: https://code.wireshark.org/review/21190 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-19Add libxml2 as optional dependencyAhmad Fatoum3-3/+16
This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-05More OS name cleanups.Guy Harris3-2/+2
Use macOS when not referring to a particular release; use the appropriate name when referring to a particular release. Change-Id: I9293d4db7c91d7c859d7c067c0f0b3c9c482fcc5 Reviewed-on: https://code.wireshark.org/review/20935 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris3-8/+8
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-26Remove executable bit, from not executable files.Jakub Zawadzki2-0/+0
Change-Id: I8afa246172cd8d5a86513ade2f482566e3f9957a Reviewed-on: https://code.wireshark.org/review/20272 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-26RADIUS: add cnergee dictionary (from FreeRADIUS)Alexis La Goutte1-0/+1
commit e37987492b0d575a8ef41900ef916244112b2468 Author: Alan T. DeKok <aland@freeradius.org> Date: Sat Feb 18 12:11:05 2017 -0500 Dictionary from cnergee. Which modifications so that the names don't conflict with existing ones. Change-Id: I4fed7f38300dd8bcf526e5a07eec6c7812991d95 Reviewed-on: https://code.wireshark.org/review/20258 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-04Revert "Another change required for that."Guy Harris1-1/+1
This reverts commit 3cfa4f760276bf995aca2479166a2128451fd402. Nope, *not* needed, and not wanted, either. Change-Id: I71ac174a9b9b19980d0a6f44088d0a66f71ef99b Reviewed-on: https://code.wireshark.org/review/19538 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Another change required for that.Guy Harris1-1/+1
Bug: 13270 Change-Id: I86e779c8f7b89ca928556d8b1acc1015b96f9100 Reviewed-on: https://code.wireshark.org/review/19537 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Running Wireshark through a symlink doesn't work.Guy Harris3-21/+22
We can't just symbolically link to the executables, as that means that the executable won't be in Contents/MacOS, which means that all @executable_path-relative references will go to the wrong place if we run the executables using the symlink, which means that the executables could fail (they *do* fail to find the Cocoa Qt plugin, for example). So, instead, we go back to the old version of the utility launcher, and put that in Contents/Resources/bin as well as, if the user requests the CLI utilities, /usr/local/bin. Maybe PackageMaker will find that acceptable and include them in the installer package. Bug: 13270 Change-Id: I4016b58c9ce0df05d78525d35e53431750c2b4d9 Reviewed-on: https://code.wireshark.org/review/19536 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Oops, source and target are the other way around.Guy Harris1-2/+2
Bug: 13270 Change-Id: Ibeddb435acca298c90f2d6b9c0228e8a9a747b38 Reviewed-on: https://code.wireshark.org/review/19534 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Create the Content/Resources/bin directory if necessary.Guy Harris1-0/+4
Bug: 13270 Change-Id: Idc4223a24d6d2037d13a85331ce63e5a24168d3a Reviewed-on: https://code.wireshark.org/review/19533 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Remove trailing whitespace.Guy Harris1-1/+1
Change-Id: Ifdea8516ccce7a72c88470913ce36b9226dfcb54 Reviewed-on: https://code.wireshark.org/review/19532 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04Put symlinks to the executables in Contents/Resources/bin.Guy Harris1-1/+13
PackageMaker appears not to put them into the installer package, so construct them in the Wireshark post-install script. Bug: 13270 Change-Id: Idfa10d4d123d2c0e2f7b3ad65888e075fbfd27a7 Reviewed-on: https://code.wireshark.org/review/19531 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-01Happy new Year 2017 !Alexis La Goutte1-2/+2
Change-Id: I8ae8a1fdc8d0df0779ef119c527f41dac9e0dbdb Reviewed-on: https://code.wireshark.org/review/19476 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-12-28macosx: Update Read me first.rtf with some additional install/deinstall notesJim Young1-6/+20
Report that files /etc/paths.d/Wireshark and /etc/manpaths.d/Wireshark are added and should be removed. Change-Id: I2f9d3aea0dd4f86cb9a86065108a3948e28d3001 Reviewed-on: https://code.wireshark.org/review/19436 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-25Wireshark doesn't require X11 any more.Guy Harris1-1/+1
Change-Id: Ib5ba38e5103f31f115608b92dd32f3ce1e5eec67 Reviewed-on: https://code.wireshark.org/review/19424 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-21[rpm-build] Add an option to exclude extcap.AndersBroman1-0/+9
Change-Id: Ibe16ad31986818fcd6e1bfbcfdd38ecc7663dd39 Reviewed-on: https://code.wireshark.org/review/19360 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-12-16Add symlinks to Wireshark binaries in Resources/bin, and point there.Guy Harris3-30/+33
That way, $PATH points to .../Wireshark.app/Contents/Resources/bin, so the man command will look in .../Wireshark.app/Contents/Resources/share/man. This also may obviate the need to install the wrapper scripts in /usr/local/bin, although those scripts obviate the need to re-set PATH after installing Wireshark. Change-Id: I7202b5a0fe5d2b90c956dc0db2af073f6c08b00d Reviewed-on: https://code.wireshark.org/review/19296 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-13Build TRANSUM pluginPascal Quantin2-0/+22
Add plugin to autofoo and CMake build systems and fix errors found Add plugin to Windows installer (optional component activated by default) Change-Id: Id1b777bdee04e53076b3291f6fb68d5abad6985d Reviewed-on: https://code.wireshark.org/review/19228 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-12-06Add udpdump to the macOS package.Gerald Combs1-1/+7
Change-Id: I9d16a8291efdd564a905b2f8bc1ded4fa1aa718d Reviewed-on: https://code.wireshark.org/review/19118 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-06codecs: Add support for G.722 and G.726Peter Wu3-3/+14
Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-01RPM: fix the date in a recent changelog entry.Jeff Morriss1-1/+1
RPM complains when the date isn't valid. Change-Id: I859a9900ba87d52159071b06310d5873c092231a Reviewed-on: https://code.wireshark.org/review/19003 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
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>