Skip to content
Permalink
Browse files
Incorporating patch from probono to delete existing frameworks needed…
… by xcodebuild from the build root to prevent the copy from failing. Also added tests to only perform the action when the target exists.

git-svn-id: https://svn.macosforge.org/repository/darwinbuild/trunk@377 10a61168-4876-4dac-953b-31e694342555
  • Loading branch information
wsiegrist@apple.com committed May 30, 2008
1 parent 8698833 commit 7914038c99aaf1700727f09491bfa09b3fb13b8f
Showing with 15 additions and 3 deletions.
  1. +15 −3 darwinbuild/installXcode3
@@ -17,8 +17,11 @@ mkdir -p "${BROOT}";
pushd $BROOT >> /dev/null
for D in etc tmp var ;
do
echo "Symlinking $D";
ln -s private/$D $D ;
if [ ! -L $D ] ;
then
echo "Symlinking $D";
ln -s private/$D $D ;
fi
done;
popd >> /dev/null

@@ -27,6 +30,14 @@ popd >> /dev/null
exec <$XCFILEDIR/Xcode_3.0.txt
while read line;
do
case "${line}" in
*".framework")
if [ -d ${BROOT}/${line} ] ;
then
echo "Deleting: ${BROOT}/${line}";
rm -r "${BROOT}/${line}" ;
fi ;;
esac
parent=$(dirname $line);
echo "Copying: ${line}";
mkdir -p "${BROOT}/${parent}" ;
@@ -42,4 +53,5 @@ darwinbuild -load SQLite
darwinbuild -load libxslt
darwinbuild -load OpenSSL
darwinbuild -load DiskArbitration
darwinbuild -load pb_makefiles
darwinbuild -load pb_makefiles

0 comments on commit 7914038

Please sign in to comment.