aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2018-02-22Don't strip debugging symbols from the binaries in the macOS image.Guy Harris1-1/+1
Unstripped binaries should allow better stack traces in the CrashReporter files. Change-Id: Idb2f11cd664dc62331f3394dee09abcd4e88f897 Reviewed-on: https://code.wireshark.org/review/25977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-21Fix detection of file type.Guy Harris1-1/+1
Some versions of otool print the file name as the first line when you run it with -hv, so that the line containing the file type is the fourth line; others don't print it, so that it's the third line. Instead, look for the line that has MH_MAGIC. Change-Id: Ib14f6b24f14069532263332e53a1e9895663641a Reviewed-on: https://code.wireshark.org/review/25968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-15Look in %VCToolsRedistDir% for the VC++ redistributable.Gerald Combs2-3/+3
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-14Wix: Look for merge modules in %VCToolsRedistDir%.Gerald Combs1-0/+6
Add "%VCToolsRedistDir%\MergeModules" to the merge module search path. This is required for Visual Studio 2017 here. Change-Id: I91cd1527ae80c85ed304c1233436cae52aa0a501 Reviewed-on: https://code.wireshark.org/review/25782 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>
2018-02-13Make the DOCSIS dissector a built-in dissector.Guy Harris2-5/+0
Stuff that calls it is built in, and stuff it calls is built in, so there's not much point in having it be a plugin; we already have examples of plugin dissectors. Change-Id: I512e0fda62faedb5f03f476fbece2e267e1d644f Reviewed-on: https://code.wireshark.org/review/25775 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-11Switch from AsciiDoc to Asciidoctor.Gerald Combs1-1/+1
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>
2018-02-10Write our NSIS installer to the build directory.Gerald Combs2-1/+3
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-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo1-1/+1
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-04Process all subdirectories of $pkgplugin as directories of plugins.Guy Harris1-3/+5
That way we don't have to change the script if we add new plugin subdirectories. Change-Id: Ic788807c723306e461b7c1f8721b48a46d4fff96 Reviewed-on: https://code.wireshark.org/review/25584 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-03Handle separate directories for libwireshark and libwiretap plugins.Guy Harris1-3/+4
We now have "epan" and "wiretap" subdirectories of the plugin directory, with the first containing libwireshark plugins and the second containing libwiretap plugins. Look for plugins in those directories, rather than in the top-level plugin directory. Bug: 14389 Change-Id: Ia3bd4d27e82215207e7a7dcfc8f91042bbc61737 Reviewed-on: https://code.wireshark.org/review/25577 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-30usbdump: Add usbdump wiretap plugin as functional exampleJaap Keuter1-0/+6
This wiretap plugin serves a dual purpose. One is to add usbdump file reading capability to wiretap and therefore Wireshark and Tshark. Second it is an illustration of a basic wiretap plugin module. Change-Id: Iefbb156ea1bc5d90dabc1753942cdb9e393714ad Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/25487 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-27Reset file permissionsJaap Keuter3-0/+0
Some oddities with regard to file permissions have crept into the repository. Reset execute rights on various files which do not need them. Change-Id: Ib05658072925d59fc682173673c5638d157a269a Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/25490 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-24Qt+WiX: Skip translations.Gerald Combs1-6/+1
We handle translations in QtTranslation.wxs so we need to skip them when generating QtDependentComponents.wxs. Change-Id: I05586c7f8fbbaf72fc30564a157ba1175154d1d3 Reviewed-on: https://code.wireshark.org/review/25459 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-24Qt+WiX: Check windeployqt --list output.Gerald Combs1-33/+27
Windeployqt 5.9.4 can print translation files that don't exist (QTBUG-65974). Fix up whitespace. Change-Id: If0a4ad6e24023707fa7e9cb1132af8a8dc425627 Reviewed-on: https://code.wireshark.org/review/25457 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-13PortableApps: Exclude a bunch of files.Gerald Combs1-0/+6
Add fuzzshark.exe idl2wrs.exe lemon.exe make- test.exe uninstall.exe to the xcopy exlusion patterns. Change-Id: Ibf7b4711a51b9eca2b5947edc8d3d007c718a395 Reviewed-on: https://code.wireshark.org/review/25291 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-11Use an enum for plugin types.Gerald Combs1-1/+1
Make plugins.c the source of truth for plugin names. Where plugins reside and what they do are two different things, so split the plugin directory and description into two separate elements. CMake creates portable[1] builds on Windows and macOS. That is, the build-time directory layout is the same as the installation directory layout. Adjust various plugin paths macOS accordingly. [1] You have to run osx-app.sh on macOS to prepare the application bundle, but the goal is to create a directory/bundle that can be moved or copied to a different system and run in the new location. Change-Id: Icf9d02e61918fdf1404468baf52542910edf2743 Reviewed-on: https://code.wireshark.org/review/25166 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-09Use pcapng as the name of the file format.Guy Harris1-1/+1
At one point, I remember a discussion resulting in the official name of the next-generation replacement for pcap format being changed to "pcapng", with no hyphen. Make Wireshark reflect that. Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a Reviewed-on: https://code.wireshark.org/review/25214 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-01Happy New Year 2018!Stig Bjørlykke1-2/+2
Change-Id: I61ece8256384786c718fe2c1bc8813560fa372eb Reviewed-on: https://code.wireshark.org/review/25094 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-14Refactor plugin registration and loadingJoão Valverde3-35/+37
Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-13Fix RPM build: include the User Guide.Jeff Morriss1-0/+8
The User Guide has been installed by default since I9dd539c737cb3777dc1351707b9e45a3a6764aaa. Fixes problem reported in: https://www.wireshark.org/lists/wireshark-dev/201711/msg00162.html Change-Id: I462c7c18869e8df93785e1898364e248e897de50 Reviewed-on: https://code.wireshark.org/review/24679 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-19Fix (and chop) static build optionJoão Valverde5-23/+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-10-29Diameter: Add Huawei DCC AVPsJeff Dyer1-0/+1
Change-Id: I480e58a1676677bb362bb4e9dc866c5d5f0814e1 Reviewed-on: https://code.wireshark.org/review/24111 Reviewed-by: Jeff Dyer <jmasterfunk@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-26CMake: Set the Windows build target to Vista.Gerald Combs2-0/+10
Set NTDDI_VERSION and _WIN32_WINNT to their Vista values so that ws2tcpip.h will define inet_pton and inet_ntop. Remove the associated compiler version checks so that everyone is on the same page. Add breadcrumbs to the various parts of the code where we set a minimum Windows version. Change-Id: I83bba5fa1024bfbc02e07b120412807ad259e291 Reviewed-on: https://code.wireshark.org/review/24080 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-15packaging: Fix RPM spec fileJoão Valverde1-1/+2
Change-Id: Ib05cfeb9ef553ebd69e388e6ba00ddf751deb686 Reviewed-on: https://code.wireshark.org/review/23934 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: refresh rpm-package targetJoão Valverde2-2/+10
There's only so much we can/should do here, so dispense with the _topdir test. Change-Id: Ibf1170ea2cbb7c536df901db42d67da668fd64b2 Reviewed-on: https://code.wireshark.org/review/23912 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: make maintainer-clean should allow rerunning 'configure'João Valverde6-15/+1
Change-Id: Iedae94ffefe27b13b1967d69cacb757b5aa4576d Reviewed-on: https://code.wireshark.org/review/23928 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>
2017-10-06Make osx-app.sh a configured file and remove Autotools targets.Gerald Combs2-2/+2
Rename osx-app.sh to osx-app.sh.in and add the version to the plugin path at configure time. Instead up updating Autotools accordingly just remove the macOS packaging targets. gf61c381b5a removed support for Autotools in osx-app.sh and if anyone wants to build macOS packages I'd prefer that they use the same toolchain as the buildbot. Change-Id: Ide5205265bf8859a85b1afab68fa8f8285952bd3 Reviewed-on: https://code.wireshark.org/review/23839 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04Remove unused code from osx-app.shGerald Combs1-98/+0
Remove Autotools-specific code from osx-app.sh. The official builders have used CMake for a while and as far as I know no one else uses our packaging scripts. Change-Id: I6fc20114b42e10dacc69346c379055b68184b85c Reviewed-on: https://code.wireshark.org/review/23833 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-03macOS: Fixup app bundle rpathification.Gerald Combs1-11/+6
rpathify_dir is not recursive so the plugin path fix in g94af9724d1 wasn't sufficient. Make sure $pkgplugin is set to the versioned plugin subdirectory so that both rpathification and code signing work. Find the Qt frameworks directory using qmake while we're here. This should be more reliable than calling pkg-config (which doesn't work on my laptop). Bug: 14096 Change-Id: I0196015f849fd27994a439359cddd88c21106fde Reviewed-on: https://code.wireshark.org/review/23832 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-02Remove the SVR4 packaging assets.Gerald Combs5-155/+1
Remove the svr4-package and solaris-package targets along with their associated files and directories. We used to use this to build Solaris packages but we haven't shipped those in years. Given that the last substantive change to packaging/svr4 was in 2008 it's likely that this has been unused for a while. Change-Id: Ib9153c99f503200ea8c48d3ef81ad688ee55c09f Reviewed-on: https://code.wireshark.org/review/23808 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-10-01Fix WiX installerJoão Valverde1-1/+0
Change-Id: I27af4758393c12962edab10267ae41bd2f11a07e Reviewed-on: https://code.wireshark.org/review/23804 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-01Unsplit "m2m" plugin (wimax mac-to-mac encapsulation)João Valverde2-4/+0
... not to be confused with "machine-to-machine". M2M seems to be a simple Wimax encapsulation protocol developed by Intel. It's not documented publicly anywhere that I can find. The boilerplate to code ratio is huge and it even includes a complete source file from the Wimax dissector (yuck). Put it in the Wimax plugin instead. Minor version number bump for wimax plugin. Change-Id: I2694339dfe89be334093b257a5b34d1577f4dc20 Reviewed-on: https://code.wireshark.org/review/23790 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-28PortableApps: Don't ship development files.Gerald Combs1-0/+2
Exclude .exp and .lib files when we run xcopy. Change-Id: I913a1360507a8812a678efcd35d9afe58167d11b Reviewed-on: https://code.wireshark.org/review/23777 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-25macOS: Fixup plugin signing.Gerald Combs1-1/+1
Use `find` to find plugins. Change-Id: I6df8877547ecbd19644a846e5cb02e8b65f19e61 Reviewed-on: https://code.wireshark.org/review/23730 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-09-24Windows: fix NSIS and WiX installersPascal Quantin2-28/+28
Change-Id: I10f21de6ee9cf403690c66d02cbbd43ebb9d52bc Reviewed-on: https://code.wireshark.org/review/23689 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-09-23Add lcap file extension to nsis and wix installers.Joerg Mayer4-3/+40
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-09-23plugins: Fixups for g9260461f4fJoão Valverde3-5/+7
Put plugins in CMake build dir with a version subdir. This avoids some weird special cases, however running with autotools from build dir displays the wrong global folder in about->folders. Unfortunately the hack to run from the autotools build dir is troublesome. Various fixes for Windows builds. Try to fix also build dir issue loading plugins on macOS with ENABLE_APPLICATION_BUNDLE (blind). Change-Id: Ic3c7c21f5850c12a53844202d61fa0592b45739c Reviewed-on: https://code.wireshark.org/review/23657 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-22nsis: Always create the extcap directoryStig Bjørlykke1-1/+3
Change-Id: I6955c242036c3aa76be4ceb545905ffeef906518 Reviewed-on: https://code.wireshark.org/review/23654 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-08-27Update USBPcap to 1.2.0.3Pascal Quantin3-3/+3
Change-Id: Ie5dbe818e214738ea8e82fe7d72fc8a20b30691b Reviewed-on: https://code.wireshark.org/review/23221 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>
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-16Fix build.Guy Harris1-1/+1
That's a separate README file for this directory, and its name is README, not README.md like the top-level README file. Change-Id: I9ec920de6a844441e00d4608608563bc4ddd8349 Reviewed-on: https://code.wireshark.org/review/23096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-15Convert README to README.md.Gerald Combs2-5/+5
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-08-07nsis: Fix typo in installerStig Bjørlykke1-1/+1
Change-Id: Ic958729517dda653fc3f511379aa48956d87d225 Reviewed-on: https://code.wireshark.org/review/22986 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-08-01Update USBPcap to 1.2.0.2Pascal Quantin3-3/+3
Change-Id: I0f318cdd3644ef4eb2195bed3d0bd561dde7f6dc Reviewed-on: https://code.wireshark.org/review/22903 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-07-30Add G.729 decoding based on bcg729 libraryPascal Quantin3-3/+14
Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-23Put the well-known addresses into a separate file from OUIsJoão Valverde3-0/+6
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 Combs3-0/+8
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-27WiX: More merge module fixups.Gerald Combs1-7/+13
Look for our merge module using find_path. This should be more reliable and doesn't assume our build and target platforms are the same. Change-Id: I95a4454a063af2f978550b8cf1f1624c4aeb5ebc Reviewed-on: https://code.wireshark.org/review/22426 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-23Add dftest to Windows installer.Michael Mann4-1/+26
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>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 11:13:50 +0000