packaging tweaks for OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@12345 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
a47cfd7f6f
commit
6ee23029a3
@ -166,7 +166,7 @@ fixup_bundle_environment (int, char* [])
|
|||||||
}
|
}
|
||||||
setenv ("PATH", path.c_str(), 1);
|
setenv ("PATH", path.c_str(), 1);
|
||||||
|
|
||||||
export_search_path (dir_path, "ARDOUR_DLL_PATH", "/../Frameworks");
|
export_search_path (dir_path, "ARDOUR_DLL_PATH", "/../lib");
|
||||||
|
|
||||||
path += dir_path;
|
path += dir_path;
|
||||||
path += "/../Resources";
|
path += "/../Resources";
|
||||||
@ -185,7 +185,7 @@ fixup_bundle_environment (int, char* [])
|
|||||||
export_search_path (dir_path, "VAMP_PATH", "/../Frameworks");
|
export_search_path (dir_path, "VAMP_PATH", "/../Frameworks");
|
||||||
|
|
||||||
path = dir_path;
|
path = dir_path;
|
||||||
path += "/../Frameworks/clearlooks";
|
path += "/../lib/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
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
# script for pulling together a MacOSX app bundle.
|
# script for pulling together a MacOSX app bundle.
|
||||||
|
|
||||||
GTKQUARTZ_ROOT=$HOME/gtk/inst
|
GTKQUARTZ_ROOT=$HOME/gtk/inst
|
||||||
|
ARDOURSTACK_ROOT=$HOME/a3/inst
|
||||||
|
|
||||||
if pkg-config --modversion gtk+-2.0 | grep -s 2.22 ; then
|
if pkg-config --modversion gtk+-2.0 | grep -s 2.22 ; then
|
||||||
# older GTK
|
# older GTK
|
||||||
@ -95,7 +96,7 @@ echo "Info string is $info_string"
|
|||||||
|
|
||||||
APPDIR=${APPNAME}.app
|
APPDIR=${APPNAME}.app
|
||||||
APPROOT=$APPDIR/Contents
|
APPROOT=$APPDIR/Contents
|
||||||
Frameworks=$APPROOT/Frameworks
|
Frameworks=$APPROOT/lib
|
||||||
Resources=$APPROOT/Resources
|
Resources=$APPROOT/Resources
|
||||||
#
|
#
|
||||||
# Since this is OS X, don't try to distinguish between etc and shared
|
# Since this is OS X, don't try to distinguish between etc and shared
|
||||||
@ -115,7 +116,7 @@ MidiMaps=$Shared/midi_maps
|
|||||||
ExportFormats=$Shared/export
|
ExportFormats=$Shared/export
|
||||||
Templates=$Shared/templates
|
Templates=$Shared/templates
|
||||||
PatchFiles=$Shared/patchfiles
|
PatchFiles=$Shared/patchfiles
|
||||||
MCP=$Shared/mcp
|
MackieControl=$Shared/mcp
|
||||||
|
|
||||||
if [ x$PRINT_SYSDEPS != x ] ; then
|
if [ x$PRINT_SYSDEPS != x ] ; then
|
||||||
#
|
#
|
||||||
@ -150,6 +151,7 @@ mkdir -p $Templates
|
|||||||
mkdir -p $Frameworks/modules
|
mkdir -p $Frameworks/modules
|
||||||
mkdir -p $Shared/templates
|
mkdir -p $Shared/templates
|
||||||
mkdir -p $Etc
|
mkdir -p $Etc
|
||||||
|
mkdir -p $MackieControl
|
||||||
|
|
||||||
# maybe set variables
|
# maybe set variables
|
||||||
env=""
|
env=""
|
||||||
@ -289,11 +291,11 @@ cat > pangorc <<EOF
|
|||||||
[Pango]
|
[Pango]
|
||||||
ModulesPath=$GTKQUARTZ_ROOT/lib/pango/1.6.0/modules
|
ModulesPath=$GTKQUARTZ_ROOT/lib/pango/1.6.0/modules
|
||||||
EOF
|
EOF
|
||||||
env PANGO_RC_FILE=pangorc $GTKQUARTZ_ROOT/bin/pango-querymodules | sed "s?$GTKQUARTZ_ROOT/lib/pango/1.6.0/modules/?@executable_path/../Frameworks/modules/?" > $Resources/pango.modules
|
env PANGO_RC_FILE=pangorc $GTKQUARTZ_ROOT/bin/pango-querymodules | sed "s?$GTKQUARTZ_ROOT/lib/pango/1.6.0/modules/?@executable_path/../lib/modules/?" > $Resources/pango.modules
|
||||||
rm pangorc
|
rm pangorc
|
||||||
|
|
||||||
# generate a new GDK pixbufs loaders file
|
# generate a new GDK pixbufs loaders file
|
||||||
gdk-pixbuf-query-loaders | sed "s?$GDKPIXBUF_LOADERS/?@executable_path/../Frameworks/modules/?" > $Resources/gdk-pixbuf.loaders
|
gdk-pixbuf-query-loaders | sed "s?$GDKPIXBUF_LOADERS/?@executable_path/../lib/modules/?" > $Resources/gdk-pixbuf.loaders
|
||||||
|
|
||||||
# this one is special - we will set GTK_PATH to $Frameworks/clearlooks
|
# this one is special - we will set GTK_PATH to $Frameworks/clearlooks
|
||||||
cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.dylib $Frameworks
|
cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.dylib $Frameworks
|
||||||
@ -340,7 +342,7 @@ done
|
|||||||
# MackieControl data
|
# MackieControl data
|
||||||
# got to be careful with names here
|
# got to be careful with names here
|
||||||
for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
|
for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
|
||||||
cp "$x" $MCP
|
cp "$x" $MackieControl
|
||||||
echo Copied Mackie Control file $x
|
echo Copied Mackie Control file $x
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -353,7 +355,7 @@ while [ true ] ; do
|
|||||||
if ! file $file | grep -qs Mach-O ; then
|
if ! file $file | grep -qs Mach-O ; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
deps=`otool -L $file | awk '{print $1}' | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)" | grep -v 'libjack\.'`
|
deps=`otool -L $file | awk '{print $1}' | egrep "($GTKQUARTZ_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | grep -v 'libjack\.'`
|
||||||
# echo -n "."
|
# echo -n "."
|
||||||
for dep in $deps ; do
|
for dep in $deps ; do
|
||||||
base=`basename $dep`
|
base=`basename $dep`
|
||||||
@ -424,9 +426,9 @@ fi
|
|||||||
for exe in $executables; do
|
for exe in $executables; do
|
||||||
EXE=$APPROOT/MacOS/$exe
|
EXE=$APPROOT/MacOS/$exe
|
||||||
changes=""
|
changes=""
|
||||||
for lib in `otool -L $EXE | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
|
for lib in `otool -L $EXE | egrep "($GTKQUARTZ_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
|
||||||
base=`basename $lib`
|
base=`basename $lib`
|
||||||
changes="$changes -change $lib @executable_path/../Frameworks/$base"
|
changes="$changes -change $lib @executable_path/../lib/$base"
|
||||||
done
|
done
|
||||||
if test "x$changes" != "x" ; then
|
if test "x$changes" != "x" ; then
|
||||||
install_name_tool $changes $EXE
|
install_name_tool $changes $EXE
|
||||||
@ -450,12 +452,12 @@ for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners ; do
|
|||||||
# change all the dependencies
|
# change all the dependencies
|
||||||
|
|
||||||
changes=""
|
changes=""
|
||||||
for lib in `otool -L $dylib | egrep "($GTKQUARTZ_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
|
for lib in `otool -L $dylib | egrep "($GTKQUARTZ_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
|
||||||
base=`basename $lib`
|
base=`basename $lib`
|
||||||
if echo $lib | grep -s libbase; then
|
if echo $lib | grep -s libbase; then
|
||||||
changes="$changes -change $lib @executable_path/../$libbase/$base"
|
changes="$changes -change $lib @executable_path/../$libbase/$base"
|
||||||
else
|
else
|
||||||
changes="$changes -change $lib @executable_path/../Frameworks/$base"
|
changes="$changes -change $lib @executable_path/../lib/$base"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user