diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-10-04 16:27:08 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-10-06 04:33:55 +0000 |
| commit | 6172627534168bb31415fa31a7cecdb15bcca4ab (patch) | |
| tree | 3804d72fe123a3c0e9fb1137a662207a0d4f3a5d /packaging | |
| parent | ae794fc5f24e893b20f4161ac3cfb20e018e9b96 (diff) | |
Make osx-app.sh a configured file and remove Autotools targets.
Rename osx-app.sh to osx-app.sh.in and add the version to the plugin
path at configure time.
Instead up updating Autotools accordingly just remove the macOS
packaging targets. gf61c381b5a removed support for Autotools in
osx-app.sh and if anyone wants to build macOS packages I'd prefer that
they use the same toolchain as the buildbot.
Change-Id: Ide5205265bf8859a85b1afab68fa8f8285952bd3
Reviewed-on: https://code.wireshark.org/review/23839
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/macosx/Makefile.am | 2 | ||||
| -rwxr-xr-x | packaging/macosx/osx-app.sh.in (renamed from packaging/macosx/osx-app.sh) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am index b841a6d2d2..b025f8600d 100644 --- a/packaging/macosx/Makefile.am +++ b/packaging/macosx/Makefile.am @@ -21,7 +21,7 @@ EXTRA_DIST = \ dmg_set_style.scpt \ Info.plist \ Info.plist.in \ - osx-app.sh \ + osx-app.sh.in \ osx-dmg.sh.in \ Read_me_first.rtf \ Scripts/chmodbpf-postinstall.sh \ diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh.in index 086096c0ad..78a05f6861 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh.in @@ -232,7 +232,7 @@ pkgexec="$bundle/Contents/MacOS" pkgres="$bundle/Contents/Resources" pkgbin="$pkgres/bin" pkglib="$bundle/Contents/Frameworks" -pkgplugin=$( find "$bundle/Contents/PlugIns/wireshark" -type d -maxdepth 1 -name '[1-9]*' | head -1 ) +pkgplugin="$bundle/Contents/PlugIns/wireshark/@VERSION_MAJOR@.@VERSION_MINOR@" # Set the 'macosx' directory, usually the current directory. resdir=`pwd` |