[darwinbuild-changes] [231] trunk

[source_changes at macosforge.org]

Revision: 231
          http://trac.macosforge.org/projects/darwinbuild/changeset/231
Author:   kevin
Date:     2006-10-04 02:00:05 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
- added -nopatch option to build without applying patches

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

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2005-09-07 04:24:27 UTC (rev 230)
+++ trunk/CHANGES	2006-10-04 09:00:05 UTC (rev 231)
@@ -1,6 +1,9 @@
 Darwin Build Scripts Change History
 -----------------------------------
 
+Release 0.X.Y [now]
+	- darwinbuild: added -nopatch option to build without applying patches
+
 Release 0.7.1 [6-Sep-2005]
 	- darwinbuild: Restore use of InstallHeader()
 	- darwinxref: install DBPlugin.h header file

Modified: trunk/darwinbuild/darwinbuild
===================================================================
--- trunk/darwinbuild/darwinbuild	2005-09-07 04:24:27 UTC (rev 230)
+++ trunk/darwinbuild/darwinbuild	2006-10-04 09:00:05 UTC (rev 231)
@@ -101,6 +101,7 @@
 depsbuild=""
 CHROOTED="YES"
 logdeps=""
+nopatch=""
 noload=""
 loadonly=""
 projnam=""
@@ -166,11 +167,13 @@
 
 
 function PrintUsage() {
-	echo "usage: $(basename $0) [flags] <project> [<version>]" 1>&2
-	echo "usage: flags: [-headers] [-build=X] [-target=X]" 1>&2
-	echo "              [-logdeps] [-nochroot] [-noload | -loadonly]" 1>&2
-	echo "              [-depsbuild=X [-depsbuild=Y]]" 1>&2
-	echo "              [-fetch] [-source]" 1>&2
+	cat <<-EOF 1>&2
+	usage: $(basename $0) [flags] <project> [<version>]
+	usage: flags: [-headers] [-build=X] [-target=X]
+	              [-logdeps] [-nochroot] [-nopatch] [-noload | -loadonly]
+	              [-depsbuild=X [-depsbuild=Y]]
+	              [-fetch] [-source]
+EOF
 	exit 1
 }
 
@@ -213,6 +216,7 @@
 ###   -source   Extract, patch, and stage source
 ###   -nochroot Do not chroot into the BuildRoot when building
 ###   -load     Populate the BuildRoot with one project
+###   -nopatch  Don't patch sources before building.
 ###   -noload   Don't load dependencies into the chroot.
 ###				Has no effect if -nochroot is specified.
 ###   -loadonly Only load dependencies into the chroot, but
@@ -246,6 +250,8 @@
 			depsbuild="${depsbuild} ${ARG/*=/}"
 		elif [ "$ARG" == "-nochroot" ]; then
 			export CHROOTED="NO"
+		elif [ "$ARG" == "-nopatch" ]; then
+			nopatch="YES"
 		elif [ "$ARG" == "-load" ]; then
 			action="load"
 		elif [ "$ARG" == "-noload" ]; then
@@ -254,8 +260,10 @@
 			loadonly="YES"
 		elif [ "$ARG" == "-logdeps" ]; then
 			logdeps="YES"
+		elif [ "${ARG:0:1}" != "-" ]; then
+			projnam="$ARG"
 		else
-			projnam="$ARG"
+			PrintUsage "$0"
 		fi
 	elif [ "$version" == "" ]; then
 		version="$ARG"
@@ -430,6 +438,7 @@
 ### Current working directory should be the SRCROOT
 ###
 cd "$REAL_SRCROOT"
+if [ "$nopatch" != "YES" ]; then
 if [ -d "$REAL_SRCROOT/../$project-patches" ]; then
 	echo "*** Applying Patches ..."
 	cat $REAL_SRCROOT/../$project-patches/* | patch -p0
@@ -462,6 +471,7 @@
 	    esac
 	fi
 done
+fi
 
 ### If we are doing a -source, stop here.
 if [ "$action" == "source" ]; then

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