Revision: 377 http://trac.macosforge.org/projects/darwinbuild/changeset/377 Author: wsiegrist@apple.com Date: 2008-05-29 18:31:03 -0700 (Thu, 29 May 2008) Log Message: ----------- 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. Modified Paths: -------------- trunk/darwinbuild/installXcode3 Modified: trunk/darwinbuild/installXcode3 =================================================================== --- trunk/darwinbuild/installXcode3 2008-05-28 20:52:02 UTC (rev 376) +++ trunk/darwinbuild/installXcode3 2008-05-30 01:31:03 UTC (rev 377) @@ -17,8 +17,11 @@ 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 @@ 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 libxslt darwinbuild -load OpenSSL darwinbuild -load DiskArbitration -darwinbuild -load pb_makefiles \ No newline at end of file +darwinbuild -load pb_makefiles +