changeset in /hg/icedtea6: Merged heads

[Lillian Angel]

changeset f1a5b84676e3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f1a5b84676e3
description:
	Merged heads

diffstat:

3 files changed, 65 insertions(+), 18 deletions(-)
ChangeLog   |    8 ++++++++
Makefile.am |   38 +++++++++++++++++++++++++++++---------
Makefile.in |   37 ++++++++++++++++++++++++++++---------

diffs (172 lines):

diff -r 1e2394f30588 -r f1a5b84676e3 ChangeLog
--- a/ChangeLog	Sun Feb 17 16:39:29 2008 -0500
+++ b/ChangeLog	Sun Feb 17 16:40:56 2008 -0500
@@ -1,3 +1,11 @@ 2008-02-15  Lillian Angel  <langel at redha
+2008-02-17  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (patch.stamp): Stop and fail when patch doesn't apply.
+	(clean-patch): Warn and fail when patch doesn't revert.
+	(patch-ecj.stamp): Fail when patch doesn't apply.
+	(clean-patch-ecj): Fail when patch doesn't revert.
+	* Makefile.in: Regenerated.
+
 2008-02-15  Lillian Angel  <langel at redhat.com>
 
 	* acinclude.m4: Added configure msg.
diff -r 1e2394f30588 -r f1a5b84676e3 Makefile.am
--- a/Makefile.am	Sun Feb 17 16:39:29 2008 -0500
+++ b/Makefile.am	Sun Feb 17 16:40:56 2008 -0500
@@ -240,29 +240,45 @@ clean-extract:
 	rm -f stamps/extract.stamp
 
 stamps/patch.stamp: stamps/extract.stamp
+	all_patches_ok=yes; \
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
-	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	  if test x$${all_patches_ok} == "xyes" \
+	     && echo Checking $$p \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
 	  then \
 	    echo Applying $$p ; \
 	    $(PATCH) -l -p0 < $$p ; \
+	  else \
+	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
-	done
-	mkdir -p stamps
-	touch stamps/patch.stamp
+	done ; \
+	mkdir -p stamps ; \
+	touch stamps/patch.stamp ; \
+	if ! test x$${all_patches_ok} == "xyes"; then \
+	  echo ERROR patch $${all_patches_ok} FAILED! ; \
+	  echo WARNING make clean-patch before retrying a fix ; \
+	  false; \
+       fi
+
 
 clean-patch:
 	rm -f stamps/patch.stamp
 	for p in $(ICEDTEA_PATCHES) ; \
+	all_patches_ok=yes; \
 	do \
 	  echo Checking $$p ; \
 	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
 	  then \
 	    echo Reverting $$p ; \
 	    $(PATCH) -l -p0 -R < $$p ; \
+	  else \
+	    all_patches_ok=no ; \
 	  fi ; \
-	done
+	done ; \
+	if ! test x$${all_patches_ok} == "xyes" ; then \
+	  echo "WARNING Not all patches reverted cleanly" ; \
+	fi
 
 # OpenJDK ecj Source Preparation Targets
 # ======================================
@@ -300,9 +316,11 @@ stamps/patch-ecj.stamp: stamps/extract-e
 	then \
 	  echo Applying $(ICEDTEA_ECJ_PATCH) ; \
 	  $(PATCH) -p0 -l < $(ICEDTEA_ECJ_PATCH) ; \
-	fi
-	mkdir -p stamps
-	touch stamps/patch-ecj.stamp
+	  mkdir -p stamps; \
+	  touch stamps/patch-ecj.stamp; \
+	else \
+	  false; \
+	fi
 
 clean-patch-ecj:
 	rm -f stamps/patch-ecj.stamp
@@ -311,6 +329,8 @@ clean-patch-ecj:
 	then \
 	  echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
 	  $(PATCH) -p0 -l -R < $(ICEDTEA_ECJ_PATCH) ; \
+	else \
+	  false; \
 	fi
 
 # Bootstrap Directory Targets
diff -r 1e2394f30588 -r f1a5b84676e3 Makefile.in
--- a/Makefile.in	Sun Feb 17 16:39:29 2008 -0500
+++ b/Makefile.in	Sun Feb 17 16:40:56 2008 -0500
@@ -754,29 +754,44 @@ clean-extract:
 	rm -f stamps/extract.stamp
 
 stamps/patch.stamp: stamps/extract.stamp
+	all_patches_ok=yes; \
 	for p in $(ICEDTEA_PATCHES) ; \
 	do \
-	  echo Checking $$p ; \
-	  if $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
+	  if test x$${all_patches_ok} == "xyes" \
+	     && echo Checking $$p \
+	     && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
 	  then \
 	    echo Applying $$p ; \
 	    $(PATCH) -l -p0 < $$p ; \
+	  else \
+	    test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
 	  fi ; \
-	done
-	mkdir -p stamps
-	touch stamps/patch.stamp
+	done ; \
+	mkdir -p stamps ; \
+	touch stamps/patch.stamp ; \
+	if ! test x$${all_patches_ok} == "xyes"; then \
+	  echo ERROR patch $${all_patches_ok} FAILED! ; \
+	  echo WARNING make clean-patch before retrying a fix ; \
+	  false; \
+       fi
 
 clean-patch:
 	rm -f stamps/patch.stamp
 	for p in $(ICEDTEA_PATCHES) ; \
+	all_patches_ok=yes; \
 	do \
 	  echo Checking $$p ; \
 	  if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
 	  then \
 	    echo Reverting $$p ; \
 	    $(PATCH) -l -p0 -R < $$p ; \
+	  else \
+	    all_patches_ok=no ; \
 	  fi ; \
-	done
+	done ; \
+	if ! test x$${all_patches_ok} == "xyes" ; then \
+	  echo "WARNING Not all patches reverted cleanly" ; \
+	fi
 
 # OpenJDK ecj Source Preparation Targets
 # ======================================
@@ -811,9 +826,11 @@ stamps/patch-ecj.stamp: stamps/extract-e
 	then \
 	  echo Applying $(ICEDTEA_ECJ_PATCH) ; \
 	  $(PATCH) -p0 -l < $(ICEDTEA_ECJ_PATCH) ; \
-	fi
-	mkdir -p stamps
-	touch stamps/patch-ecj.stamp
+	  mkdir -p stamps; \
+	  touch stamps/patch-ecj.stamp; \
+	else \
+	  false; \
+	fi
 
 clean-patch-ecj:
 	rm -f stamps/patch-ecj.stamp
@@ -822,6 +839,8 @@ clean-patch-ecj:
 	then \
 	  echo Reverting $(ICEDTEA_ECJ_PATCH) ; \
 	  $(PATCH) -p0 -l -R < $(ICEDTEA_ECJ_PATCH) ; \
+	else \
+	  false; \
 	fi
 
 # Bootstrap Directory Targets