gbranden pushed a commit to branch master
in repository groff.
commit 8d1221a375ddf2ff914f487ca265d13c32ee4aeb
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Apr 11 04:37:18 2025 -0500
[font]: Update and parallelize `DESC` file gen.
* font/devdvi/devdvi.am (font/devdvi/DESC):
* font/devlbp/devlbp.am (font/devlbp/DESC):
* font/devlj4/devlj4.am (font/devlj4/DESC):
* font/devpdf/devpdf.am (font/devpdf/DESC): When constructing file by
stages, write to the target name suffixed with `.tmp`, then move it
into place once it is complete.
* font/devpdf/devpdf.am (font/devpdf/DESC):
* font/devps/devps.am (font/devps/DESC): Replace hard-coded directory
name with output of `dirname` command on Make's `$@` internal
variable.
* font/devpdf/devpdf.am (font/devpdf/DESC): Replace hard-coded target
name with Make's `$@` internal variable.
---
ChangeLog | 19 +++++++++++++++++++
font/devdvi/devdvi.am | 7 ++++---
font/devlbp/devlbp.am | 7 ++++---
font/devlj4/devlj4.am | 11 ++++++-----
font/devpdf/devpdf.am | 8 ++++----
font/devps/devps.am | 2 +-
6 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4e3b1d794..776037868 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2025-04-11 G. Branden Robinson <[email protected]>
+
+ [font]: Update and parallelize `DESC` file generation.
+
+ * font/devdvi/devdvi.am (font/devdvi/DESC):
+ * font/devlbp/devlbp.am (font/devlbp/DESC):
+ * font/devlj4/devlj4.am (font/devlj4/DESC):
+ * font/devpdf/devpdf.am (font/devpdf/DESC): When constructing
+ file by stages, write to the target name suffixed with `.tmp`,
+ then move it into place once it is complete.
+
+ * font/devpdf/devpdf.am (font/devpdf/DESC):
+ * font/devps/devps.am (font/devps/DESC): Replace hard-coded
+ directory name with output of `dirname` command on Make's `$@`
+ internal variable.
+
+ * font/devpdf/devpdf.am (font/devpdf/DESC): Replace hard-coded
+ target name with Make's `$@` internal variable.
+
2025-04-11 G. Branden Robinson <[email protected]>
* font/devdvi/devdvi.am (font/devdvi/DESC):
diff --git a/font/devdvi/devdvi.am b/font/devdvi/devdvi.am
index c058d3eba..5733195aa 100644
--- a/font/devdvi/devdvi.am
+++ b/font/devdvi/devdvi.am
@@ -87,10 +87,11 @@ MOSTLYCLEANFILES += font/devdvi/DESC
font/devdvi/DESC: $(devdvi_srcdir)/DESC.in
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
- && cat $(devdvi_srcdir)/DESC.in >$@ \
- && echo "papersize $(PAGE)" >>$@ \
+ && cat $(devdvi_srcdir)/DESC.in >[email protected] \
+ && echo "papersize $(PAGE)" >>[email protected] \
&& (test -z '$(DVIPRINT)' \
- || echo print '$(DVIPRINT)' >>$@)
+ || echo print '$(DVIPRINT)' >>[email protected])
+ $(AM_V_at)mv [email protected] $@
# Local Variables:
diff --git a/font/devlbp/devlbp.am b/font/devlbp/devlbp.am
index 2c815edc2..cd8fba986 100644
--- a/font/devlbp/devlbp.am
+++ b/font/devlbp/devlbp.am
@@ -43,10 +43,11 @@ MOSTLYCLEANFILES += font/devlbp/DESC
font/devlbp/DESC: $(devlbp_srcdir)/DESC.in
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
- && cat $(devlbp_srcdir)/DESC.in >$@ \
- && echo "papersize $(PAGE)" >>$@ \
+ && cat $(devlbp_srcdir)/DESC.in >[email protected] \
+ && echo "papersize $(PAGE)" >>[email protected] \
&& (test -z '$(LBPPRINT)' \
- || echo print '$(LBPPRINT)' >>$@)
+ || echo print '$(LBPPRINT)' >>[email protected])
+ $(AM_V_at)mv [email protected] $@
# Local Variables:
diff --git a/font/devlj4/devlj4.am b/font/devlj4/devlj4.am
index b60bb780d..bd919c9bd 100644
--- a/font/devlj4/devlj4.am
+++ b/font/devlj4/devlj4.am
@@ -86,12 +86,13 @@ MOSTLYCLEANFILES += font/devlj4/DESC
font/devlj4/DESC: $(devlj4_srcdir)/DESC.in
$(AM_V_GEN)$(MKDIR_P) `dirname $@` \
- && echo "res $(LJ4RES)" >$@ \
- && echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>$@ \
- && cat $(devlj4_srcdir)/DESC.in >>$@ \
- && echo "papersize $(PAGE)" >>$@ \
+ && echo "res $(LJ4RES)" >[email protected] \
+ && echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>[email protected] \
+ && cat $(devlj4_srcdir)/DESC.in >>[email protected] \
+ && echo "papersize $(PAGE)" >>[email protected] \
&& (test -z '$(LJ4PRINT)' \
- || echo print '$(LJ4PRINT)' >>$@)
+ || echo print '$(LJ4PRINT)' >>[email protected])
+ $(AM_V_at)mv [email protected] $@
fonts: devlj4_fonts
devlj4_fonts: hpftodit font/devlj4/DESC
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index d325129cf..3d9ae0d0d 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -88,10 +88,10 @@ font/devpdf/util/BuildFoundries: \
MOSTLYCLEANFILES += font/devpdf/DESC
font/devpdf/DESC: $(devpdf_srcdir)/DESC.in
- $(AM_V_GEN)$(MKDIR_P) $(top_builddir)/font/devpdf \
- && cat $(devpdf_srcdir)/DESC.in \
- >$(top_builddir)/font/devpdf/DESC \
- && echo "papersize $(PAGE)" >>$@
+ $(AM_V_GEN)$(MKDIR_P) `dirname $@` \
+ && cat $(devpdf_srcdir)/DESC.in >[email protected] \
+ && echo "papersize $(PAGE)" >>[email protected]
+ $(AM_V_at)mv [email protected] $@
font/devpdf/Foundry: $(devpdf_srcdir)/Foundry.in
$(AM_V_at)$(MKDIR_P) $(top_builddir)/font/devpdf/
diff --git a/font/devps/devps.am b/font/devps/devps.am
index c2c2103a9..eddf0420a 100644
--- a/font/devps/devps.am
+++ b/font/devps/devps.am
@@ -148,7 +148,7 @@ EXTRA_DIST += \
font/devps/generate/zapfdr.sed
font/devps/DESC: $(devps_srcdir)/DESC.in
- $(AM_V_GEN)$(MKDIR_P) font/devps \
+ $(AM_V_GEN)$(MKDIR_P) `dirname $@` \
&& cat $(devps_srcdir)/DESC.in >[email protected] \
&& echo broken $(BROKEN_SPOOLER_FLAGS) >>[email protected] \
&& echo "papersize $(PAGE)" >>[email protected] \
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
