[Shepherd][PATCH 0/2] Improve 'make' display and update .gitignore.

[Shepherd][PATCH 0/2] Improve 'make' display and update .gitignore.

[Mathieu Lirzin]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]



Mathieu Lirzin (2):
  build: Improve display for silent rules.
  maint: Update .gitignore.

 .gitignore  | 36 ++++++++++++++++++------------------
 Makefile.am | 11 ++++-------
 2 files changed, 22 insertions(+), 25 deletions(-)

-- 
2.6.4

[PATCH 1/2] build: Improve display for silent rules.

[Mathieu Lirzin]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]


* Makefile.am (AM_V_INSTANTIATE, AM_V_INSTANTIATE_, AM_V_INSTANTIATE_0):
Delete variables.
(%): Use the predefined variable AM_V_GEN instead of AM_V_INSTANTIATE.
(AM_V_GUILEC_0): Fix spacing between the command and the file name.
(%.go): Close standard output when silent rules are enabled, to prevent
'guild compile' to make any noise.
---
 Makefile.am | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-Improve-display-for-silent-rules.patch --]
[-- Type: text/x-patch; name="0001-build-Improve-display-for-silent-rules.patch", Size: 1590 bytes --]

diff --git a/Makefile.am b/Makefile.am
index 9bbc3e3..e8e322a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,17 +104,13 @@ instantiate =						\
 
 # Instantiate templates.
 
-AM_V_INSTANTIATE = $(AM_V_INSTANTIATE_$(V))
-AM_V_INSTANTIATE_ = $(AM_V_INSTANTIATE_$(AM_DEFAULT_VERBOSITY))
-AM_V_INSTANTIATE_0 = @echo "  INSTANTIATE" $@;
-
 # Emit a 'chmod +x' command only if $@ matches one of the scripts.
 maybe_executable =					\
    $(subst $@,chmod +x $@,				\
       $(findstring $@,$(bin_SCRIPTS) $(sbin_SCRIPTS)))
 
 %: %.in Makefile
-	$(AM_V_INSTANTIATE)$(MKDIR_P) "`dirname $@`" ;	\
+	$(AM_V_GEN)$(MKDIR_P) "`dirname $@`" ;		\
 	$(SED) $(instantiate) < $< >$@ ;		\
 	$(maybe_executable)
 
@@ -124,19 +120,20 @@ modules/shepherd/config.scm: modules/shepherd/config.scm.in Makefile
 
 AM_V_GUILEC = $(AM_V_GUILEC_$(V))
 AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
-AM_V_GUILEC_0 = @echo "  GUILEC" $@;
+AM_V_GUILEC_0 = @echo "  GUILEC  " $@;
 
 # Make sure 'modules/shepherd/{config,system.scm}' are built first.
 # XXX: Use the C locale for when Guile lacks
 # <http://git.sv.gnu.org/cgit/guile.git/commit/?h=stable-2.0&id=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f>.
 %.go: %.scm $(templates:%.in=%)
 	$(AM_V_GUILEC)$(MKDIR_P) "`dirname "$@"`" ;	\
+	$(AM_V_P) && out=1 || out=- ;			\
 	LC_ALL=C					\
 	$(GUILD) compile --target="$(host)"		\
 	  -L "$(top_builddir)/modules"			\
 	  -L "$(top_srcdir)/modules"			\
 	  -Wformat -Wunbound-variable -Warity-mismatch	\
-	  -o "$@" "$<"
+	  -o "$@" "$<" >&$$out
 
 SUFFIXES = .go
 

[PATCH 2/2] maint: Update .gitignore.

[Mathieu Lirzin]

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]


*.gitignore: Replace dmd with shepherd in .gitignore.
---
 .gitignore | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-maint-Update-.gitignore.patch --]
[-- Type: text/x-patch; name="0002-maint-Update-.gitignore.patch", Size: 957 bytes --]

diff --git a/.gitignore b/.gitignore
index 0b281f8..a151533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /configure
-/dmd.info
+/shepherd.info
 /stamp-vti
 /version.texi
 /config.cache
@@ -7,7 +7,7 @@
 /config.scm
 /config.status
 /deco
-/dmd
+/shepherd
 /examples/Makefile
 /utils/Makefile
 /autom4te.cache
@@ -21,24 +21,24 @@ Makefile
 /INSTALL
 /aclocal.m4
 *.go
-/modules/dmd/config.scm
-/dmd.aux
-/dmd.cp
-/dmd.cps
-/dmd.fn
-/dmd.fns
-/dmd.ky
-/dmd.log
-/dmd.pg
-/dmd.toc
-/dmd.tp
-/dmd.tps
-/dmd.vr
-/dmd.vrs
-/modules/dmd/system.scm
+/modules/shepherd/config.scm
+/shepherd.aux
+/shepherd.cp
+/shepherd.cps
+/shepherd.fn
+/shepherd.fns
+/shepherd.ky
+/shepherd.log
+/shepherd.pg
+/shepherd.toc
+/shepherd.tp
+/shepherd.tps
+/shepherd.vr
+/shepherd.vrs
+/modules/shepherd/system.scm
 /halt
 /reboot
-/dmd.pdf
+/shepherd.pdf
 /test-suite.log
 /tests/basic.log
 /tests/basic.trs

Re: [PATCH 1/2] build: Improve display for silent rules.

[Ludovic Courtès]

Mathieu Lirzin <mthl@gnu.org> skribis:

> * Makefile.am (AM_V_INSTANTIATE, AM_V_INSTANTIATE_, AM_V_INSTANTIATE_0):
> Delete variables.
> (%): Use the predefined variable AM_V_GEN instead of AM_V_INSTANTIATE.
> (AM_V_GUILEC_0): Fix spacing between the command and the file name.
> (%.go): Close standard output when silent rules are enabled, to prevent
> 'guild compile' to make any noise.

Nice, applied, thanks!

BTW, could you tell ‘git send-email’ to not make attachments for .patch
files?  That would allow me to directly use ‘gnus-summary-pipe-output’
to pass the whole message to ‘git am’.

Ludo’.

Re: [PATCH 2/2] maint: Update .gitignore.

[Ludovic Courtès]

Mathieu Lirzin <mthl@gnu.org> skribis:

> *.gitignore: Replace dmd with shepherd in .gitignore.

Applied, thanks!

Ludo’.

Re: [PATCH 1/2] build: Improve display for silent rules.

[Mathieu Lirzin]

ludo@gnu.org (Ludovic Courtès) writes:

> BTW, could you tell ‘git send-email’ to not make attachments for .patch
> files?  That would allow me to directly use ‘gnus-summary-pipe-output’
> to pass the whole message to ‘git am’.

Indeed, that was not intended.  I have used --attach instead of --inline
when doing ‘git format-patch’.

--
Mathieu Lirzin