summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2014-11-11 15:20:16 +0100
committerRobin Gareus <robin@gareus.org>2014-11-11 15:22:09 +0100
commit1ae111669c862d55d705909d394704f6e0625c31 (patch)
tree3c263527759653337a5324965dc0bfaedca85933 /tools
parentda17695c8144ce44172f8aed8634b2bb2f169337 (diff)
osx packaging: add some checks to reduce warnings
Diffstat (limited to 'tools')
-rwxr-xr-xtools/osx_packaging/osx_build23
1 files changed, 17 insertions, 6 deletions
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 6f47109dc3..b6e29c029d 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -117,7 +117,7 @@ if [ x$PRINT_SYSDEPS != x ] ; then
# print system dependencies
#
- for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Plugins/*.so ; do
+for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Plugins/*.so ; do
if ! file $file | grep -qs Mach-O ; then
continue
fi
@@ -377,15 +377,26 @@ done
# VAMP plugins that we use
cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.dylib $Frameworks
-# Suil modules
-cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Frameworks
+# Suil modules (new dir 'build-stack')
+if test -d $GTKSTACK_ROOT/lib/suil-0/ ; then
+ cp $GTKSTACK_ROOT/lib/suil-0/lib* $Frameworks
+fi
+
+# Suil modules (old dir 'build-ardour-stack')
+if test -d $ARDOURSTACK_ROOT/lib/suil-0/ ; then
+ cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Frameworks
+fi
# VST scanner app and wrapper script, if they exist
-cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/ || true
+if test -d $BUILD_ROOT/libs/fst ; then
+ cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/ || true
+fi
# vfork wrapper
-mkdir -p $Frameworks/vfork
-cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $VFork
+if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
+ mkdir -p $Frameworks/vfork
+ cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $VFork
+fi
while [ true ] ; do