Revision: 448 http://trac.macosforge.org/projects/darwinbuild/changeset/448 Author: wsiegrist@apple.com Date: 2008-12-21 00:37:51 -0800 (Sun, 21 Dec 2008) Log Message: ----------- Perform prefix replacement on installXcode too Modified Paths: -------------- trunk/darwinbuild/Makefile Added Paths: ----------- trunk/darwinbuild/installXcode.in Removed Paths: ------------- trunk/darwinbuild/installXcode Modified: trunk/darwinbuild/Makefile =================================================================== --- trunk/darwinbuild/Makefile 2008-12-21 08:19:03 UTC (rev 447) +++ trunk/darwinbuild/Makefile 2008-12-21 08:37:51 UTC (rev 448) @@ -8,7 +8,8 @@ PrefixReplacements = darwinbuild \ darwinmaster.sh \ packageRoots.sh \ - thinPackages.sh + thinPackages.sh \ + installXcode all: manifest prefixes Deleted: trunk/darwinbuild/installXcode =================================================================== --- trunk/darwinbuild/installXcode 2008-12-21 08:19:03 UTC (rev 447) +++ trunk/darwinbuild/installXcode 2008-12-21 08:37:51 UTC (rev 448) @@ -1,20 +0,0 @@ -#!/bin/bash - -BINDIR=/usr/local/share/darwinbuild - -BROOT=$1 -VER=$(/usr/bin/xcodebuild -version | grep version | cut -d "-" -f 2 | cut -d ";" -f 1 | cut -d "." -f 1) - -if [ "$VER" -gt "920" ]; -then - if [ "$VER" -gt "1000" ]; - then - "$BINDIR/installXcode31" "$BROOT"; - else - "$BINDIR/installXcode3" "$BROOT"; - fi -else - "$BINDIR/installXcode2" "$BROOT"; -fi - - Copied: trunk/darwinbuild/installXcode.in (from rev 445, trunk/darwinbuild/installXcode) =================================================================== --- trunk/darwinbuild/installXcode.in (rev 0) +++ trunk/darwinbuild/installXcode.in 2008-12-21 08:37:51 UTC (rev 448) @@ -0,0 +1,21 @@ +#!/bin/bash + +PREFIX=%%PREFIX%% +BINDIR=$PREFIX/share/darwinbuild + +BROOT=$1 +VER=$(/usr/bin/xcodebuild -version | grep version | cut -d "-" -f 2 | cut -d ";" -f 1 | cut -d "." -f 1) + +if [ "$VER" -gt "920" ]; +then + if [ "$VER" -gt "1000" ]; + then + "$BINDIR/installXcode31" "$BROOT"; + else + "$BINDIR/installXcode3" "$BROOT"; + fi +else + "$BINDIR/installXcode2" "$BROOT"; +fi + + Property changes on: trunk/darwinbuild/installXcode.in ___________________________________________________________________ Added: svn:executable + * Added: svn:mergeinfo + /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /trunk/darwinbuild/installXcode:432-434