guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/13: maint: Avoid EPS generation to fail silently, ensure reproducibil


From: guix-commits
Subject: 10/13: maint: Avoid EPS generation to fail silently, ensure reproducibility.
Date: Sat, 13 Apr 2024 05:44:51 -0400 (EDT)

janneke pushed a commit to branch wip-tarball
in repository guix.

commit 297ce6136e5967a910af041cb6c4d4467f0ca33d
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sat Apr 6 11:34:49 2024 +0200

    maint: Avoid EPS generation to fail silently, ensure reproducibility.
    
    Currently, Graphviz' dot does not insert a %%CreationDate.  ImageMagick's
    convert on PNG->EPS does insert a %%CreationDate but it respects
    SOURCE_DATE_EPOCH.
    
    * doc/local.mk (.png.eps): Split single shell command into separate recipe
    lines, prefixed by $(AM_V_at).
    (.dot.png): Likewise.  Check that generated EPS file has no %%CreationDate.
    
    Change-Id: I5a03485c19c72f0c46411815c51290e52a8e5399
---
 doc/local.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/local.mk b/doc/local.mk
index 589bf3cd6e..acc5e47196 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -152,12 +152,13 @@ DOT_OPTIONS =                                     \
        mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
 
 .dot.eps:
-       $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-       mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+       $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"
+       $(AM_v_at)! grep -q %%CreationDate "$(srcdir)/$@.tmp"
+       $(AM_V_at)mv "$(srcdir)/$@.tmp" "$@"
 
 .png.eps:
-       $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
-       mv "$@-tmp.eps" "$@"
+       $(AM_V_GEN)convert "$<" "$@-tmp.eps"
+       $(AM_V_at)mv "$@-tmp.eps" "$@"
 
 # We cannot add new dependencies to `%D%/guix.pdf' & co. (info "(automake)
 # Extending").  Using the `-local' rules is imperfect, because they may be



reply via email to

[Prev in Thread] Current Thread [Next in Thread]