diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-20 14:23:49 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-20 14:23:49 +0000 |
| commit | 746b020d9f29cb1dd4521346f3bc24cedb184d79 (patch) | |
| tree | 160eac5a2b8d76d8fb304b7a43bbf0c1ab41c081 /tools | |
| parent | 8badf7492efb696461f4649e2b4de38123f87c78 (diff) | |
more tweaks to bundles, search paths and packaging
git-svn-id: svn://localhost/ardour2/branches/3.0@12339 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/build | 13 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 28 |
2 files changed, 27 insertions, 14 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index cc5cf31f73..b775bc7dce 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -144,16 +144,20 @@ APPLIB=$APPDIR/lib Libraries=$APPLIB Etc=$APPDIR/etc Shared=$APPDIR/share + Plugins=$APPLIB/plugins Surfaces=$APPLIB/surfaces Panners=$APPLIB/panners + +Modules=$Libraries/modules +Loaders=$Libraries/loaders + +Templates=$Shared/templates ExportFormats=$Shared/export Locale=$Shared/locale MidiMaps=$Shared/midi_maps PatchFiles=$Shared/patchfiles MackieControl=$Shared/mcp -Modules=$Libraries/modules -Loaders=$Libraries/loaders if [ x$PRINT_SYSDEPS != x ] ; then # @@ -622,8 +626,9 @@ fi # share stuff cp -R ../../gtk2_ardour/splash.png $Shared -# currently no templates -#cp ../../templates/*.template $Shared/templates/ + +# 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 diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 24c353997f..3076cecfce 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -97,17 +97,25 @@ APPDIR=${APPNAME}.app APPROOT=$APPDIR/Contents Frameworks=$APPROOT/Frameworks Resources=$APPROOT/Resources -Plugins=$APPROOT/Plugins -Surfaces=$APPROOT/Surfaces -Panners=$APPROOT/Panners -MidiMaps=$APPROOT/MidiMaps -PatchFiles=$APPROOT/PatchFiles -MCP=$APPROOT/MCP -ExportFormats=$APPROOT/ExportFormats -Templates=$APPROOT/Templates -Shared=$Resources/share -Etc=$Resources/etc +# +# Since this is OS X, don't try to distinguish between etc and shared +# (machine dependent and independent data) - just put everything +# into Resources. +# +Shared=$Resources +Etc=$Resources Locale=$Resources/locale +# +# Bundled Plugins live in a top level folder +# +Plugins=$APPROOT/Plugins +Surfaces=$Frameworks/surfaces +Panners=$Frameworks/panners +MidiMaps=$Shared/midi_maps +ExportFormats=$Shared/export +Templates=$Shared/templates +PatchFiles=$Shared/patchfiles +MCP=$Shared/mcp if [ x$PRINT_SYSDEPS != x ] ; then # |