smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-15 09:55:55 +01:00
Code Issues Projects Releases Wiki Activity

Store our enviroment off before we change it. EPA will used the stored version when making calls to start jack. Also allow the build script to set the executable version in the launch script

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@8468 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Todd Naugle 2011-01-06 19:11:14 +00:00
parent 8fd752b7e8
commit d2a7026657
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/linux_packaging/ardour.sh.in
View file

@ -1,5 +1,8 @@
#!/bin/sh
export LD_LIBRARY_PATH="" #This needs to be set empty so that epa can swap between empty and the bundled version
export PREBUNDLE_ENV="$(env)"
BIN_DIR=$(dirname $(readlink -f $0))
INSTALL_DIR=$(dirname $BIN_DIR)
LIB_DIR=$INSTALL_DIR/lib
@ -29,7 +32,7 @@ export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
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
exec $INSTALL_DIR/bin/ardour-2.8.11 "$@"
exec $INSTALL_DIR/bin/ardour-%VER% "$@"

2
tools/linux_packaging/build
View file

@ -202,7 +202,7 @@ echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT
# create startup helper script
sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' < ardour.sh.in > $APPBIN/ardour2
sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/' < ardour.sh.in > $APPBIN/ardour2
rm $ENVIRONMENT && chmod 775 $APPBIN/ardour2
MAIN_EXECUTABLE=ardour-$release_version