Commit Graph

30 Commits

Author SHA1 Message Date
Gerald Combs 4905983845 More shellcheck checks and fixes.
Remove a libtool check while we're here.

Change-Id: I813add2031480f34ce89f268b541f8939016c2c7
Reviewed-on: https://code.wireshark.org/review/28066
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07 18:11:12 +00:00
Gerald Combs 4aa049019a OS X: Remove GTK+ packaging.
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-14 16:09:42 +00:00
Gerald Combs 7199fc7cab OS X: Integrate CMake and osx-dmg.sh
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-10-01 16:26:25 +00:00
Guy Harris dab9c85cb3 Fix syntax.
Change-Id: Icc18cd7369bae21629aafd5631a373485ef75dea
Reviewed-on: https://code.wireshark.org/review/5081
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02 19:26:41 +00:00
Guy Harris 66e204fd93 Handle packagemaker being an ordinary command in /usr/bin.
Change-Id: Ic804a0fdb4dc450683f57be4814a347e20ecd401
Reviewed-on: https://code.wireshark.org/review/5079
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02 18:38:02 +00:00
Guy Harris 70cab47fe1 Fix syntax, add a check for failure to find PackageMaker, make sure it's a file.
Change-Id: Id5bb23a8c5ebd8a63a51029de541cd32e484029c
Reviewed-on: https://code.wireshark.org/review/5078
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02 18:10:58 +00:00
Guy Harris 4f94c9e9bf Handle PackageMaker a bit better.
Look for the binary in various places, rather than looking for
particular directories and adding them to the path.  That lets us use
the PackageMaker binary from the PackageMaker.app bundle (it can either
be run as a GUI app or from the command line), so you don't have to have
a symlink to it from one of the directories in question.

Change-Id: I1ad701291698544f96d419663f0b4a669876d2f1
Reviewed-on: https://code.wireshark.org/review/5077
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-02 17:26:23 +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 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
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
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
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 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 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 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
Guy Harris 438f4be98a More debugging.
svn path=/trunk/; revision=52376
2013-10-05 09:13:14 +00:00
Guy Harris b9eecb6f28 Report what file we were using to determine the architecture.
svn path=/trunk/; revision=52340
2013-10-03 00:33:30 +00:00
Gerald Combs 99f457bd03 Use separate "Read me first" files for Qt and GTK+.
svn path=/trunk/; revision=52321
2013-10-01 21:04:13 +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
Guy Harris 80e599e411 Don't assume developer tools are under /Developer - look for
/Applications/Xcode.app/Developer first (for Xcode 4 and later) and, if
we don't find that, look for /Developer.

Don't assume packagemaker is under $developer_path/usr/bin - with Xcode
4, you need to install Auxiliary Tools for Xcode to get PackageMaker,
and even that doesn't directly install the packagemaker command, so we
currently advise people to copy the PackageMaker binary to
/usr/bin/packagemaker.

svn path=/trunk/; revision=46957
2013-01-05 23:31:08 +00:00
Guy Harris a70b2c5208 Don't assume that, in the output of the file command, the architecture
appears at the end - if the user's installed an up-to-date version of
file to, for example, get pcap-ng files identified (Apple hasn't updated
file in *ages* - they're still in file 5.04!), it will report, for
example, "Mach-O 64-bit x86_64 executable" rather than "Mach-O 64-bit
executable x86_64" for an x86-64 binary.

svn path=/trunk/; revision=46954
2013-01-05 23:07:05 +00:00
Gerald Combs 132febfbc4 Get the package version using configure.in, not grep+sed. Make sure we
exit with an error in a few places where it would be useful.

svn path=/trunk/; revision=44572
2012-08-19 00:49:55 +00:00