From 813c5f0af9d1dac32b156ef3c72b890a7cf9eab5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 18 May 2012 17:24:06 +0000 Subject: major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things. This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required) git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf --- tools/linux_packaging/ardour.sh.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in index 6946341993..83f69bb2b6 100644 --- a/tools/linux_packaging/ardour.sh.in +++ b/tools/linux_packaging/ardour.sh.in @@ -1,5 +1,7 @@ #!/bin/sh +# This is Linux-specific startup script for a bundled version of Ardour + while [ $# -gt 0 ] ; do echo "arg = $1" case $1 in @@ -11,9 +13,9 @@ while [ $# -gt 0 ] ; do esac done -#LD_LIBRARY_PATH needs to be set (empty) so that epa can swap between the original and the bundled version +# LD_LIBRARY_PATH needs to be set here so that epa can swap between the original and the bundled version +# (the original one will be stored in PREBUNDLE_ENV) export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - export PREBUNDLE_ENV="$(env)" BIN_DIR=$(dirname $(readlink -f $0)) @@ -35,12 +37,13 @@ export ARDOUR_BUNDLED=true %ENV% -export GTK_PATH=$INSTALL_DIR/libs/clearlooks${GTK_PATH:+:$GTK_PATH} -export GTK_MODULES="" # Disable extra modules from being loaded by gtk (example, libcanberra-gtk-module.so) +# Disable extra modules from being loaded by gtk (example, libcanberra-gtk-module.so) +export GTK_MODULES="" +# Set this so that the executable will find all the right libraries inside the bundle export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} # create install-location-dependent config files for Pango and GDK image loaders -# We have to do this every time because its possible that BIN_DIR has changed +# We have to do this every time because its possible that LIB_DIR has changed sed "s?@ROOTDIR@/modules?$LIB_DIR/modules?" < $ETC_DIR/pango.modules.in > $USER_ARDOUR_DIR/pango.modules sed "s?@ROOTDIR@/loaders?$LIB_DIR/loaders?" < $ETC_DIR/gdk-pixbuf.loaders.in > $USER_ARDOUR_DIR/gdk-pixbuf.loaders -- cgit v1.2.3