[darwinbuild-changes] [126] trunk/darwinbuild/darwinbuild

[source_changes at macosforge.org]

Revision: 126
          http://trac.macosforge.org/projects/darwinbuild/changeset/126
Author:   ssen
Date:     2006-10-04 01:48:50 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
"darwinbuild -init" can now take a path to a plist
in the local filesystem. The bootstrap plist can optionally
have a "plist_sites" property to help find inherited build
plists, although by default this is not needed, and the
OpenDarwin web server is consulted.

Modified Paths:
--------------
    trunk/darwinbuild/darwinbuild

Modified: trunk/darwinbuild/darwinbuild
===================================================================
--- trunk/darwinbuild/darwinbuild	2005-07-30 07:22:48 UTC (rev 125)
+++ trunk/darwinbuild/darwinbuild	2006-10-04 08:48:50 UTC (rev 126)
@@ -120,16 +120,29 @@
 		exit 1
 	fi
 	build="$2"
+	sites=""
 	[ -d Roots ] || mkdir Roots
 	[ -d Sources ] || mkdir Sources
 	[ -d Symbols ] || mkdir Symbols
 	[ -d Headers ] || mkdir Headers
 	[ -d Logs ] || mkdir Logs
 	[ -d .build ] || mkdir .build
+
+	# check if there's a plist locally by this name
+	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"
+	fi
+
 	echo "$build" > .build/build
+
 	while [ "$build" != "" ]; do
-		Download .build "$build".plist http://darwinsource.opendarwin.org/plists/
+		Download .build "$build".plist "$sites http://darwinsource.opendarwin.org/plists/"
 		$PREFIX/bin/darwinxref "-f$XREFDB" "-b$build" loadIndex .build/"$build".plist
+		sites=$($PREFIX/bin/darwinxref "-f$XREFDB" "-b$build" plist_sites | xargs echo)
 		build=$($PREFIX/bin/darwinxref "-f$XREFDB" "-b$build" inherits)
 	done
 	echo "Initialization Complete"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20061004/62592fb8/attachment.html