Commit Graph

29 Commits

Author SHA1 Message Date
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 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
Gerald Combs 4c1696960b Add Wireshark back to the GTK+ package.
svn path=/trunk/; revision=52323
2013-10-01 21:43:51 +00:00
Gerald Combs 2d1b16fb26 The Qt executables shouldn't need any wrappers. Just copy them over
as-is.

svn path=/trunk/; revision=52303
2013-09-30 17:33:59 +00:00
Gerald Combs 5687b33b4e Make sure we copy Wireshark's libraries to Frameworks. Use top_builddir
instead of top_srcdir. It shouldn't make any difference in our case but
it's more correct.

svn path=/trunk/; revision=52302
2013-09-30 17:19:48 +00:00
Gerald Combs 097feb5a64 Be a little more verbose.
svn path=/trunk/; revision=52297
2013-09-30 15:37:11 +00:00
Gerald Combs 2211ab0fba Use macdeployqt to add the Qt bits to our bundle. Put our libraries in
Contents/Frameworks since that's what macdeployqt expects. Have
osx-dmg.sh look at the correct executable.

svn path=/trunk/; revision=52295
2013-09-30 13:12:28 +00:00
Gerald Combs 2468b33cce More Qt app bundle migration. Still doesn't work quite right.
svn path=/trunk/; revision=52293
2013-09-30 11:29:58 +00:00
Gerald Combs 0a75c9d872 Start migrating the OS X app bundle to Qt. This will likely break the
installers.

svn path=/trunk/; revision=52292
2013-09-30 10:20:43 +00:00
Guy Harris bc239a7286 On OS X, set the rpath for executables to include
@executable_path/../lib as well as /usr/local/lib, so we can use @rpath
in the install names in the executables and libraries in the application
bundle.

Have the osx-app.sh script tweak all references to libraries from
/usr/local/lib in all executables, libraries, and plugins in the app
bundle to use @rpath.  (The "all" is important; it fixes the GTK+ crash
mentioned in the comment in osx-app.sh.  The notion of doing all of them
came from the osx-app.sh script in a newer version of Inkscape.)

This renders the setting of DYLD_LIBRARY_PATH in the wrapper scripts in
the bundle unnecessary; remove it.  (Ideally, we should try to get rid
of the wrapper scripts entirely, but that might have to wait for us to
switch to using Qt.)

svn path=/trunk/; revision=50560
2013-07-13 22:43:35 +00:00
Guy Harris 94c182486c Suggest why the rpathification of the libraries might not be sufficient.
Don't rpathify system libraries.

Rpathify with @rpath, not @executable_path.

Use the right path for the binaries and libraries.

svn path=/trunk/; revision=50547
2013-07-13 01:16:14 +00:00
Guy Harris 519c5affa2 Add a --enable-osx-deploy-target option to set the deployment target
when building for OS X; that causes the MACOSX_DEPLOYMENT_TARGET
environment variable to be set when building (so that, for example, we
don't use linker features available on the version on which we're
building but not on the minimum OS version for which we're building),
and causes the SDK for that version to be used (so that, for example, we
don't link with libraries with later version numbers than the ones
provided with the OS version for which we're building).

svn path=/trunk/; revision=50410
2013-07-06 16:42:30 +00:00
Guy Harris 2b3849b3d8 Default to LIBPREFIX being /usr/local, as that's where macosx-setup.sh
puts them.  If you choose to use MacPorts versions of the library, edit
the script or run it with -l.

Update the usage message and fix a typo.

svn path=/trunk/; revision=46955
2013-01-05 23:11:38 +00:00
Jeff Morriss aab480d191 Followup to r43370: don't install idl2wrs or its man page.
svn path=/trunk/; revision=43377
2012-06-19 17:32:49 +00:00
Guy Harris b1d83d8d8b We don't have an "--enable-osxapp" configure option; update a comment.
svn path=/trunk/; revision=38075
2011-07-17 23:47:10 +00:00
Guy Harris 0b967aa242 Handle versions of GTK+ where gdk-pixbuf is a separate library.
svn path=/trunk/; revision=38072
2011-07-17 20:23:07 +00:00
Guy Harris a9447bddf0 Fix annoying typo.
svn path=/trunk/; revision=37318
2011-05-20 02:44:12 +00:00
Guy Harris 4b7cc99d00 In at least some versions of OS X SystemStarter gets cranky if the
startup item is group-writable.

svn path=/trunk/; revision=37316
2011-05-20 02:35:05 +00:00
Stig Bjørlykke 8be03c48ec Copy GDK pixbuf loaders libs to the Wireshark.app.
svn path=/trunk/; revision=34583
2010-10-20 10:37:11 +00:00
Stig Bjørlykke e6a0b91f06 Remove copying gnome-vfs modules, we don't use it.
svn path=/trunk/; revision=31405
2010-01-01 23:42:38 +00:00
Stig Bjørlykke 257180c801 Added support for python bindings in the OSX package.
svn path=/trunk/; revision=28548
2009-05-31 18:30:46 +00:00
Gerald Combs 8a6694ccd5 Don't rename the "ChmodBPF" directory to "Startup". Add an alias to
/Library/StartupItems with an arrow similar to the top-level directory.
Update the arrow image in the top-level directory. Adjust the layouts of
the top-level and Utilities directories. Update the documentation.

svn path=/trunk/; revision=28135
2009-04-22 20:37:48 +00:00
Stig Bjørlykke 9bd7d21dff Do not overwrite existing files when copying dependencies, as this will
overwrite the wireshark libs with libs installed in /opt/local, which is
probably not the ones we want.

svn path=/trunk/; revision=25483
2008-06-18 22:47:58 +00:00
Gerald Combs 0859a2be01 Scale the 128-pixel icon down a little, so that it looks better in the dock.
Strip terminal control characters out of the build scripts, so that their
buildbot output is readable.

svn path=/trunk/; revision=24709
2008-03-21 16:09:04 +00:00
Gerald Combs 46bcad885a Check in the OS X packaging patch from bug 2341, since I've had
confirmation that the OS X package works on at least one system
other than my laptop.

svn path=/trunk/; revision=24640
2008-03-15 18:31:52 +00:00