[darwinbuild-changes] [103] trunk/darwinbuild

[source_changes at macosforge.org]

Revision: 103
          http://trac.macosforge.org/projects/darwinbuild/changeset/103
Author:   kevin
Date:     2006-10-04 01:46:06 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
- store roots in a global cache directory
- copy the ditto(1) emulator into the BuildRoot
- only invoke installXcodebuild if Xcode has not already been installed

Modified Paths:
--------------
    trunk/darwinbuild/darwinbuild
    trunk/darwinbuild/darwinbuild.common

Modified: trunk/darwinbuild/darwinbuild
===================================================================
--- trunk/darwinbuild/darwinbuild	2005-07-27 02:22:26 UTC (rev 102)
+++ trunk/darwinbuild/darwinbuild	2006-10-04 08:46:06 UTC (rev 103)
@@ -84,6 +84,7 @@
 
 PREFIX=/usr/local
 XREFDB=.build/xref.db
+CACHEDIR=$PREFIX/share/darwinbuild/cache
 build=""
 depsbuild=""
 CHROOTED="YES"
@@ -435,6 +436,11 @@
 		InstallRoot "$BuildRoot" "$X"
 	done
 
+	### so many things require ditto, we have hacked around it
+	if [ ! -x "$BuildRoot/usr/bin/ditto" ]; then
+		cp "$PREFIX/share/darwinbuild/ditto" "$BuildRoot/usr/bin/ditto"
+	fi
+
 	echo "*** Installing Headers ..."
 	deps=$($PREFIX/bin/darwinxref dependencies -header "$projnam")
 	for X in $deps ; do
@@ -443,7 +449,7 @@
 
 	### xcodebuild is a special case because it is not open source
 	### we try to install it from the host Mac OS X system if it is required
-	if [ "$buildtool" == "xcodebuild" ]; then
+	if [ "$buildtool" == "xcodebuild" -a ! -f "$receipts/xcodebuild" ]; then
 		echo "*** Installing Xcode Tools ..."
 		"$PREFIX/share/darwinbuild/installXcodebuild" "$BuildRoot"
 		touch "$receipts/xcodebuild"

Modified: trunk/darwinbuild/darwinbuild.common
===================================================================
--- trunk/darwinbuild/darwinbuild.common	2005-07-27 02:22:26 UTC (rev 102)
+++ trunk/darwinbuild/darwinbuild.common	2006-10-04 08:46:06 UTC (rev 103)
@@ -139,12 +139,12 @@
 		ditto $SRCDIR $BuildRoot
 		touch "$receipts/$X"
 	elif [ ! -f "$receipts/$X" ]; then
-		Download "$DARWIN_BUILDROOT/Roots/opendarwin.org/$depsbuild" \
+		Download "$CACHEDIR/Roots/$depsbuild" \
 			"$X.root.tar.gz" \
 			$($PREFIX/bin/darwinxref $dbfile binary_sites)/$depsbuild
-		if [ -f $DARWIN_BUILDROOT/Roots/opendarwin.org/$depsbuild/$X.root.tar.gz ]; then
+		if [ -f $CACHEDIR/Roots/$depsbuild/$X.root.tar.gz ]; then
 			cd "$BuildRoot"
-			tar xzf $DARWIN_BUILDROOT/Roots/opendarwin.org/$depsbuild/$X.root.tar.gz
+			tar xzf $CACHEDIR/Roots/$depsbuild/$X.root.tar.gz
 			if [ "$?" == "0" ]; then
 				touch "$receipts/$X"
 			fi
@@ -177,11 +177,11 @@
 		echo "Copying $X ..."
 		ditto $DARWIN_BUILDROOT/Headers/${X/-*}/$X.hdrs~$bv $BuildRoot
 	else
-		Download "$DARWIN_BUILDROOT/Headers/opendarwin.org/$depsbuild" "$X.hdrs.tar.gz" \
+		Download "$CACHEDIR/Headers/$depsbuild" "$X.hdrs.tar.gz" \
 			$($PREFIX/bin/darwinxref $dbfile binary_sites)/$depsbuild
-		if [ -f $DARWIN_BUILDROOT/Headers/opendarwin.org/$depsbuild/$X.hdrs.tar.gz ]; then
+		if [ -f $CACHEDIR/Headers/$depsbuild/$X.hdrs.tar.gz ]; then
 			cd "$BuildRoot"
-			tar xzf $DARWIN_BUILDROOT/Headers/opendarwin.org/$depsbuild/$X.hdrs.tar.gz
+			tar xzf $CACHEDIR/Headers/$depsbuild/$X.hdrs.tar.gz
 			if [ "$?" == "0" ]; then
 				touch "$receipts/$X.hdrs"
 			fi

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