updated app_build and exporter with latest build necessities

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

2 files changed, 17 insertions, 4 deletions

diff --git a/tools/osx_packaging/app_build.rb b/tools/osx_packaging/app_build.rb
index d566e2a093..452ba3988e 100755
--- a/tools/osx_packaging/app_build.rb
+++ b/tools/osx_packaging/app_build.rb
@@ -53,6 +53,10 @@ if not File.exist?(libdir+"/surfaces") then
    Dir.mkdir(libdir + "/surfaces")
 end
 
+if not File.exist?(libdir+"/vamp-plugins") then
+   Dir.mkdir(libdir + "/vamp-plugins")
+end
+
 
 odir = Dir.getwd
 Dir.chdir("../..")
@@ -67,6 +71,9 @@ results = results + result.split("\n").slice(1,result.size-1)
 result =  `otool -L libs/surfaces/*/*.dylib`
 results = results + result.split("\n").slice(1,result.size-1)
 
+result =  `otool -L libs/vamp-plugins/*.dylib`
+results = results + result.split("\n").slice(1,result.size-1)
+
 results.uniq!
 
 $stdout.print("Copying libs to #{libdir} ...\n");
@@ -117,6 +124,9 @@ begin
 rescue
 end
 
+# vamp plugins
+`cp ../../libs/vamp-plugins/*.dylib #{libdir}/vamp-plugins`
+
 
 # copy gtk and pango lib stuff
 `cp -R /opt/local/lib/pango #{libdir}/`
diff --git a/tools/osx_packaging/bin/exporter b/tools/osx_packaging/bin/exporter
index decec66ad8..454b1975dc 100755
--- a/tools/osx_packaging/bin/exporter
+++ b/tools/osx_packaging/bin/exporter
@@ -24,10 +24,13 @@ export ARDOUR_MODULE_PATH="$TOP/lib/"
 export ARDOUR_DATA_PATH="$TOP/share"
 export ARDOUR_GLADE_PATH="$TOP/share/ardour2/glade"
 
-export LADSPA_RDF_PATH="$HOME/Library/Audio/Plug-Ins/LADSPA/rdf:/Library/Audio/Plug-Ins/LADSPA/rdf:$TOP/s
-hare/ladspa/rdf:/usr/local/share/ladspa/rdf:/usr/share/ladspa/rdf"
-export LADSPA_PATH="$HOME/Library/Audio/Plug-Ins/LADSPA:/Library/Audio/Plug-Ins/LADSPA:/usr/local/lib/lad
-spa:/usr/lib/ladspa"
+export ARDOUR_PATH="$TOP/share/ardour/icons:$TOP/share/ardour/pixmaps"
+
+
+export LADSPA_RDF_PATH="$HOME/Library/Audio/Plug-Ins/LADSPA/rdf:/Library/Audio/Plug-Ins/LADSPA/rdf:$TOP/share/ladspa/rdf:/usr/local/share/ladspa/rdf:/usr/share/ladspa/rdf"
+export LADSPA_PATH="$HOME/Library/Audio/Plug-Ins/LADSPA:/Library/Audio/Plug-Ins/LADSPA:/usr/local/lib/ladspa:/usr/lib/ladspa"
+
+export VAMP_PATH="$TOP/lib/vamp-plugins" 
 
 mkdir -p "$ETC"
 sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "$ETC/pangorc"