[darwinbuild-changes] [95] trunk

[source_changes at macosforge.org]

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

Log Message:
-----------
- moved installXcodebuild from /usr/local/bin to /usr/local/share
- automatically invoke installXcodebuild when xcode is the build tool

Modified Paths:
--------------
    trunk/CHANGES
    trunk/darwinbuild/Makefile
    trunk/darwinbuild/darwinbuild

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2005-07-25 23:54:46 UTC (rev 94)
+++ trunk/CHANGES	2006-10-04 08:45:16 UTC (rev 95)
@@ -1,6 +1,14 @@
 Darwin Build Scripts Change History
 -----------------------------------
 
+Release 0.6 [25-Jul-2005]
+	- moved installXcodebuild from /usr/local/bin to /usr/local/share
+	- darwinbuild: moved build root receipts into /usr/local/darwinbuild
+	- darwintrace: fixed bug when volfs paths do not resolve (pguyot)
+	- darwintrace: builds with -Wall (pguyot)
+	- darwinbuild: added uuids to roots based on manifests
+	- darwinxref: added manifest support to register plugin
+	- added manifest tool to generate manifests for roots
 	- added an exit handler to unmount devfs and volfs in the BuildRoot
 	- list header dependencies more conservatively (ssen)
 	- added common.mk for common makefile variables

Modified: trunk/darwinbuild/Makefile
===================================================================
--- trunk/darwinbuild/Makefile	2005-07-25 23:54:46 UTC (rev 94)
+++ trunk/darwinbuild/Makefile	2006-10-04 08:45:16 UTC (rev 95)
@@ -13,14 +13,15 @@
 install: all
 	[ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR)
 	$(INSTALL) $(INSTALL_EXE_FLAGS) darwinbuild $(BINDIR)
-	$(INSTALL) $(INSTALL_EXE_FLAGS) installXcodebuild $(BINDIR)
 
 	[ -d $(DATDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)
 	$(INSTALL) $(INSTALL_DOC_FLAGS) darwinbuild.common $(DATDIR)
+	$(INSTALL) $(INSTALL_EXE_FLAGS) installXcodebuild $(DATDIR)
 	$(INSTALL) $(INSTALL_EXE_FLAGS) manifest $(DATDIR)
 
 uninstall:
 	rm -f $(BINDIR)/darwinbuild
-	rm -f $(BINDIR)/installXcodebuild
 	rm -f $(DATDIR)/darwinbuild.common
+	rm -f $(DATDIR)/installXcodebuild
+	rm -f $(DATDIR)/manifest
 	rmdir $(DATDIR)

Modified: trunk/darwinbuild/darwinbuild
===================================================================
--- trunk/darwinbuild/darwinbuild	2005-07-25 23:54:46 UTC (rev 94)
+++ trunk/darwinbuild/darwinbuild	2006-10-04 08:45:16 UTC (rev 95)
@@ -325,39 +325,6 @@
 fi
 
 ###
-### If we are CHROOTED, then
-### Install the roots into the BuildRoot
-### Make sure we have at least a minimally functioning root
-### by installing bash and its dependencies.
-###
-if [ "$CHROOTED" == "YES" -a "$noload" != "YES" ]; then
-	echo "*** Installing Roots ..."
-	receipts="$BuildRoot/usr/local/darwinbuild/receipts"
-	mkdir -p "$receipts"
-	bash_deps=$($PREFIX/bin/darwinxref dependencies -run "bash")
-	deps=$($PREFIX/bin/darwinxref dependencies -build "$projnam")
-
-	### 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
-	echo "$deps" | grep "\bxcodebuild-"
-	if [ "$?" == "0" -a ! -f "$receipts/xcodebuild" ]; then
-		$DARWIN_BUILDROOT/bin/installXcodebuild
-		touch "$receipts/xcodebuild"
-	fi
-
-	for X in files bash $bash_vers $deps ; do
-		InstallRoot "$BuildRoot" "$X"
-	done
-
-	echo "*** Installing Headers ..."
-	deps=$($PREFIX/bin/darwinxref dependencies -header "$projnam")
-	for X in $deps ; do
-		InstallHeaders "$BuildRoot" "$X"
-	done
-fi
-
-
-###
 ### We do our building in private/var/tmp since it's
 ### likely to be out of the way of our dependencies
 ### and is supposed to be writable by everyone.
@@ -421,9 +388,6 @@
 	tar xzf "$SourceCache/$project-patches.tar.gz"
 fi
 
-
-
-
 ###
 ### Apply the patches
 ### Current working directory should be the SRCROOT
@@ -446,6 +410,38 @@
 fi
 
 ###
+### If we are CHROOTED, then
+### Install the roots into the BuildRoot
+### Make sure we have at least a minimally functioning root
+### by installing bash and its dependencies.
+###
+if [ "$CHROOTED" == "YES" -a "$noload" != "YES" ]; then
+	echo "*** Installing Roots ..."
+	receipts="$BuildRoot/usr/local/darwinbuild/receipts"
+	mkdir -p "$receipts"
+	bash_deps=$($PREFIX/bin/darwinxref dependencies -run "bash")
+	deps=$($PREFIX/bin/darwinxref dependencies -build "$projnam")
+
+	for X in files bash $bash_vers $deps ; do
+		InstallRoot "$BuildRoot" "$X"
+	done
+
+	echo "*** Installing Headers ..."
+	deps=$($PREFIX/bin/darwinxref dependencies -header "$projnam")
+	for X in $deps ; do
+		InstallHeaders "$BuildRoot" "$X"
+	done
+
+	### 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
+		echo "*** Installing Xcode Tools ..."
+		"$PREFIX/share/darwinbuild/installXcodebuild" "$BuildRoot"
+		touch "$receipts/xcodebuild"
+	fi
+fi
+
+###
 ### Read in the environment
 ###
 

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