backport a3 osx_build changes

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12435 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 52 insertions, 44 deletions

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index e098885fd6..8233868be6 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -2,12 +2,13 @@
 
 # script for pulling together a MacOSX app bundle.
 
-GTKQUARTZ_ROOT=$HOME/gtk/inst
-GTKQUARTZ_ROOT=$HOME/gtk/inst
+GTKSTACK_ROOT=$HOME/gtk/inst
+ARDOURSTACK_ROOT=$HOME/a3/inst
+BUILD_ROOT=../..
 
 if pkg-config --modversion gtk+-2.0 | grep -s 2.22 ; then
     # older GTK
-    GDKPIXBUF_LOADERS=$GTKQUARTZ_ROOT/lib/gtk-2.0/2.10.0/loaders
+    GDKPIXBUF_LOADERS=$GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/loaders
     echo 
     echo
     echo "*****************************************************"
@@ -17,7 +18,7 @@ if pkg-config --modversion gtk+-2.0 | grep -s 2.22 ; then
     echo
 else
     # newer GTK
-    GDKPIXBUF_LOADERS=$GTKQUARTZ_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders
+    GDKPIXBUF_LOADERS=$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders
     echo 
     echo
     echo "*****************************************************"
@@ -252,15 +253,15 @@ if test x$WITH_NLS != x ; then
     done
     for l in $LINGUAS
     do
-      if [ -d $GTKQUARTZ_ROOT/share/locale/$l ] ; then
+      if [ -d $GTKSTACK_ROOT/share/locale/$l ] ; then
 	  echo "Copying GTK i18n files for $l..."
-	  cp -r $GTKQUARTZ_ROOT/share/locale/$l $Locale
+	  cp -r $GTKSTACK_ROOT/share/locale/$l $Locale
       else
 	  # try with just the language spec
 	  just_lang=`echo $l | sed 's/_[A-Z][A-Z]$//'`
-	  if [ -d $GTKQUARTZ_ROOT/share/locale/$just_lang ] ; then
+	  if [ -d $GTKSTACK_ROOT/share/locale/$just_lang ] ; then
 	      echo "Copying GTK i18n files for $l..."
-	      cp -r $GTKQUARTZ_ROOT/share/locale/$just_lang $Locale
+	      cp -r $GTKSTACK_ROOT/share/locale/$just_lang $Locale
 	  fi
       fi
     done
@@ -268,54 +269,61 @@ else
     echo "Skipping NLS support"
 fi
 
-cp -R $GTKQUARTZ_ROOT/etc/* $Etc
+
+#
+# Copy stuff that may be dynamically loaded
+# 
+
+cp -R $GTKSTACK_ROOT/etc/* $Etc
 echo "Copying all Pango modules ..."
-cp -R $GTKQUARTZ_ROOT/lib/pango/1.6.0/modules/*.so $Frameworks/modules
+cp -R $GTKSTACK_ROOT/lib/pango/1.6.0/modules/*.so $Frameworks/modules
 echo "Copying all GDK Pixbuf loaders ..."
-cp -R $GDKPIXBUF_LOADERS/*.so $Frameworks/modules
+cp -R $GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so $Frameworks/modules
 # charset alias file
-cp -R $GTKQUARTZ_ROOT/lib/charset.alias $Resources
-
-pwd=`pwd`
-
-if test x$WITH_LADSPA != x ; then
-    if test x$SAE != x ; then
-	plugdir=sae_ladspa
-    elif test x$MIXBUS != x ; then
-	plugdir=mixbus_ladspa
-    else
-	plugdir=ladspa
-    fi
-    echo "Copying `ls $plugdir | wc -l` plugins ..."
-    cp -r $plugdir/* $Plugins
-fi
+cp -R $GTKSTACK_ROOT/lib/charset.alias $Resources
 
 # generate new Pango module file
 cat > pangorc <<EOF 
 [Pango]
-ModulesPath=$GTKQUARTZ_ROOT/lib/pango/1.6.0/modules
+ModulesPath=$GTKSTACK_ROOT/lib/pango/1.6.0/modules
 EOF
-env PANGO_RC_FILE=pangorc $GTKQUARTZ_ROOT/bin/pango-querymodules | sed "s?$GTKQUARTZ_ROOT/lib/pango/1.6.0/modules/?@executable_path/../Frameworks/modules/?" > $Resources/pango.modules
+env PANGO_RC_FILE=pangorc $GTKSTACK_ROOT/bin/pango-querymodules | sed "s?$GTKSTACK_ROOT/lib/pango/1.6.0/modules/?@executable_path/../lib/modules/?" > $Resources/pango.modules
 rm pangorc
 
 # generate a new GDK pixbufs loaders file
-gdk-pixbuf-query-loaders | sed "s?$GDKPIXBUF_LOADERS/?@executable_path/../Frameworks/modules/?" > $Resources/gdk-pixbuf.loaders
+gdk-pixbuf-query-loaders | sed "s?$GTKSTACK_ROOT/lib/gdk-pixbuf-2.0/2.10.0/loaders/?@executable_path/../lib/modules/?" > $Resources/gdk-pixbuf.loaders
+
+# We rely on clearlooks, so include a version from our own build tree
+# this one is special - we will set GTK_PATH to $Libraries/clearlooks
 
-# this one is special - we will set GTK_PATH to $Frameworks/clearlooks
-cp ../../libs/clearlooks-newer/libclearlooks.dylib $Frameworks
+echo "Copying clearlooks ..."
+cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.dylib $Frameworks
 mkdir -p $Frameworks/clearlooks/engines
 (cd $Frameworks/clearlooks/engines && ln -s ../../libclearlooks.dylib libclearlooks.dylib && ln -s ../../libclearlooks.dylib libclearlooks.so)
 
-# XXX STILL NEED TO DO PANNERS FOR TRUNK
-cp ../../libs/surfaces/*/libardour_*.dylib $Surfaces
-# hack ... move libardour_cp back into Frameworks
-mv $Surfaces/libardour_cp.dylib $Frameworks
+if test x$WITH_LADSPA != x ; then
+    if test x$SAE != x ; then
+	plugdir=sae_ladspa
+    elif test x$MIXBUS != x ; then
+	plugdir=mixbus_ladspa
+    else
+	plugdir=ladspa
+    fi
+    if [ -d $plugdir -a x`ls $plugdir` != x ] ; then 
+        echo "Copying `ls $plugdir | wc -l` plugins ..."
+        cp -r $plugdir/* $Plugins
+    fi
+fi
+
+# Control Surface shared libraries
+cp $BUILD_ROOT/libs/surfaces/*/libardour_*.dylib $Surfaces
+cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp*.dylib $Frameworks
 
 # VAMP plugins that we use
-cp ../../libs/vamp-plugins/libardourvampplugins.dylib $Frameworks
+cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.dylib $Frameworks
 
-# SUIL Modules
-cp $HOME/a3/inst/lib/suil-0/libsuil* $Frameworks
+# Suil modules
+cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Frameworks
 
 while [ true ] ; do 
     missing=false
@@ -324,10 +332,10 @@ while [ true ] ; do
 	    continue
 	fi
 	if test x$INTERNAL_JACK != x ; then
-	    deps=`otool -L $file | awk '{print $1}' | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)"`
+	    deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)"`
 	else
 	    # do not include libjack
-	    deps=`otool -L $file | awk '{print $1}' | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)" | grep -v 'libjack\.'`
+	    deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | grep -v 'libjack\.'`
 	fi
 	echo -n "."
 	for dep in $deps ; do
@@ -413,12 +421,12 @@ for exe in $executables; do
     EXE=$APPROOT/MacOS/$exe
     changes=""
     if test x$INTERNAL_JACK != x ; then
-	for lib in `otool -L $EXE | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)" | awk '{print $1}'` ; do
+	for lib in `otool -L $EXE | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | awk '{print $1}'` ; do
 	    base=`basename $lib`
 	    changes="$changes -change $lib @executable_path/../Frameworks/$base"
 	done
     else
-	for lib in `otool -L $EXE | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
+	for lib in `otool -L $EXE | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
 	    base=`basename $lib`
 	    changes="$changes -change $lib @executable_path/../Frameworks/$base"
 	done
@@ -438,12 +446,12 @@ for dylib in $JACK_SHARED_OBJECTS $Frameworks/*.dylib $Frameworks/modules/*.so $
 
 	changes=""
 	if test x$INTERNAL_JACK != x ; then
-	    for lib in `otool -L $dylib | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)" | awk '{print $1}'` ; do
+	    for lib in `otool -L $dylib | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | awk '{print $1}'` ; do
 		base=`basename $lib`
 		changes="$changes -change $lib @executable_path/../Frameworks/$base"
 	    done
 	else
-	    for lib in `otool -L $dylib | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
+	    for lib in `otool -L $dylib | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
 		base=`basename $lib`
 		changes="$changes -change $lib @executable_path/../Frameworks/$base"
 	    done