it-use-quilt

Gbp-Pq: Name it-use-quilt.diff

diff --git a/Makefile.am b/Makefile.am
index fb0f895d1efb3811cd9c1675c7e6fcda8c830a81..10b9d96f45cc2f3f6b1d5d62e18bcf3bc8aebba8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1665,132 +1665,37 @@ clean-fonts:
        rm -f stamps/fonts.stamp
 
 stamps/patch-fsg.stamp: stamps/extract.stamp stamps/fonts.stamp
+       set -e; \
        mkdir -p stamps ; \
-       rm -f stamps/patch-fsg.stamp.tmp ; \
-       touch stamps/patch-fsg.stamp.tmp ; \
-       all_patches_ok=yes; \
-       for p in $(ICEDTEA_FSG_PATCHES) ; \
-       do \
-         if test x$${all_patches_ok} = "xyes" \
-           && echo Checking $$p \
-           && $(PATCH) -l -p0 --dry-run -s -t -f \
-             -F 0 < $(abs_top_srcdir)/$$p ; \
-         then \
-           echo Applying $$p ; \
-           $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-           if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
-             >> stamps/patch-fsg.stamp.tmp ; \
-           then \
-             echo "* $$(basename $$p): UNDOCUMENTED" \
-               >> stamps/patch-fsg.stamp.tmp ; \
-           fi ; \
-         else \
-           test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
-         fi ; \
-       done ; \
-       mv stamps/patch-fsg.stamp.tmp stamps/patch-fsg.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 ; \
-         exit 2; \
-       fi ; 
+       if [ -n "$(ICEDTEA_FSG_PATCHES)" ]; then \
+         for p in $(ICEDTEA_FSG_PATCHES); do \
+           echo "$$p -p0"; \
+         done > series.fsg; \
+         QUILT_SERIES=series.fsg QUILT_PATCHES=$(abs_top_srcdir) quilt push -a; \
+         mv .pc .pc.fsg; \
+       fi
+       touch $@
 
 clean-patch-fsg: clean-patch
-       if [ -e stamps/patch-fsg.stamp ] ; then \
-         all_patches_ok=yes; \
-         for p in $(ICEDTEA_FSG_PATCHES) ; \
-         do \
-           echo Checking $$p ; \
-           if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-           then \
-             echo Reverting $$p ; \
-             $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
-           else \
-             all_patches_ok=no ; \
-           fi ; \
-         done ; \
-         if ! test x$${all_patches_ok} = "xyes" ; then \
-           echo "WARNING Not all patches reverted cleanly" ; \
-         fi ; \
-         rm -f stamps/patch-fsg.stamp ; \
+       if [ -e series.fsg ] ; then \
+         QUILT_SERIES=series.fsg QUILT_PATCHES=$(abs_top_srcdir) quilt pop -a; \
        fi
 
 stamps/patch.stamp: stamps/patch-fsg.stamp
+       set -e; \
        mkdir -p stamps ; \
-       rm -f stamps/patch.stamp.tmp ; \
-       touch stamps/patch.stamp.tmp ; \
-       all_patches_ok=yes; \
-       cd $(abs_top_builddir)/openjdk/jdk; \
-       for p in $(OPENJDK_PATCHES) ; \
-       do \
-         if test x$${all_patches_ok} == "xyes" \
-            && echo Checking $$p \
-            && $(PATCH) -l -p1 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
-         then \
-           echo Applying $$p ; \
-           $(PATCH) -l -p1 < $(abs_top_srcdir)/$$p ; \
-         else \
-           test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
-         fi ; \
-       done ; \
-       cd $(abs_top_builddir) ; \
-       for p in $(ICEDTEA_PATCHES) ; \
-       do \
-         if test x$${all_patches_ok} = "xyes" \
-           && echo Checking $$p \
-           && $(PATCH) -l -p0 --dry-run -s -t -f \
-             -F 0 < $(abs_top_srcdir)/$$p ; \
-         then \
-           echo Applying $$p ; \
-           $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-           if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
-             >> stamps/patch.stamp.tmp ; \
-           then \
-             echo "* $$(basename $$p): UNDOCUMENTED" \
-               >> stamps/patch.stamp.tmp ; \
-           fi ; \
-         else \
-           test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
-         fi ; \
-       done ; \
-       if ! test x$${all_patches_ok} = "xyes"; then \
-         echo ERROR patch $${all_patches_ok} FAILED! ; \
-         echo WARNING make clean-patch before retrying a fix ; \
-         exit 2; \
-       fi ; \
-       mv stamps/patch.stamp.tmp stamps/patch.stamp 
+       if [ -n "$(ICEDTEA_PATCHES)" ]; then \
+         for p in $(ICEDTEA_PATCHES); do \
+           echo "$$p -p0"; \
+         done > series.openjdk; \
+         QUILT_SERIES=series.openjdk QUILT_PATCHES=$(abs_top_srcdir) quilt push -a; \
+         mv .pc .pc.openjdk; \
+       fi
+       touch $@
 
 clean-patch:
-       if [ -e stamps/patch.stamp ] ; then \
-         all_patches_ok=yes; \
-         for p in $(ICEDTEA_PATCHES) ; \
-         do \
-           echo Checking $$p ; \
-           if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-           then \
-             echo Reverting $$p ; \
-             $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
-           else \
-             all_patches_ok=no ; \
-           fi ; \
-         done ; \
-         cd $(abs_top_builddir)/openjdk/jdk; \
-         for p in $(OPENJDK_PATCHES) ; \
-         do \
-           echo Checking $$p ; \
-           if $(PATCH) -l -p1 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-           then \
-             echo Reverting $$p ; \
-             $(PATCH) -l -p1 -R < $(abs_top_srcdir)/$$p ; \
-           else \
-             all_patches_ok=no ; \
-           fi ; \
-         done ; \
-         cd $(abs_top_builddir) ; \
-         if ! test x$${all_patches_ok} = "xyes" ; then \
-           echo "WARNING Not all patches reverted cleanly" ; \
-         fi ; \
-         rm -f stamps/patch.stamp ; \
+       if [ -e series.opendjk ] ; then \
+         QUILT_SERIES=series.openjdk QUILT_PATCHES=$(abs_top_srcdir) quilt pop -a; \
        fi
 
 stamps/versioning.stamp: stamps/patch.stamp
@@ -1860,54 +1765,20 @@ clean-clone-boot:
        rm -f stamps/clone-boot.stamp
 
 stamps/patch-boot.stamp: stamps/clone-boot.stamp
+       set -e; \
        mkdir -p stamps; \
-       rm -f stamps/patch-boot.stamp.tmp ; \
-       touch stamps/patch-boot.stamp.tmp ; \
-       all_patches_ok=yes; \
-       for p in $(ICEDTEA_BOOT_PATCHES) ; \
-       do \
-         if test x$${all_patches_ok} = "xyes" \
-           && echo Checking $$p \
-           && $(PATCH) -l -p0 --dry-run -s -t -f \
-             -F 0 < $(abs_top_srcdir)/$$p ; \
-         then \
-           echo Applying $$p ; \
-           $(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
-           if ! grep "^\* $$(basename $$p)" $(abs_top_srcdir)/HACKING \
-             >> stamps/patch-boot.stamp.tmp ; \
-           then \
-             echo "* $$(basename $$p): UNDOCUMENTED" \
-               >> stamps/patch-boot.stamp.tmp ; \
-           fi ; \
-         else \
-           test x$${all_patches_ok} = "xyes" && all_patches_ok=$$p ; \
-         fi ; \
-       done ; \
-       mv stamps/patch-boot.stamp.tmp stamps/patch-boot.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 ; \
-         exit 2; \
+       if [ -n "$(ICEDTEA_BOOT_PATCHES)" ]; then \
+         for p in $(ICEDTEA_BOOT_PATCHES); do \
+           echo "$$p -p0"; \
+         done > series.boot; \
+         QUILT_SERIES=series.boot QUILT_PATCHES=$(abs_top_srcdir) quilt push -a; \
+         mv .pc .pc.boot; \
        fi
+       touch $@
 
 clean-patch-boot:
-       if [ -e stamps/patch-boot.stamp ] ; then \
-         all_patches_ok=yes; \
-         for p in $(ICEDTEA_BOOT_PATCHES) ; \
-         do \
-           echo Checking $$p ; \
-           if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-           then \
-             echo Reverting $$p ; \
-             $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
-           else \
-             all_patches_ok=no ; \
-           fi ; \
-         done ; \
-         if ! test x$${all_patches_ok} = "xyes" ; then \
-           echo "WARNING Not all patches reverted cleanly" ; \
-         fi ; \
-         rm -f stamps/patch-boot.stamp ; \
+       if [ -e series.boot ] ; then \
+         QUILT_SERIES=series.boot QUILT_PATCHES=$(abs_top_srcdir) quilt pop -a; \
        fi
 
 # Bootstrap Directory Targets