diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-11-02 09:25:11 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-11-02 17:26:23 +0000 |
| commit | 4f94c9e9bfc5bb922759951c5822614c5bddae69 (patch) | |
| tree | 334f33373927d65f011f04716888cc0afd4910d6 /packaging/macosx/osx-dmg.sh.in | |
| parent | f9680171b7a78eae01e0a6defd4a70e6bef01210 (diff) | |
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>
Diffstat (limited to 'packaging/macosx/osx-dmg.sh.in')
| -rwxr-xr-x | packaging/macosx/osx-dmg.sh.in | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in index 779f3a2fac..af76d2ce9d 100755 --- a/packaging/macosx/osx-dmg.sh.in +++ b/packaging/macosx/osx-dmg.sh.in @@ -45,16 +45,27 @@ auto_open_opt= ws_bin="$app_bundle/Contents/MacOS/Wireshark" readme_name="Read_me_first_qt.rtf" -if [ -d /Applications/Xcode.app/Developer ] +if [ -x /Applications/Xcode.app/Contents/Applications/PackageMaker.app/Contents/MacOS/PackageMaker ] then - developer_path=/Applications/Xcode.app/Developer -elif [ -d /Developer ] + # + # Xcode 4 and later, with the "Auxiliary Tools for Xcode" + # download from developer.apple.com. (There are no such + # downloads for Mavericks or later, but PackageMaker from + # the Late July 2012 download for Mountain Lion appears to + # work on Yosemite.) + # + packagemaker=/Applications/Xcode.app//Contents/Applications/PackageMaker.app/Contents/MacOS/PackageMaker +elif [ -x /Applications/Xcode.app/Developer/Tools/packagemaker ] + packagemaker=/Applications/Xcode.app/Developer/Tools/packagemaker then - developer_path=/Developer -fi -if [ ! -z $developer_path ] +elif [ -x /Applications/Xcode.app/Developer/usr/bin/packagemaker ] + packagemaker=/Applications/Xcode.app/Developer/usr/bin/packagemaker then - PATH=$PATH:$developer_path/Tools:$developer_path/usr/bin +elif [ -x /Developer/Tools/packagemaker + packagemaker=/Developer/Tools/packagemaker +fi +elif [ -x /Developer/usr/bin/packagemaker + packagemaker=/Developer/usr/bin/packagemaker fi # Help message @@ -147,7 +158,7 @@ echo -e "\nCREATE WIRESHARK PACKAGE\n" pkg_title="$volume_name $version $architecture" pkg_file="$pkg_title.pkg" rm -rf "$pkg_file" -packagemaker --doc "Wireshark_package.pmdoc" \ +$packagemaker --doc "Wireshark_package.pmdoc" \ --title "$pkg_title" \ --id "org.wireshark.pkg.Wireshark" \ --version "$version" \ |