Re: [Quilt-dev] [patch] resend - remove patch-wrapper

[Dean Roehrich]

On Sun, Nov 02, 2008 at 05:52:30PM +0100, Andreas Gruenbacher wrote:
> On Friday, 31 October 2008 21:29:31 Dean Roehrich wrote:
> > On Fri, Oct 31, 2008 at 02:51:19PM -0500, Dean Roehrich wrote:
> > > Per discussion today, here's a patch to remove patch-wrapper.  It doesn't
> > > appear that patch-wrapper is being used for anything.
> >
> > And in that first patch I forgot to remove bin/patch-wrapper.in.
> 
> What's wrong with just fixing the --with-patch-wrapper config option that
> already exists, so that the test doesn't get run when the option is not
> chosen?

The following patch fixes --with-patch-wrapper.  The default behavior is
--with-patch-wrapper, as it was in 0.47.  Now you can specify
--with-patch-wrapper=no or --without-patch-wrapper to disable patch-wrapper
and its tests.  This means I've restored the TESTS value in the Makefile, and
removed the filter.

Dean




Index: quilt20081103/Makefile.in
===================================================================
--- quilt20081103.orig/Makefile.in      2008-11-03 15:35:26.155787000 -0600
+++ quilt20081103/Makefile.in   2008-11-03 15:35:32.829340000 -0600
@@ -73,8 +73,8 @@ DIRT +=               quilt.spec
 BIN_IN :=      quilt guards
 BIN_SRC :=     $(BIN_IN:%=%.in)
 BIN :=         $(BIN_IN)
-SRC +=         $(BIN_SRC:%=bin/%) bin/patch-wrapper.in
-DIRT +=                $(BIN_IN:%=bin/%) bin/patch-wrapper
+SRC +=         $(BIN_SRC:%=bin/%) $(if $(PATCH_WRAPPER),bin/patch-wrapper.in)
+DIRT +=                $(BIN_IN:%=bin/%) $(if 
$(PATCH_WRAPPER),bin/patch-wrapper)
 
 QUILT_IN :=    $(patsubst quilt/%.in,%,$(wildcard quilt/*.in))
 QUILT_SRC :=   $(QUILT_IN:%=%.in)
@@ -125,7 +125,7 @@ NON_EXEC_IN :=      doc/quilt.1 doc/README qu
 
 ISODATE :=     $(shell date +%Y%m%d)
 
-TESTS :=       $(filter-out test/patch-wrapper.test,$(wildcard test/*.test))
+TESTS :=       $(wildcard test/*.test)
 DIRT +=                test/.depend $(wildcard test/.*.ok)
 
 # Settings for running the uninstalled version of quilt in the source tree:
@@ -381,7 +381,12 @@ ifneq ($(findstring test,$(MAKECMDGOALS)
 -include test/.depend
 endif # (test|check)
 
+ifneq ($(PATCH_WRAPPER),)
 test/.patch-wrapper.ok : bin/patch-wrapper
+else
+test/.patch-wrapper.ok :
+       @touch $@
+endif
 
 # Include a run-time generated list of dependencies for each test case
 test/.depend : Makefile $(TESTS)
Index: quilt20081103/configure.ac
===================================================================
--- quilt20081103.orig/configure.ac     2008-11-03 15:35:26.149487000 -0600
+++ quilt20081103/configure.ac  2008-11-03 15:35:32.830527000 -0600
@@ -366,9 +366,14 @@ You can download GNU Gettext from ftp.gn
 ])
 fi
 
+PATCH_WRAPPER=yes
 AC_ARG_WITH(patch-wrapper, AC_HELP_STRING(
-    [--with-patch-wrapper], [include GNU patch wrapper]))
-PATCH_WRAPPER=$withval
+    [--with-patch-wrapper], [include GNU patch wrapper]),
+    [
+       if test x"$withval" = xno; then
+         PATCH_WRAPPER=
+       fi]
+    )
 AC_SUBST(PATCH_WRAPPER)
 
 if test $USE_NLS = no ; then