only include specific ladspa plugins in SAE package; get version info a little more accurate in OS X bundle

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

7 files changed, 18 insertions, 11 deletions

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 3998490040..60fec9ca8d 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -9,7 +9,7 @@ WITH_JACK=1
 WITH_LADSPA=1
 STRIP=1
 PRINT_SYSDEPS=
-WITH_NLS=0
+WITH_NLS=
 
 while [ $# -gt 0 ] ; do
     echo "arg = $1"
@@ -19,9 +19,9 @@ while [ $# -gt 0 ] ; do
 	# top level build targets
 	#
 
-	--sae) WITH_NLS=0 ; SAE=1 ; WITH_JACK=1; WITH_LADSPA=1; STRIP= ; shift ;;
-	--public) WITH_NLS=0 ; SAE= ; WITH_JACK=; WITH_LADSPA=1; STRIP= ; shift ;;
-	--allinone) SAE= ; WITH_NLS=0 ; WITH_JACK=1; WITH_LADSPA=1; STRIP= ; shift ;;
+	--sae) WITH_NLS= ; SAE=1 ; WITH_JACK=1; WITH_LADSPA=1; STRIP= ; shift ;;
+	--public) WITH_NLS= ; SAE= ; WITH_JACK=; WITH_LADSPA=1; STRIP= ; shift ;;
+	--allinone) SAE= ; WITH_NLS= ; WITH_JACK=1; WITH_LADSPA=1; STRIP= ; shift ;;
 	--test) SAE= ; WITH_JACK=; WITH_LADSPA=; STRIP= ; shift ;;
 
 	#
@@ -36,9 +36,11 @@ while [ $# -gt 0 ] ; do
     esac
 done
 
-version=`grep -m 1 '^ardour_version' ../../SConstruct | cut -d' ' -f 3 | sed "s/'//g"`
-echo "Version is $version"
-info_string="$version built on `hostname` by `whoami` on `date`"
+
+release_version=`grep -m 1 '^ardour_version' ../../SConstruct | cut -d' ' -f 3 | sed "s/'//g"`
+svn_version=`grep -m 1 'svn_revision =' ../../libs/ardour/svn_revision.cc | cut -d' ' -f 6 | sed 's/[";]//g'`
+echo "Version is $release_version / $svn_version"
+info_string="$release_version/$svn_version built on `hostname` by `whoami` on `date`"
 echo "Info string is $info_string"
 
 # setup directory structure
@@ -110,7 +112,7 @@ env="<key>LSEnvironment</key><dict><key>ARDOUR_BUNDLED</key><string>true</string
 
 # edit plist
 sed -e "s?@ENV@?$env?g" \
-    -e "s?@VERSION@?$version?g" \
+    -e "s?@VERSION@?$svn_version?g" \
     -e "s?@INFOSTRING@?$info_string?g" < Info.plist.in > Info.plist
 
 # copy static files
@@ -119,7 +121,7 @@ cp Info.plist $APPROOT
 cp -R Resources $APPROOT
 
 echo "Copying ardour executable ...."
-cp ../../gtk2_ardour/ardour-$version $APPROOT/MacOS/Ardour2
+cp ../../gtk2_ardour/ardour-$release_version $APPROOT/MacOS/Ardour2
 if test x$SAE != x ; then
     cp ../../gtk2_ardour/evtest $APPROOT/MacOS/gtkevents
     cp  Ardour2-SAE.icns $Resources/appIcon.icns
@@ -158,8 +160,13 @@ cp -R $GTKQUARTZ_ROOT/lib/charset.alias $Resources
 pwd=`pwd`
 
 if test x$WITH_LADSPA != x ; then
-    echo "Copying `ls ladspa | wc -l` plugins ..."
-    cp -r ladspa/* $Plugins
+    if test x$SAE != x ; then
+	plugdir=sae_ladspa
+    else
+	plugdir=ladspa
+    fi
+    echo "Copying `ls $plugdir | wc -l` plugins ..."
+    cp -r $plugdir/* $Plugins
 fi
 
 # generate new Pango module file
diff --git a/tools/osx_packaging/sae_ladspa/caps.so b/tools/osx_packaging/sae_ladspa/caps.so
new file mode 100755
index 0000000000..e53b10791d
--- /dev/null
+++ b/tools/osx_packaging/sae_ladspa/caps.so
diff --git a/tools/osx_packaging/sae_ladspa/cmt.so b/tools/osx_packaging/sae_ladspa/cmt.so
new file mode 100755
index 0000000000..e834f6528f
--- /dev/null
+++ b/tools/osx_packaging/sae_ladspa/cmt.so
diff --git a/tools/osx_packaging/sae_ladspa/fast_lookahead_limiter_1913.so b/tools/osx_packaging/sae_ladspa/fast_lookahead_limiter_1913.so
new file mode 100755
index 0000000000..159f36d89b
--- /dev/null
+++ b/tools/osx_packaging/sae_ladspa/fast_lookahead_limiter_1913.so
diff --git a/tools/osx_packaging/sae_ladspa/gverb_1216.so b/tools/osx_packaging/sae_ladspa/gverb_1216.so
new file mode 100755
index 0000000000..0aea9095d7
--- /dev/null
+++ b/tools/osx_packaging/sae_ladspa/gverb_1216.so
diff --git a/tools/osx_packaging/sae_ladspa/single_para_1203.so b/tools/osx_packaging/sae_ladspa/single_para_1203.so
new file mode 100755
index 0000000000..514bd9be91
--- /dev/null
+++ b/tools/osx_packaging/sae_ladspa/single_para_1203.so
diff --git a/tools/osx_packaging/sae_ladspa/tap_pitch.so b/tools/osx_packaging/sae_ladspa/tap_pitch.so
new file mode 100755
index 0000000000..c32e5ee88e
--- /dev/null
+++ b/tools/osx_packaging/sae_ladspa/tap_pitch.so