allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Merge with trunk R2935.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@2943 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard
2008-01-19 03:49:52 +00:00
parent f80fad313a
commit 4ca1fe7993
44 changed files with 1814 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/osx_packaging/script
View File

@@ -32,17 +32,22 @@ if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> ~/.xinitrc
fi
mkdir -p $TMP
cp -f "$CWD/bin/getdisplay.sh" $TMP
rm -f $TMP/display
open-x11 $TMP/getdisplay.sh || \
open -a XDarwin $TMP/getdisplay.sh || \
echo ":0" > $TMP/display
if uname -r | grep -sq '^9' ; then
# leopard will auto-start X11 for us
:
else
mkdir -p $TMP
cp -f "$CWD/bin/getdisplay.sh" $TMP
rm -f $TMP/display
open-x11 $TMP/getdisplay.sh || \
open -a XDarwin $TMP/getdisplay.sh || \
echo ":0" > $TMP/display
while [ "$?" == "0" -a ! -f $TMP/display ]; do sleep 1; done
export "DISPLAY=`cat $TMP/display`"
while [ "$?" == "0" -a ! -f $TMP/display ]; do sleep 1; done
export "DISPLAY=`cat $TMP/display`"
ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11
ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11
fi
cd ~/
shift