[darwinbuild-changes] [450] trunk/darwinbuild/darwinbuild.in

source_changes at macosforge.org source_changes at macosforge.org
Tue Jan 6 15:05:15 PST 2009


Revision: 450
          http://trac.macosforge.org/projects/darwinbuild/changeset/450
Author:   wsiegrist at apple.com
Date:     2009-01-06 15:05:14 -0800 (Tue, 06 Jan 2009)
Log Message:
-----------
Fix merge error that dropped r425

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

Modified: trunk/darwinbuild/darwinbuild.in
===================================================================
--- trunk/darwinbuild/darwinbuild.in	2008-12-22 06:26:53 UTC (rev 449)
+++ trunk/darwinbuild/darwinbuild.in	2009-01-06 23:05:14 UTC (rev 450)
@@ -105,6 +105,7 @@
 projnam=""
 action="install"
 target=""
+configuration=""
 version=""
 
 ###
@@ -167,7 +168,7 @@
 function PrintUsage() {
 	cat <<-EOF 1>&2
 	usage: $(basename $0) [flags] <project> [<version>]
-	usage: flags: [-headers] [-build=X] [-target=X]
+	usage: flags: [-headers] [-build=X] [-target=X] [-configuration=X]
 	              [-logdeps] [-nochroot] [-nopatch] [-noload | -loadonly]
 	              [-depsbuild=X [-depsbuild=Y]]
 	              [-fetch] [-source] [-load]
@@ -221,6 +222,7 @@
 ###                             don't build.
 ###   -logdeps  Do magic to log the build-time dependencies
 ###   -target=X The makefile or xcode target to build
+###   -configuration=X The build configuration to use
 ###   -build=X  X is the darwin build number to buld, e.g. 8B15
 ###   -depsbuild=X X is the darwin build number to populate the BuildRoot 
 ###   <project> The name of the project to build
@@ -246,6 +248,8 @@
 			action="source"
 		elif [ "${ARG/=*/}" == "-target" ]; then
 			target="${ARG/*=/}"
+		elif [ "${ARG/=*/}" == "-configuration" ]; then
+			configuration="${ARG/*=/}"
 		elif [ "${ARG/=*/}" == "-build" ]; then
 			build="${ARG/*=/}"
 		elif [ "${ARG/=*/}" == "-depsbuild" ]; then
@@ -342,6 +346,13 @@
 fi
 
 #
+# Look for an alternate build configuration in the database
+#
+if [ "$configuration" == "" -a "$action" == "install" ]; then
+	configuration=$($DARWINXREF configuration "$projnam")
+fi
+
+#
 # Sanity check to make sure we actually have a project to build.
 #
 if [ "$project" == "" ]; then
@@ -612,6 +623,14 @@
 	action="$target"
 fi
 
+#
+# append build configuration to $action, if any
+# this is only applicable to xcodebuild
+#
+if [ "$buildtool" == "xcodebuild" -a "$configuration" != "" ]; then
+	build_string="$build_string -configuration $configuration"
+fi
+
 ###
 ### Write out the build script that will be used.
 ### This may or may not be executed in a chroot.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20090106/1a54572b/attachment.html>


More information about the darwinbuild-changes mailing list