[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r9645 - buildtest
From:       cups-dev () easysw ! com
Date:       2011-03-23 23:49:47
Message-ID: 10416-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2011-03-23 16:49:35 -0700 (Wed, 23 Mar 2011)
New Revision: 9645
Log:
Add --ifchanged option so we can have the test suite run more often without \
generating extra build notifications.


Modified:
   buildtest/build.sh

Modified: buildtest/build.sh
===================================================================
--- buildtest/build.sh	2011-03-23 17:23:47 UTC (rev 9644)
+++ buildtest/build.sh	2011-03-23 23:49:35 UTC (rev 9645)
@@ -5,7 +5,7 @@
 #   Common script for building the current stable and development (trunk)
 #   branches of CUPS.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -68,12 +68,14 @@
 fi
 
 # Parse command-line arguments:
+ifchanged=no
 quiet=no
 update=no
 targets=""
 
 while test $# -gt 0; do
 	case "$1" in
+		--ifchanged) ifchanged=yes;;
 		--quiet) quiet=yes;;
 		--update | update) update=yes;;
 		*) targets="$targets $1";;
@@ -106,7 +108,7 @@
 	# Show Subversion updates...
 	echo svn up
 	cat svn.log
-	svn st | $grep -e '^C' -e '^D' -e '^G' -e '^M' -e '^ M' >svn.log
+	svn st | $grep -e '^[ACDGM]' -e '^ M' >svn.log
 	if test -s svn.log; then
 		echo ""
 		echo ERROR: Local files have modifications:
@@ -123,11 +125,37 @@
 	svn up 2>&1 >svn.log
 
 	# Need to exec since this script might change...
+	options=""
 	if test $quiet = yes; then
-		exec ./build.sh --quiet $targets
+		options="--quiet $options"
+	fi
+	if test $ifchanged = yes; then
+		options="--ifchanged $options"
+	fi
+
+	exec ./build.sh $options $targets
+fi
+
+# Look for changes to the dependent projects
+changed=0
+
+for dir in . epm stable tools trunk; do
+	rev=`svnversion $dir | sed -e '1,$s/[a-zA-Z]//g'`
+	if test -f $dir/.buildrev; then
+		oldrev=`cat $dir/.buildrev`
 	else
-		exec ./build.sh $targets
+		oldrev=0
 	fi
+
+	if test $rev -gt $oldrev; then
+		changed=1
+	fi
+
+	echo $rev >$dir/.buildrev
+done
+
+if test $ifchanged = yes -a $changed = 0; then
+	exit 0
 fi
 
 # Setup the compiler flags to point to all of the dependent libraries...

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit


[prev in list] [next in list] [prev in thread] [next in thread]