Revision: 621 http://trac.macosforge.org/projects/darwinbuild/changeset/621 Author: wsiegrist@apple.com Date: 2009-11-02 11:12:19 -0800 (Mon, 02 Nov 2009) Log Message: ----------- Merge in http and scp init path feature Modified Paths: -------------- releases/Darwin8/darwinbuild/darwinbuild.in Property Changed: ---------------- releases/Darwin8/ releases/Darwin8/darwinbuild/darwinbuild.in releases/Darwin8/darwinbuild/darwinmaster.sh.in releases/Darwin8/darwinbuild/installXcode.in releases/Darwin8/darwinbuild/packageRoots.sh.in releases/Darwin8/darwinbuild/thinPackages.sh.in releases/Darwin8/darwinup/ Property changes on: releases/Darwin8 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /trunk:432-434,520 + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /trunk:432-434,520,540-541,543-544,546-548 Modified: releases/Darwin8/darwinbuild/darwinbuild.in =================================================================== --- releases/Darwin8/darwinbuild/darwinbuild.in 2009-11-02 18:37:15 UTC (rev 620) +++ releases/Darwin8/darwinbuild/darwinbuild.in 2009-11-02 19:12:19 UTC (rev 621) @@ -133,6 +133,11 @@ if [ "$1" == "-init" ]; then if [ "$2" == "" ]; then echo "usage: $(basename $0) -init <build>" 1>&2 + echo "" 1>&2 + echo " <build> can be a standard build number or a path to a plist." 1>&2 + echo " supported paths: /dir/file.plist, " 1>&2 + echo " http://host/dir/file.plist, " 1>&2 + echo " user@host:/dir/file.plist" 1>&2 exit 1 fi build="$2" @@ -144,16 +149,22 @@ [ -d Logs ] || mkdir Logs [ -d .build ] || mkdir .build - # check if there's a plist locally by this name + filename=$(basename "$build") if [ -f "$build" ]; then - filepath="$build" - filename=$(basename "$filepath") - build=$(echo "$filename" | sed 's/.plist$//') - # since we don't want to download this, copy it - cp "$filepath" ".build/$build.plist" + # user gave a local path to a plist + # since we don't want to download this, copy it + cp "$build" ".build/$filename" + elif [ $(echo $build | grep 'http://') ]; then + # user gave a URL to a webserver + host=$(dirname $build) + Download .build $filename $host + elif [ $(echo $build | grep '\w@\w') ]; then + # user provided user@host:/path/file.plist + scp $build .build/ fi + build=$(echo "$filename" | sed 's/.plist$//') - echo "$build" > .build/build + echo "$build" > .build/build while [ "$build" != "" ]; do Download .build "$build".plist "$sites ${DEFAULTPLISTSITE}" @@ -379,15 +390,17 @@ ### if [ "$nosource" != "YES" ]; then echo "*** Fetching Sources ..." + # project might be a build alias if [ "$alias" != "" ]; then filename="$alias-$version.tar.gz" else filename="$project.tar.gz" fi + + Download "$SourceCache" "$filename" "$($DARWINXREF source_sites $projnam)" + patchfilenames=$($DARWINXREF patchfiles $projnam) - #echo "patchfiles are $patchfilenames" - Download "$SourceCache" "$filename" "$($DARWINXREF source_sites $projnam)" for p in $patchfilenames; do Download "$SourceCache" "$p" "$($DARWINXREF source_sites $projnam)" done Property changes on: releases/Darwin8/darwinbuild/darwinbuild.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /trunk/darwinbuild/darwinbuild:432-434 /trunk/darwinbuild/darwinbuild.in:520 + /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /trunk/darwinbuild/darwinbuild:432-434 /trunk/darwinbuild/darwinbuild.in:520,540-541,543-544,546-548 Property changes on: releases/Darwin8/darwinbuild/darwinmaster.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /trunk/darwinbuild/darwinmaster.sh:432-434 /trunk/darwinbuild/darwinmaster.sh.in:520 + /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /trunk/darwinbuild/darwinmaster.sh:432-434 /trunk/darwinbuild/darwinmaster.sh.in:520,540-541,543-544,546-548 Property changes on: releases/Darwin8/darwinbuild/installXcode.in ___________________________________________________________________ Modified: 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 /trunk/darwinbuild/installXcode.in:520 + /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 /trunk/darwinbuild/installXcode.in:520,540-541,543-544,546-548 Property changes on: releases/Darwin8/darwinbuild/packageRoots.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /trunk/darwinbuild/packageRoots.sh:432-434 /trunk/darwinbuild/packageRoots.sh.in:520 + /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /trunk/darwinbuild/packageRoots.sh:432-434 /trunk/darwinbuild/packageRoots.sh.in:520,540-541,543-544,546-548 Property changes on: releases/Darwin8/darwinbuild/thinPackages.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /trunk/darwinbuild/thinPackages.sh:432-434 /trunk/darwinbuild/thinPackages.sh.in:520 + /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /trunk/darwinbuild/thinPackages.sh:432-434 /trunk/darwinbuild/thinPackages.sh.in:520,540-541,543-544,546-548 Property changes on: releases/Darwin8/darwinup ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinup:399-419 /branches/PR-6358021/darwinup:442-443 /branches/PR-6392966/darwinup:423-427 /branches/PR-6398060/darwinup:433-434 /trunk/darwinup:520 + /branches/PR-4841388/darwinup:399-419 /branches/PR-6358021/darwinup:442-443 /branches/PR-6392966/darwinup:423-427 /branches/PR-6398060/darwinup:433-434 /trunk/darwinup:520,540-541,543-544,546-548