aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/wix/ComponentGroups.wxi
AgeCommit message (Collapse)AuthorFilesLines
2018-03-07NSIS, WiX: Handle the presence or absence of mmdbresolve.Gerald Combs1-1/+3
Only install mmdbresolve if MAXMINDDB_FOUND is true. Fixup the Qt about box and WiX GTK defines while we're here. Change-Id: I7ac3c21ddb4aebc1dae1c3d8cfd2bcafc4139d2e Reviewed-on: https://code.wireshark.org/review/26299 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs1-0/+18
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-03-02Remove an ipmap remnant.Gerald Combs1-1/+0
Change-Id: I391043aa0fdfce132a552e063d850d17bcf5a4de Reviewed-on: https://code.wireshark.org/review/26230 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-02Remove the endpoint "Map" feature.Gerald Combs1-3/+0
Remove the endpoint map and its button from the Qt and GTK+ UIs. It depends on GeoIP Legacy for coordinate information and those databases are being deprecated in favor of MaxMind DB. We *could* upgrade the code to use mmdbresolve, but according to https://dev.maxmind.com/geoip/geoip2/geolite2/ they're also going to remove coordinate information from GeoLite2: "In addition, in 2019, latitude and longitude coordinates in the GeoLite2 databases will be removed.* Latitude and longitude coordinates will continue to be provided in GeoIP2 databases. Please check back for updates." Change-Id: I43e1593d282a0f1aae897b1f4724117d1496b21e Reviewed-on: https://code.wireshark.org/review/26229 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-19Fix (and chop) static build optionJoão Valverde1-8/+4
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>
2017-09-23Add lcap file extension to nsis and wix installers.Joerg Mayer1-0/+36
Also add ntar file extention to wix installer to match nsis Change-Id: Idb6f660fda27c6ad3c3cd70acd482eafa2c14307 Reviewed-on: https://code.wireshark.org/review/23656 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: Jörg Mayer <jmayer@loplof.de>
2017-08-16CMake: Switch back to shipping README.txt on Windows.Gerald Combs1-4/+4
Instead of trying to ship README.md, convert its line endings and make sure the result is named README.txt. Change-Id: I4e081587c73342b01633b3a31ea03068e3fc1733 Reviewed-on: https://code.wireshark.org/review/23098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-15Convert README to README.md.Gerald Combs1-4/+4
Convert the contents of the top-level README to Markdown and give it a .md extension. Most of our documentation is plain text or AsciiDoc, but the top-level README file in a Git repository is special in that many online browsers will show the README contents along with the directory listing and those browsers tend to favor Markdown. This is true of GitHub (which we're currently mirroring to), Gerrit via its Gitiles plugin (which we're not yet using but likely will), and other places. Add "foreign" to AM_INIT_AUTOMAKE. There is probably a joke to be made here about the FSF and border walls. Change-Id: I87c306d74864e1f0a432225b160a1b4483ee946c Reviewed-on: https://code.wireshark.org/review/23049 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>
2017-07-23Put the well-known addresses into a separate file from OUIsJoão Valverde1-0/+4
Having two distinct logical concepts (OUI and Well Known Address) concatenated to a single "manuf" file is needlessly obfuscating the WKA feature. Have a distinct "wka" file instead and just skip the cat. Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8 Reviewed-on: https://code.wireshark.org/review/22742 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-07-15Rename enterprises to enterprises.tsv and ship it.Gerald Combs1-0/+4
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more obvious and so that double-clicking the file might do something useful. Add it to the Windows packages. Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463 Reviewed-on: https://code.wireshark.org/review/22616 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-23Add dftest to Windows installer.Michael Mann1-1/+15
Bug: 13825 Change-Id: Ibda27599739a26a388e1c66ae813ff5c2c8339be Reviewed-on: https://code.wireshark.org/review/22367 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-09-19WiX: add SSHdump, Ciscodump and UDPdump to installerPascal Quantin1-4/+43
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-06-22Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dllPascal Quantin1-1/+1
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-14Don't register Wireshark for .pfx (IPFIX) files.Jeff Morriss1-18/+0
(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-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-01Register a few more file extensions as belonging to Wireshark.Jeff Morriss1-0/+54
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-11Create a Wix InstallerMichael Mann1-0/+1008
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 08:58:10 +0000