From 568818f061f719c2a7b4f2e5bfa5c69a1564eeeb Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 20 May 2012 14:35:07 +0000 Subject: [PATCH] more packaging tweaks git-svn-id: svn://localhost/ardour2/branches/3.0@12341 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/linux_packaging/build | 10 +++++++--- tools/osx_packaging/osx_build | 8 +++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 171b4197e2..41adb87d84 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -486,6 +486,13 @@ for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do echo Copied Mackie Control file $x done +# Templates +for f in * ; do + if [ -d "$f" ] ; then + echo Template: $f ; cp -r "$f" $Templates ; + fi +done + # ExportFormats # got to be careful with names here for x in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do @@ -628,9 +635,6 @@ fi cp -R ../../gtk2_ardour/splash.png $Shared -# Templates -cp ../../templates/*.template $Templates - # go through and recursively remove any .svn dirs in the bundle for svndir in `find $APPDIR -name .svn -type d`; do rm -rf $svndir diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 3076cecfce..d3d07c146c 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -308,15 +308,17 @@ mv $Surfaces/libardourcp*.dylib $Frameworks # Export formats cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners (cd ../../export && - for f in *.preset ; do - echo ExportFormat: $f; cp "$f" ../tools/osx_packaging/$ExportFormats ; + for f in *.preset *.format ; do + echo ExportFormat: $f + cp "$f" $ExportFormats ; done) # Session and Route templates (cd $BUILD_ROOT/../templates && \ for f in * ; do if [ -d "$f" ] ; then - echo Template: $f ; cp -r "$f" ../tools/osx_packaging/$Templates ; + echo Template: $f + cp -r "$f" $Templates ; fi done)