[darwinbuild-changes] [336] trunk

[source_changes at macosforge.org]

Revision: 336
          http://trac.macosforge.org/projects/darwinbuild/changeset/336
Author:   kvv at apple.com
Date:     2007-04-24 13:56:06 -0700 (Tue, 24 Apr 2007)

Log Message:
-----------
- store download cache in Roots directory, not /usr/local/share/darwinbuild/cache

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

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2007-04-23 21:43:51 UTC (rev 335)
+++ trunk/CHANGES	2007-04-24 20:56:06 UTC (rev 336)
@@ -2,6 +2,8 @@
 -----------------------------------
 
 Release x.y.z [Now]
+	- darwinbuild: store download cache in Roots directory, not
+	  /usr/local/share/darwinbuild/cache
 	- darwinbuild: special case file:/// URLs for downloads
 	- darwintrace: build on Leopard
 	- Added 8G32 plist (Mac OS X 10.4.4 for PowerPC, Darwin 8.4)

Modified: trunk/darwinbuild/darwinbuild
===================================================================
--- trunk/darwinbuild/darwinbuild	2007-04-23 21:43:51 UTC (rev 335)
+++ trunk/darwinbuild/darwinbuild	2007-04-24 20:56:06 UTC (rev 336)
@@ -82,7 +82,6 @@
 XREFDB=.build/xref.db
 DARWINXREF=$PREFIX/bin/darwinxref
 DATADIR=$PREFIX/share/darwinbuild
-CACHEDIR=$DATADIR/cache
 COMMONFILE=$DATADIR/darwinbuild.common
 DARWINTRACE=$DATADIR/darwintrace.dylib
 DITTO=$DATADIR/ditto
@@ -91,7 +90,6 @@
 # PREFIX=/Volumes/HD/ltmp/build/darwinbuild
 # DARWINXREF=$PREFIX/darwinxref/darwinxref
 # DATADIR=$PREFIX/darwinbuild
-# CACHEDIR=$PREFIX/cache
 # COMMONFILE=$DATADIR/darwinbuild.common
 # DARWINTRACE=$PREFIX/darwintrace/darwintrace.dylib
 # DITTO=$DATADIR/ditto.sh

Modified: trunk/darwinbuild/darwinbuild.common
===================================================================
--- trunk/darwinbuild/darwinbuild.common	2007-04-23 21:43:51 UTC (rev 335)
+++ trunk/darwinbuild/darwinbuild.common	2007-04-24 20:56:06 UTC (rev 336)
@@ -172,7 +172,7 @@
 ### Installs a root into the BuildRoot. Mediates between
 ### receipts, pre-built roots, and self-built roots, so that
 ### the build root is "up to date"
-### Relies on the DARWIN_BUILDROOT and CACHEDIR and DARWINXREF
+### Relies on the DARWIN_BUILDROOT and DARWINXREF
 ### and dbfile globals.
 ###
 function InstallRoot() {
@@ -184,6 +184,8 @@
 	local InstallSelfBuiltRoot=0
 	local InstallPreBuiltRoot=0
 
+	local CACHEDIR="$DARWIN_BUILDROOT/Roots/.DownloadCache"
+
 	###
 	### There will be duplication between the bash dependencies and the
 	### project's dependencies.  Therefore don't install something that
@@ -225,20 +227,20 @@
 	    # install a pre-built root, in inheritance order
 		while [ "$dbuild" != "" ]; do
 	    	sites=$($DARWINXREF $dbfile -b $dbuild binary_sites "$X")
-			Download "$CACHEDIR/Roots/$dbuild" \
+			Download "$CACHEDIR" \
 				"$Project.root.tar.gz" \
 					"$sites"
-			if [ -f $CACHEDIR/Roots/$dbuild/$Project.root.tar.gz ]; then
+			if [ -f "$CACHEDIR/$Project.root.tar.gz" ]; then
 				cd "$BuildRoot"
-				tar xzf $CACHEDIR/Roots/$dbuild/$Project.root.tar.gz
+				tar xzf "$CACHEDIR/$Project.root.tar.gz"
 				if [ $? -eq 0 ]; then
-					tar tzf $CACHEDIR/Roots/$dbuild/$Project.root.tar.gz | \
+					tar tzf "$CACHEDIR/$Project.root.tar.gz" | \
 						"$DARWINXREF" register -stdin "$Project" "$BuildRoot" \
 						> /dev/null
 					CheckForReceipt "$BuildRoot" "$Project" "root"
 					if [ $? -ne 0 ]; then
 					    echo -n | CreateReceipt "$BuildRoot" "$Project" "root" \
-						"$CACHEDIR/Roots/$dbuild/$Project.root.tar.gz"
+						"$CACHEDIR/$Project.root.tar.gz"
 					fi
 					return 0
 				fi
@@ -261,7 +263,7 @@
 ### Installs a header root into the BuildRoot. Mediates between
 ### receipts, pre-built roots, and self-built roots, so that
 ### the build root is "up to date"
-### Relies on the DARWIN_BUILDROOT and CACHEDIR and DARWINXREF
+### Relies on the DARWIN_BUILDROOT and DARWINXREF
 ### and dbfile globals.
 ###
 function InstallHeader() {
@@ -275,6 +277,8 @@
 	local InstallSelfBuiltHeader=0
 	local InstallPreBuiltRoot=0
 
+	local CACHEDIR="$DARWIN_BUILDROOT/Roots/.DownloadCache"
+
 	###
 	### There will be duplication between the bash dependencies and the
 	### project's dependencies.  Therefore don't install something that
@@ -351,40 +355,40 @@
 	    # install a pre-built root, in inheritance order
 		while [ "$dbuild" != "" ]; do
 	    	sites=$($DARWINXREF $dbfile -b $dbuild binary_sites "$X")
-			Download "$CACHEDIR/Roots/$dbuild" \
+			Download "$CACHEDIR" \
 				"$Project.hdrs.tar.gz" \
 					"$sites"
-			if [ -f $CACHEDIR/Roots/$dbuild/$Project.hdrs.tar.gz ]; then
+			if [ -f "$CACHEDIR/$Project.hdrs.tar.gz" ]; then
 				cd "$BuildRoot"
-				tar xzf $CACHEDIR/Roots/$dbuild/$Project.hdrs.tar.gz
+				tar xzf "$CACHEDIR/$Project.hdrs.tar.gz"
 				if [ $? -eq 0 ]; then
-					tar tzf $CACHEDIR/Roots/$dbuild/$Project.hdrs.tar.gz | \
+					tar tzf "$CACHEDIR/$Project.hdrs.tar.gz" | \
 						"$DARWINXREF" register -stdin "$Project" "$BuildRoot" \
 						> /dev/null
 					CheckForReceipt "$BuildRoot" "$Project" "hdrs"
 					if [ $? -ne 0 ]; then
 					    echo -n | CreateReceipt "$BuildRoot" "$Project" "hdrs" \
-						"$CACHEDIR/Roots/$dbuild/$Project.hdrs.tar.gz"
+						"$CACHEDIR/$Project.hdrs.tar.gz"
 					fi
 					return 0
 				fi
 			else
 				# if we couldnt' download a header root for a given build,
 				# try the full root
-				Download "$CACHEDIR/Roots/$dbuild" \
+				Download "$CACHEDIR" \
 					"$Project.root.tar.gz" \
 						"$sites"
-				if [ -f $CACHEDIR/Roots/$dbuild/$Project.root.tar.gz ]; then
+				if [ -f "$CACHEDIR/$Project.root.tar.gz" ]; then
 					cd "$BuildRoot"
-					tar xzf $CACHEDIR/Roots/$dbuild/$Project.root.tar.gz
+					tar xzf "$CACHEDIR/$Project.root.tar.gz"
 					if [ $? -eq 0 ]; then
-						tar tzf $CACHEDIR/Roots/$dbuild/$Project.root.tar.gz | \
+						tar tzf "$CACHEDIR/$Project.root.tar.gz" | \
 							"$DARWINXREF" register -stdin "$Project" "$BuildRoot" \
 							> /dev/null
 						CheckForReceipt "$BuildRoot" "$Project" "root"
 						if [ $? -ne 0 ]; then
 						    echo -n | CreateReceipt "$BuildRoot" "$Project" "root" \
-							"$CACHEDIR/Roots/$dbuild/$Project.root.tar.gz"
+							"$CACHEDIR/$Project.root.tar.gz"
 						fi
 						return 0
 					fi

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