aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/macosx
AgeCommit message (Collapse)AuthorFilesLines
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-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-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-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-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-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-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-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-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-14Don't register Wireshark for .pfx (IPFIX) files.Jeff Morriss1-2/+3
(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-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-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 Morriss1-1/+49
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-04-28Register Wireshark as the reader of mplog files on freedesktop, OS X, and ↵Jeff Morriss1-0/+12
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>
2016-03-14OS X: Remove GTK+ packaging.Gerald Combs52-4029/+46
Remove the GTK+-specific bits from packaging/macosx. Change-Id: I8f7d909f971e60723e421005fdf46de967c69533 Reviewed-on: https://code.wireshark.org/review/14431 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-11OS X packaging: Remove some unused files.Gerald Combs4-1370/+0
Change-Id: Id01af6460828338bd3d0ac59e20000e93999ca7b Reviewed-on: https://code.wireshark.org/review/14424 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-15Build the extcap programs in the extcap directory.Guy Harris1-10/+49
That lets the version of Wireshark built with autotools find the extcap programs. Don't install the extcap programs under ${datadir} - that puts it under a share directory, and share directories are for platform-independent files, which executable images aren't (they're instruction-set dependent, hence platform-dependent). Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f Reviewed-on: https://code.wireshark.org/review/13943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-11autotools: Add more silent build rulesJoão Valverde1-1/+1
Change-Id: I4abff8880d5b3ff439e6abc9cf3c2d17897501ea Reviewed-on: https://code.wireshark.org/review/13816 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-01-01Welcome in 2016, part 2Stig Bjørlykke1-2/+2
Change-Id: I75f87b78ecec0859d0ebecee39ec257374f86541 Reviewed-on: https://code.wireshark.org/review/12993 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-22extcap: add randpktdump, a random packet generator.Dario Lombardo1-0/+1
This new extcap is for testing and educational purpose. It relies on rankpkt-core functions to generate random packets. Change-Id: If6890f0673545682995a2079458108edc0913b30 Reviewed-on: https://code.wireshark.org/review/11764 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>
2015-11-21Fix OSX 10.5 autotools package for missing sshdumpGraham Bloice1-1/+5
Make sshdump addition to the package conditional depending on whether it is actually built. Change-Id: Ifeaa134fdb3dcd88e48ff0c796f0c21c804eba77 Reviewed-on: https://code.wireshark.org/review/12023 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-19osx: fix build when binary list is not fully compiled.Dario Lombardo1-1/+3
It can happen that the $binary_list contains apps that are not compiled (eg. for the lack of a lib). In this case the binary can't be added to the package. Fixed checking that the binary going to be signed is present. Change-Id: Iefd9438de972302523ba28596e905b11513a4fea Reviewed-on: https://code.wireshark.org/review/11968 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-19extcap: add sshdump.Dario Lombardo1-0/+1
sshdump is an extcap module that allows dumping from a remote host using an ssh connection. It goes with the existing extcap plugin interface. Change-Id: I8987614fdd817b8173a50130812bc643a4833bca Reviewed-on: https://code.wireshark.org/review/11402 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-10Apple calls it just "OS X" these days.Guy Harris4-6/+6
Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4 Reviewed-on: https://code.wireshark.org/review/11703 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-22Try to fix osx-app.sh bundle creation.Gerald Combs1-0/+1
Change-Id: I6d96974fae3956a017a007988a1ed145f08d4647 Reviewed-on: https://code.wireshark.org/review/11220 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-22osx-app.sh: Make sure we sign the Wireshark executable.Gerald Combs1-1/+1
Change-Id: Ib94bfd5fb8579d8bd824109806d340ee3e4f2f1c Reviewed-on: https://code.wireshark.org/review/11217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-22osx-app.sh: Fix bundling.Gerald Combs1-2/+9
When creating a bundle using osx-app.sh (i.e. when we're using Autotools), make sure we copy androiddump to the extcap subdirectory. Change-Id: Iabb24ae969ae77856f15dd94120cc6e395311198 Reviewed-on: https://code.wireshark.org/review/11215 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-22osx-app.sh: Make sure we sign our binaries.Gerald Combs1-0/+16
Throw an error if we don't. Change-Id: I7967fe8903f989e6e1a1e8193fb65c6ce086595b Ping-Bug: 11620 Reviewed-on: https://code.wireshark.org/review/11213 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-22osx-app.sh fixups.Gerald Combs1-77/+129
For libraries, instead of prefixing dependent library paths with @executable_path/../Framework, prefix them with @rpath. This should let us load them from different directory depths. Remove any LC_RPATH not in an allowed list of prefixes. This should keep us from leaking paths specific to the build environment and user, and should make any portability problems more obvious. Add either @executable_path/../Frameworks or @executable_path/../../Frameworks as an LC_RPATH depending on which actually exists. This lets us place androiddump in the extcap subdirectory. Add error checking in a few places and make sure we detect failures in subshells. Add a macdeployqt buglink. Bug: 11620 Change-Id: I43ef02ecc6f741761fcb9827c0b0b7b2ef16fa9a Reviewed-on: https://code.wireshark.org/review/11205 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01CMake: OS X packaging updates.Gerald Combs1-0/+1
Add a dmg_package_prep target as an alias to app_bundle. Rename the osx-dmg target to dmg_package. This matches the Windows packaging target names. In osx-app.sh, make sure we rpathify the bundle plugin directory. Change-Id: If41195c9d405ad6bff865625500a8227b77e8092 Reviewed-on: https://code.wireshark.org/review/10734 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01OS X: Integrate CMake and osx-dmg.shGerald Combs2-8/+20
Change-Id: Ide608f5e73ecd40c67a6b1c0e16f11233cd49c9d Reviewed-on: https://code.wireshark.org/review/10694 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-13Crank down the log level for macdeployqt.Guy Harris1-1/+2
Adding the additional rpath in the build process appears to have fixed the problem I was trying to debug. Change-Id: I518deea67837f7e084e503b8e5ae7c3f188df3c8 Reviewed-on: https://code.wireshark.org/review/9628 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13Don't treat Qt frameworks as dependencies.Guy Harris1-0/+5
macdeployqt will stuff them into the bundle for us; exclude anything in the Qt frameworks directory from the lists of dependencies for us to copy or munge. (We don't copy them correctly - that results in the underlying binary being copied to the Frameworks directory - and we leave it up to macdeployqt to do the munging.) Change-Id: I10cfb8dcb2abadde9d5c52252979267912710f80 Reviewed-on: https://code.wireshark.org/review/9627 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13On OS X, add an rpath for the Qt frameworks, and remove it in the app bundle.Guy Harris1-0/+21
Qt 5.5 and later have @rpath-based install names for the frameworks, which means that, if they're not installed in some frameworks directory searched by default (such as /Library/Frameworks) - which is the default case with the Qt installer - they won't be found by default. Add the directory in which the frameworks exist as an rpath in the Wireshark binary, so that they'll be found, and then remove it from the Wireshark binary in the app bundle, as the directory in which the frameworks exist on the machine on which Wireshark was built is irrelevant to the machines on which it's being deployed - the frameworks are included in the bundle, and we already add an rpath to find them there. Change-Id: I54e033743e7b17eab26976064dcd7cd000f97c78 Reviewed-on: https://code.wireshark.org/review/9625 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13Go back to using macdeployqt for now.Guy Harris1-121/+10
I have some other hammers to try it hit it with to get it to actually work with Qt 5.5. Change-Id: Ie20ccbcee62fa48f768ba22478d07b9dc18d0139 Reviewed-on: https://code.wireshark.org/review/9623 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13Rpathify references to Qt frameworks separately from references to libraries.Guy Harris1-1/+37
We need to preserve the full path of the framework binary. Change-Id: I3a13eaffc07028a26fbd970db02cc1cce3fdcd5d Reviewed-on: https://code.wireshark.org/review/9621 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13Copy over the entire framework and then clean it up.Guy Harris1-6/+11
That's easier than trying to carefully copy the relevant bits. Change-Id: I2f174a735bf91f6434929c25ca33aced03e19597 Reviewed-on: https://code.wireshark.org/review/9620 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13Don't copy the entire framework.Guy Harris1-8/+11
Copy only the stuff needed at run time; don't bother with all the headers, etc.. Change-Id: Id9d2ec916b6742a6cb6e2ec3c0f7ed1a65a8a93c Reviewed-on: https://code.wireshark.org/review/9617 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 22:37:02 +0000