Commit Graph

145 Commits

Author SHA1 Message Date
Gerald Combs 2e3147524e Add a missing backslash.
Change-Id: Iac79c885fe10805b61512ed2c02cd652f1c3fd7a
Reviewed-on: https://code.wireshark.org/review/5010
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-30 21:36:35 +00:00
Gerald Combs 7665ac5fab OS X: Don't add libtool control files to the app bundle.
According to https://developer.apple.com/library/mac/technotes/tn2206
the Contents/PlugIns directory should *only* contain executable files.
Only copy .so (and in case we need them) .dylib files.

Change-Id: I01f077735018733926db92e7576f6f4fecb68862
Reviewed-on: https://code.wireshark.org/review/5008
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-30 20:54:40 +00:00
Gerald Combs d2bb61a3a9 OS X: Integrate CMake and osx-app.sh
Add a -cb/--create-bundle option to osx-app.sh which builds the
application bundle. Use it in Autotools. (CMake does this by default.)

Copy over linker flags from configure.ac to CMakeLists.txt to support
rpathification and code signing.

Add an osx-app custom target to CMake.

Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803
Reviewed-on: https://code.wireshark.org/review/4918
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23 15:52:53 +00:00
Gerald Combs 0c444f315f OS X: Fix osx-dmg.sh bundle binary path.
Change-Id: Ia7c59de4f8b59dda9dbc484b8fa9ae0c3d88d594
Reviewed-on: https://code.wireshark.org/review/4905
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-22 04:02:45 +00:00
Gerald Combs e5d967bbb4 osx-app.sh: Add verbosity.
Change-Id: I3cd1c49909af34badd0d5c5f29bfcddb753ef2bf
Reviewed-on: https://code.wireshark.org/review/4902
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21 23:31:43 +00:00
Gerald Combs 86386243cd Make the "-qt" option the default in the OS X packaging scripts.
Change-Id: I1e404c342d06381be71735ff6fbc47e9b2b13899
Reviewed-on: https://code.wireshark.org/review/4895
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-21 16:16:56 +00:00
Gerald Combs a2508bda19 OS X: Add retina / hidpi support to Info.plist.
This should partially fix the problem described at
https://ask.wireshark.org/questions/37177/pixelated-ui-on-mac-os-x-with-development-1990

Change-Id: I436aae0d5b681e9ff549d257c2244ee67448ab07
Reviewed-on: https://code.wireshark.org/review/4876
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-20 18:46:00 +00:00
Gerald Combs cf3218df81 OS X packaging fix.
Change-Id: I82936bb1dcfa3a7ca1aea8a3ded388015aa37531
Reviewed-on: https://code.wireshark.org/review/3966
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03 01:05:49 +00:00
Gerald Combs aee3de9688 OS X packaging fix: wireshark-qt → wireshark.
Change-Id: Ie95c28ca47baf453335abab23eb7baba63d52f47
Reviewed-on: https://code.wireshark.org/review/3963
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 23:58:26 +00:00
Guy Harris 3ac49be96c Add more files to the release tarball.
Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47
Reviewed-on: https://code.wireshark.org/review/3286
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 08:55:52 +00:00
Guy Harris 8241b8760c Get rid of the Python stuff, as we've gotten rid of Python plugin support.
Also, update a comment to more accurately describe what a loop is doing,
and get rid of an unused variable.

Change-Id: I948fc4ad758152b483450bf74f653087c892ad3a
Reviewed-on: https://code.wireshark.org/review/2360
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-18 03:22:46 +00:00
Guy Harris 93b5a313ad When building an OS X package for GTK+, put the libraries in lib.
This reverts to the way we did it prior to the switch to Qt; with GTK+,
Contents/MacOS/Wireshark is just a launcher, and the Wireshark binary is
in Contents/Resources/bin/wireshark-bin, and the appropriate rpath entry
would be @executable_path/../lib - @executable_path/../Frameworks, which
works for the Qt version, in which Contents/MacOS/Wireshark is the
actual executable, doesn't work for the GTK+ version.

This should fix bug 10185.

Change-Id: I4e50a4ead8f29a742c97a9001c821aabe1fa5e65
Reviewed-on: https://code.wireshark.org/review/2347
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-17 22:06:12 +00:00
Guy Harris 39ca18d71b Only nuke the startup item once we've installed the launch daemon.
That way, if we crash in the middle, there's still something installed
that will try to set the permissions on the BPF devices.

Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411
Reviewed-on: https://code.wireshark.org/review/2023
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07 17:47:20 +00:00
Guy Harris b319a67bfb When installing the launch daemon, get rid of the old startup item.
Only one is necessary; get rid of the startup item.

Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86
Reviewed-on: https://code.wireshark.org/review/2016
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-07 06:42:59 +00:00
Guy Harris 63dc1299ae Get rid of some stuff left over from the days of drag-install.
We're not using the Utilities directory; don't create it and don't fill
it in.

Change-Id: I7ba66b415a2e5a6aff77d4bdb57b2ca176bcd789
Reviewed-on: https://code.wireshark.org/review/2009
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06 21:40:40 +00:00
Guy Harris 2b2fbff2dc Switch to a launch daemon for ChmodBPF.
"Ah finally blew that varmint to Kingdom Come!"

Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521
Reviewed-on: https://code.wireshark.org/review/2004
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06 19:17:34 +00:00
Alexis La Goutte 7d77d753c6 Continue to remove $Id$ from top of file
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ )

Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9
Reviewed-on: https://code.wireshark.org/review/886
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:49:26 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Alexis La Goutte b0ba475fbf Continue to remove $Id$ from top of file
(Using sed : sed -i '/^  \$Id\$/,+1 d') (No star only 2 spaces before)

Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54
Reviewed-on: https://code.wireshark.org/review/883
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:46:57 +00:00
Alexis La Goutte eb2fb39ff7 The 1.11.x installer puts the global plugins in the wrong place [Mac OS X]
Issue found by rols

The installer puts the normal included plugins (e.g. mate, wimax) in
/Applications/Wireshark.app/Contents/Frameworks/wireshark/plugins,
however the global plugins directory is set to
/Applications/Wireshark.app/Contents/Resources/lib/wireshark/plugins
(as it was in previous versions) so no plugins load at startup.
In order to make them load you have to create this directory and
copy the plugins there, or put them in your personal directory.

From remark of Gerald, use recommandation of Bundle Programming Guide (use Contents/PlugIns for plugin)

https://developer.apple.com/library/mac/documentation/corefoundation/conceptual/cfbundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW19

Change-Id: Ib1ae7da48a8fa94f7037912cd44c05532a238b71
Closed-bug: 9854
Reviewed-on: https://code.wireshark.org/review/602
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-19 11:19:37 +00:00
Stig Bjørlykke ddda691c2b Happy new year!
svn path=/trunk/; revision=54529
2014-01-01 12:20:27 +00:00
Alexis La Goutte fa2c0bb556 From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9576
Replace g_memmove with memmove

However there still one move g_memmove related code in "packaging/macosx/native-gtk/glibconfig.h".

svn path=/trunk/; revision=54472
2013-12-27 08:11:25 +00:00
Gerald Combs fd95b3d400 Instead of installing a script named "utility-launcher" and renaming it,
install a script named "wireshark".

svn path=/trunk/; revision=53356
2013-11-16 02:34:36 +00:00
Gerald Combs b073be77c1 Try reverting 01wireshark.xml to r53280.
svn path=/trunk/; revision=53354
2013-11-16 01:16:14 +00:00
Gerald Combs 09dc9a3d0a Try removing XML headers.
svn path=/trunk/; revision=53352
2013-11-16 00:27:19 +00:00
Gerald Combs 3009823060 Simplify the CLI preinstall script a bit and hopefully get rid of an error.
svn path=/trunk/; revision=53296
2013-11-13 02:50:25 +00:00
Gerald Combs 30bdf66b1f Fix permissions for installed OS X files and directories.
Add a cli-preinstall script that creates missing parts of the
installation path and sets their permissions. Simply copy
"utility-launcher" to "wireshark" instead of renaming it at install
time. Explicitly set its ownership and permissions. Pretty-print some of
the PackageMaker XML files via `xmllint --format --recover`.

svn path=/trunk/; revision=53281
2013-11-12 20:38:58 +00:00
Gerald Combs d111d15be2 "productsign" should work now. Remove "codesign".
svn path=/trunk/; revision=53243
2013-11-10 21:53:03 +00:00
Gerald Combs 1fc8fd9ba2 Be exceedingly diligent about checking OS X package signatures.
svn path=/trunk/; revision=53242
2013-11-10 21:44:50 +00:00
Gerald Combs 2965a6bf25 Add missing backslash.
svn path=/trunk/; revision=53212
2013-11-10 01:52:06 +00:00
Gerald Combs 04a7231d91 More packaging updates.
Specify "Application" or "Installer" code signing identities as needed.
Switch back to productbuild for the package. That seems to be the
correct utility to use. Give the package an ID. Package signing is still
broken but this appears to be closer to being correct.

svn path=/trunk/; revision=53211
2013-11-10 01:31:25 +00:00
Gerald Combs 48c5a9ae37 Bump LSMinimumSystemVersion to 10.6.
svn path=/trunk/; revision=53210
2013-11-10 01:25:38 +00:00
Gerald Combs f50535856a Fix argument order.
svn path=/trunk/; revision=53209
2013-11-10 00:39:09 +00:00
Gerald Combs e8106d01c9 Try switching back to codesign.
svn path=/trunk/; revision=53208
2013-11-10 00:24:56 +00:00
Gerald Combs 9f163b787d Sign the right file.
svn path=/trunk/; revision=53203
2013-11-09 19:22:42 +00:00
Gerald Combs 970b0a0245 Older versions of productsign don't support "--force" or "--verbose".
svn path=/trunk/; revision=53202
2013-11-09 19:00:19 +00:00
Gerald Combs c7f980342e Try to simplify package signing.
According to the packagemaker man page, '--target 10.5' will produce a
flat package. Use it instead of pkgutil.

svn path=/trunk/; revision=53201
2013-11-09 18:39:58 +00:00
Gerald Combs 3a21ccdeba Try to perform package signing as described at
http://stackoverflow.com/questions/11487596/making-os-x-installer-packages-like-a-pro-xcode4-developer-id-mountain-lion-re

We *might* have to switch away from packagemaker in order to be able to
sign packages properly.

svn path=/trunk/; revision=53199
2013-11-09 17:52:54 +00:00
Gerald Combs 3f385b31ab Print LC_VERSION_MIN_MACOSX for each executable and library.
svn path=/trunk/; revision=53145
2013-11-07 17:55:46 +00:00
Gerald Combs 31db0135f4 Add some verbosity.
svn path=/trunk/; revision=52929
2013-10-28 19:09:58 +00:00
Jeff Morriss 0690c4f490 More SVN properties cleanup.
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
Gerald Combs 7a3febacac Exit if we're building with Qt and we can't find macdeployqt.
svn path=/trunk/; revision=52853
2013-10-25 21:37:30 +00:00
Gerald Combs 2dd3a651e6 Code signing updates.
Sign executables, libraries, frameworks, plugins, and bundles as per the
Code Signing Guide. Check our work with spctl. Use "bundle" to
differentiate what we're doing with the package script.

svn path=/trunk/; revision=52746
2013-10-21 20:06:14 +00:00
Gerald Combs 98f3bb5f15 Sign all of the executables.
svn path=/trunk/; revision=52663
2013-10-17 22:34:38 +00:00
Gerald Combs c4dcd0ca24 If CODE_SIGN_IDENTITY is set use it to sign the app bundle and the
installer package. Add commented-out code to sign the .dmg as well in
case Apple supports that in the future.

svn path=/trunk/; revision=52633
2013-10-15 23:03:48 +00:00
Gerald Combs 9011036f76 Look for QtWidgets in the right directory.
svn path=/trunk/; revision=52601
2013-10-14 17:23:58 +00:00
Gerald Combs 7a1a387d51 Fixes for the utility-launcher script.
If we don't find Wireshark.app in WIRESHARK_APP_DIR or
/Applications/Wireshark.app, look for it using its bundle ID. Add a
description of this process to the Read Me First files. Look for
executables in the right subdirectory depending on our UI flavor.

Make sure we don't add GTK+-specific items to the app bundle if we're
using Qt.

svn path=/trunk/; revision=52502
2013-10-10 17:30:56 +00:00
Gerald Combs 6a8ceca13a Sometimes we need to @rpathify libraries from more than one directory.
Instead of trying to match libraries from $LIBPREFIX, exclude libraries
that aren't in well-known system paths and which haven't previously been
@rpathified.

svn path=/trunk/; revision=52479
2013-10-09 20:49:12 +00:00
Gerald Combs 9f45bac313 Try to fix building the GTK flavor OS X app.
svn path=/trunk/; revision=52442
2013-10-07 19:37:22 +00:00
Guy Harris 438f4be98a More debugging.
svn path=/trunk/; revision=52376
2013-10-05 09:13:14 +00:00