more tweaks to bundles, search paths and packaging
git-svn-id: svn://localhost/ardour2/branches/3.0@12339 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
8badf7492e
commit
746b020d9f
@ -166,13 +166,7 @@ fixup_bundle_environment (int, char* [])
|
|||||||
}
|
}
|
||||||
setenv ("PATH", path.c_str(), 1);
|
setenv ("PATH", path.c_str(), 1);
|
||||||
|
|
||||||
path = dir_path;
|
export_search_path (dir_path, "ARDOUR_DLL_PATH", "/../Frameworks");
|
||||||
path += "/../Surfaces";
|
|
||||||
path += ':';
|
|
||||||
path += dir_path;
|
|
||||||
path += "/../Panners";
|
|
||||||
|
|
||||||
setenv ("ARDOUR_DLL_PATH", path.c_str(), 1);
|
|
||||||
|
|
||||||
path += dir_path;
|
path += dir_path;
|
||||||
path += "/../Resources";
|
path += "/../Resources";
|
||||||
@ -183,31 +177,15 @@ fixup_bundle_environment (int, char* [])
|
|||||||
machine-independent shared data.
|
machine-independent shared data.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
setenv ("ARDOUR_DATA_PATH", path.c_str(), 1);
|
export_search_path (dir_path, "ARDOUR_DATA_PATH", "/../Resources");
|
||||||
setenv ("ARDOUR_CONFIG_PATH", path.c_str(), 1);
|
export_search_path (dir_path, "ARDOUR_CONFIG_PATH", "/../Resources");
|
||||||
setenv ("ARDOUR_INSTANT_XML_PATH", path.c_str(), 1);
|
export_search_path (dir_path, "ARDOUR_INSTANT_XML_PATH", "/../Resources");
|
||||||
|
|
||||||
export_search_path (dir_path, "LADSPA_PATH", "/../Plugins");
|
export_search_path (dir_path, "LADSPA_PATH", "/../Plugins");
|
||||||
export_search_path (dir_path, "VAMP_PATH", "/../Frameworks");
|
export_search_path (dir_path, "VAMP_PATH", "/../Frameworks");
|
||||||
|
|
||||||
/* in theory these do not need to be set since they would be found
|
|
||||||
using ARDOUR_DATA_PATH or ARDOUR_CONFIG_PATH suffixed by a suitable
|
|
||||||
folder/directory name. However, the way we bundle Ardour on OS X
|
|
||||||
uses Capitalized names for these folders which differs from
|
|
||||||
the hard-coded folder/directory name. In addition each of them
|
|
||||||
lives at the top level of the .app/Contents tree, rather
|
|
||||||
than within Resources or Frameworks.
|
|
||||||
*/
|
|
||||||
|
|
||||||
export_search_path (dir_path, "ARDOUR_PANNER_PATH", "/../Panners");
|
|
||||||
export_search_path (dir_path, "ARDOUR_SURFACES_PATH", "/../Surfaces");
|
|
||||||
export_search_path (dir_path, "ARDOUR_MIDIMAPS_PATH", "/../MidiMaps");
|
|
||||||
export_search_path (dir_path, "ARDOUR_MCP_PATH", "../MCP");
|
|
||||||
export_search_path (dir_path, "ARDOUR_EXPORT_FORMATS_PATH", "/../ExportFormats");
|
|
||||||
|
|
||||||
path = dir_path;
|
path = dir_path;
|
||||||
path += "/../Frameworks/clearlooks";
|
path += "/../Frameworks/clearlooks";
|
||||||
|
|
||||||
setenv ("GTK_PATH", path.c_str(), 1);
|
setenv ("GTK_PATH", path.c_str(), 1);
|
||||||
|
|
||||||
/* unset GTK_RC_FILES so that we only load the RC files that we define
|
/* unset GTK_RC_FILES so that we only load the RC files that we define
|
||||||
|
@ -144,16 +144,20 @@ APPLIB=$APPDIR/lib
|
|||||||
Libraries=$APPLIB
|
Libraries=$APPLIB
|
||||||
Etc=$APPDIR/etc
|
Etc=$APPDIR/etc
|
||||||
Shared=$APPDIR/share
|
Shared=$APPDIR/share
|
||||||
|
|
||||||
Plugins=$APPLIB/plugins
|
Plugins=$APPLIB/plugins
|
||||||
Surfaces=$APPLIB/surfaces
|
Surfaces=$APPLIB/surfaces
|
||||||
Panners=$APPLIB/panners
|
Panners=$APPLIB/panners
|
||||||
|
|
||||||
|
Modules=$Libraries/modules
|
||||||
|
Loaders=$Libraries/loaders
|
||||||
|
|
||||||
|
Templates=$Shared/templates
|
||||||
ExportFormats=$Shared/export
|
ExportFormats=$Shared/export
|
||||||
Locale=$Shared/locale
|
Locale=$Shared/locale
|
||||||
MidiMaps=$Shared/midi_maps
|
MidiMaps=$Shared/midi_maps
|
||||||
PatchFiles=$Shared/patchfiles
|
PatchFiles=$Shared/patchfiles
|
||||||
MackieControl=$Shared/mcp
|
MackieControl=$Shared/mcp
|
||||||
Modules=$Libraries/modules
|
|
||||||
Loaders=$Libraries/loaders
|
|
||||||
|
|
||||||
if [ x$PRINT_SYSDEPS != x ] ; then
|
if [ x$PRINT_SYSDEPS != x ] ; then
|
||||||
#
|
#
|
||||||
@ -622,8 +626,9 @@ fi
|
|||||||
# share stuff
|
# share stuff
|
||||||
|
|
||||||
cp -R ../../gtk2_ardour/splash.png $Shared
|
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
|
# go through and recursively remove any .svn dirs in the bundle
|
||||||
for svndir in `find $APPDIR -name .svn -type d`; do
|
for svndir in `find $APPDIR -name .svn -type d`; do
|
||||||
|
@ -97,17 +97,25 @@ APPDIR=${APPNAME}.app
|
|||||||
APPROOT=$APPDIR/Contents
|
APPROOT=$APPDIR/Contents
|
||||||
Frameworks=$APPROOT/Frameworks
|
Frameworks=$APPROOT/Frameworks
|
||||||
Resources=$APPROOT/Resources
|
Resources=$APPROOT/Resources
|
||||||
Plugins=$APPROOT/Plugins
|
#
|
||||||
Surfaces=$APPROOT/Surfaces
|
# Since this is OS X, don't try to distinguish between etc and shared
|
||||||
Panners=$APPROOT/Panners
|
# (machine dependent and independent data) - just put everything
|
||||||
MidiMaps=$APPROOT/MidiMaps
|
# into Resources.
|
||||||
PatchFiles=$APPROOT/PatchFiles
|
#
|
||||||
MCP=$APPROOT/MCP
|
Shared=$Resources
|
||||||
ExportFormats=$APPROOT/ExportFormats
|
Etc=$Resources
|
||||||
Templates=$APPROOT/Templates
|
|
||||||
Shared=$Resources/share
|
|
||||||
Etc=$Resources/etc
|
|
||||||
Locale=$Resources/locale
|
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
|
if [ x$PRINT_SYSDEPS != x ] ; then
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user