* [PATCH 1/4] Cygwin: silence most custom build rules
2022-01-19 13:15 [PATCH 0/4] Silence more build rules Jon Turney
@ 2022-01-19 13:15 ` Jon Turney
2022-01-19 13:15 ` [PATCH 2/4] Cygwin: silence dblatex when building PDFs Jon Turney
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Jon Turney @ 2022-01-19 13:15 UTC (permalink / raw)
To: cygwin-patches; +Cc: Jon Turney
---
winsup/cygwin/Makefile.am | 38 +++++++++++++++++++-------------------
winsup/doc/Makefile.am | 38 +++++++++++++++++++-------------------
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index 2b8e87fcd..8d55e1693 100644
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -367,16 +367,16 @@ libdll_a_SOURCES= \
#
shared_info_magic.h: cygmagic shared_info.h
- $(srcdir)/cygmagic $@ "$(CC) $(INCLUDES) $(CPPFLAGS) -E -x c++" $(word 2,$^) SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
+ $(AM_V_GEN)$(srcdir)/cygmagic $@ "$(CC) $(INCLUDES) $(CPPFLAGS) -E -x c++" $(word 2,$^) SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
child_info_magic.h: cygmagic child_info.h
- $(srcdir)/cygmagic $@ "$(CC) $(INCLUDES) $(CPPFLAGS) -E -x c++" $(word 2,$^) CHILD_INFO_MAGIC 'class child_info'
+ $(AM_V_GEN)$(srcdir)/cygmagic $@ "$(CC) $(INCLUDES) $(CPPFLAGS) -E -x c++" $(word 2,$^) CHILD_INFO_MAGIC 'class child_info'
globals.h: mkglobals_h globals.cc
- $^ > $@
+ $(AM_V_GEN)$^ > $@
localtime.patched.c: tzcode/localtime.c tzcode/localtime.c.patch
- patch -u -o localtime.patched.c \
+ $(AM_V_GEN)patch -u -o localtime.patched.c \
$(srcdir)/tzcode/localtime.c \
$(srcdir)/tzcode/localtime.c.patch
@@ -620,12 +620,12 @@ $(LIBSERVER):
# linker script
LDSCRIPT=cygwin.sc
$(LDSCRIPT): $(LDSCRIPT).in
- $(CC) -E - -P < $^ -o $@
+ $(AM_V_GEN)$(CC) -E - -P < $^ -o $@
# cygwin dll
$(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg libdll.a $(VERSION_OFILES) $(LIBSERVER)\
$(newlib_build)/libm/libm.a $(newlib_build)/libc/libc.a
- $(CXX) $(CXXFLAGS) \
+ $(AM_V_CXXLD)$(CXX) $(CXXFLAGS) \
-mno-use-libstdc-wrappers \
-Wl,--gc-sections -nostdlib -Wl,-T$(LDSCRIPT) -static \
-Wl,--heap=0 -Wl,--out-implib,cygdll.a -shared -o $@ \
@@ -636,14 +636,14 @@ $(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg libdll.a $(VERSION_OFILES) $(LIBSERVER)\
$(newlib_build)/libm/libm.a \
$(newlib_build)/libc/libc.a \
-lgcc -lkernel32 -lntdll -Wl,-Map,cygwin.map
- $(srcdir)/dllfixdbg $(OBJDUMP) $(OBJCOPY) $@ cygwin1.dbg
+ @$(srcdir)/dllfixdbg $(OBJDUMP) $(OBJCOPY) $@ cygwin1.dbg
@ln -f $@ new-cygwin1.dll
# cygwin import library
toolopts=--cpu=@target_cpu@ --ar=@AR@ --as=@AS@ --nm=@NM@ --objcopy=@OBJCOPY@
$(DEF_FILE): gendef $(srcdir)/$(TLSOFFSETS_H) $(DIN_FILE) common.din
- $(srcdir)/gendef --cpu=@target_cpu@ --output-def=$(DEF_FILE) --tlsoffsets=$(srcdir)/$(TLSOFFSETS_H) $(srcdir)/$(DIN_FILE) $(srcdir)/common.din
+ $(AM_V_GEN)$(srcdir)/gendef --cpu=@target_cpu@ --output-def=$(DEF_FILE) --tlsoffsets=$(srcdir)/$(TLSOFFSETS_H) $(srcdir)/$(DIN_FILE) $(srcdir)/common.din
sigfe.s: $(DEF_FILE)
@[ -s $@ ] || \
@@ -652,11 +652,11 @@ sigfe.s: $(DEF_FILE)
LIBCOS=$(addsuffix .o,$(basename $(LIB_FILES)))
$(LIB_NAME): $(DEF_FILE) $(LIBCOS) | $(TEST_DLL_NAME)
- $(srcdir)/mkimport $(toolopts) $(NEW_FUNCTIONS) $@ cygdll.a $(wordlist 2,99,$^)
+ $(AM_V_GEN)$(srcdir)/mkimport $(toolopts) $(NEW_FUNCTIONS) $@ cygdll.a $(wordlist 2,99,$^)
# cygwin import library used by testsuite
$(TEST_LIB_NAME): $(LIB_NAME)
- perl -p -e 'BEGIN{binmode(STDIN); binmode(STDOUT);}; s/cygwin1/cygwin0/g' < $? > $@
+ $(AM_V_GEN)perl -p -e 'BEGIN{binmode(STDIN); binmode(STDOUT);}; s/cygwin1/cygwin0/g' < $? > $@
# sublibs
# import libraries for some subset of symbols indicated by given objects
@@ -669,32 +669,32 @@ speclib=\
--exclude='^_main$$'
libc.a: $(LIB_NAME) libm.a libpthread.a libutil.a
- $(speclib) $^ -v $(@F)
+ $(AM_V_GEN)$(speclib) $^ -v $(@F)
libm.a: $(LIB_NAME) $(newlib_build)/libm/libm.a $(addsuffix .o,$(basename $(MATH_FILES)))
- $(speclib) $^ $(@F)
+ $(AM_V_GEN)$(speclib) $^ $(@F)
libpthread.a: $(LIB_NAME) pthread.o thread.o libc/call_once.o libc/cnd.o \
libc/mtx.o libc/thrd.o libc/tss.o
- $(speclib) $^ $(@F)
+ $(AM_V_GEN)$(speclib) $^ $(@F)
libutil.a: $(LIB_NAME) libc/bsdlib.o
- $(speclib) $^ $(@F)
+ $(AM_V_GEN)$(speclib) $^ $(@F)
libdl.a: $(LIB_NAME) dlfcn.o
- $(speclib) $^ $(@F)
+ $(AM_V_GEN)$(speclib) $^ $(@F)
libresolv.a: $(LIB_NAME) libc/minires.o
- $(speclib) $^ $(@F)
+ $(AM_V_GEN)$(speclib) $^ $(@F)
librt.a: $(LIB_NAME) posix_ipc.o
- $(speclib) $^ $(@F)
+ $(AM_V_GEN)$(speclib) $^ $(@F)
libacl.a: $(LIB_NAME) sec_posixacl.o
- $(speclib) $^ $(@F)
+ $(AM_V_GEN)$(speclib) $^ $(@F)
libssp.a: $(LIB_NAME) $(newlib_build)/libc/ssp/lib.a
- $(speclib) $^ $(@F)
+ $(AM_V_GEN)$(speclib) $^ $(@F)
#
# all
diff --git a/winsup/doc/Makefile.am b/winsup/doc/Makefile.am
index 5164c6e0a..44b64babc 100644
--- a/winsup/doc/Makefile.am
+++ b/winsup/doc/Makefile.am
@@ -107,56 +107,56 @@ uninstall-hook: uninstall-extra-man uninstall-html uninstall-info uninstall-etc
# nochunks ug html is not installed, but will be deployed to website
cygwin-ug-net/cygwin-ug-net-nochunks.html.gz: $(cygwin-ug-net_SOURCES) html.xsl
- $(XMLTO) html-nochunks -m $(srcdir)/html.xsl $<
+ $(AM_V_GEN)$(XMLTO) html-nochunks -m $(srcdir)/html.xsl $<
@$(MKDIR_P) cygwin-ug-net
- cp cygwin-ug-net.html cygwin-ug-net/cygwin-ug-net-nochunks.html
- rm -f cygwin-ug-net/cygwin-ug-net-nochunks.html.gz
- gzip cygwin-ug-net/cygwin-ug-net-nochunks.html
+ @cp cygwin-ug-net.html cygwin-ug-net/cygwin-ug-net-nochunks.html
+ @rm -f cygwin-ug-net/cygwin-ug-net-nochunks.html.gz
+ $(AM_V_at)gzip cygwin-ug-net/cygwin-ug-net-nochunks.html
cygwin-ug-net/cygwin-ug-net.html: $(cygwin-ug-net_SOURCES) html.xsl
- $(XMLTO) html -o cygwin-ug-net/ -m $(srcdir)/html.xsl $<
+ $(AM_V_GEN)$(XMLTO) html -o cygwin-ug-net/ -m $(srcdir)/html.xsl $<
cygwin-ug-net/cygwin-ug-net.pdf: $(cygwin-ug-net_SOURCES) fo.xsl
- $(XMLTO) pdf -o cygwin-ug-net/ -m $(srcdir)/fo.xsl $<
+ $(AM_V_GEN)$(XMLTO) pdf -o cygwin-ug-net/ -m $(srcdir)/fo.xsl $<
utils2man.stamp: $(cygwin-ug-net_SOURCES) man.xsl
- $(XMLTO) man -m $(srcdir)/man.xsl $<
+ $(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $<
@touch $@
cygwin-ug-net.info: $(cygwin-ug-net_SOURCES) charmap
- $(DOCBOOK2XTEXI) $(srcdir)/cygwin-ug-net.xml --string-param output-file=cygwin-ug-net
+ $(AM_V_GEN)$(DOCBOOK2XTEXI) $(srcdir)/cygwin-ug-net.xml --string-param output-file=cygwin-ug-net
cygwin-api/cygwin-api.html: $(cygwin-api_SOURCES) html.xsl
- $(XMLTO) html -o cygwin-api/ -m $(srcdir)/html.xsl $<
+ $(AM_V_GEN)$(XMLTO) html -o cygwin-api/ -m $(srcdir)/html.xsl $<
cygwin-api/cygwin-api.pdf: $(cygwin-api_SOURCES) fo.xsl
- $(XMLTO) pdf -o cygwin-api/ -m $(srcdir)/fo.xsl $<
+ $(AM_V_GEN)$(XMLTO) pdf -o cygwin-api/ -m $(srcdir)/fo.xsl $<
api2man.stamp: $(cygwin-api_SOURCES) man.xsl
- $(XMLTO) man -m $(srcdir)/man.xsl $<
+ $(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $<
@touch $@
cygwin-api.info: $(cygwin-api_SOURCES) charmap
- $(DOCBOOK2XTEXI) $(srcdir)/cygwin-api.xml --string-param output-file=cygwin-api
+ $(AM_V_GEN)$(DOCBOOK2XTEXI) $(srcdir)/cygwin-api.xml --string-param output-file=cygwin-api
# this generates a custom charmap for docbook2x-texi which has a mapping for ®
charmap:
- cp /usr/share/docbook2X/charmaps/texi.charmap charmap
- echo "ae (R)" >>charmap
+ $(AM_V_GEN)cp /usr/share/docbook2X/charmaps/texi.charmap charmap
+ $(AM_V_at)echo "ae (R)" >>charmap
intro2man.stamp: intro.xml man.xsl
- $(XMLTO) man -m $(srcdir)/man.xsl $<
+ $(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $<
@echo ".so intro.1" >cygwin.1
@touch $@
faq/faq.html: $(faq_SOURCES) html.xsl
- $(XMLTO) html -o faq -m $(srcdir)/html.xsl $(srcdir)/faq.xml
- sed -i 's;<a name="id[mp][0-9]*"></a>;;g' faq/faq.html
+ $(AM_V_GEN)$(XMLTO) html -o faq -m $(srcdir)/html.xsl $(srcdir)/faq.xml
+ @sed -i 's;<a name="id[mp][0-9]*"></a>;;g' faq/faq.html
# faq body is not installed, but is intended to be deployed to website, where it
# can be SSI included in a framing page
faq/faq.body: faq/faq.html
- $(srcdir)/bodysnatcher.pl $<
+ $(AM_V_GEN)$(srcdir)/bodysnatcher.pl $<
Makefile.dep: cygwin-ug-net.xml cygwin-api.xml faq.xml intro.xml
- cd $(srcdir) && ./xidepend $^ > "$(CURDIR)/$@"
+ $(AM_V_GEN)cd $(srcdir) && ./xidepend $^ > "$(CURDIR)/$@"
--
2.34.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/4] Cygwin: silence dblatex when building PDFs
2022-01-19 13:15 [PATCH 0/4] Silence more build rules Jon Turney
2022-01-19 13:15 ` [PATCH 1/4] Cygwin: silence most custom " Jon Turney
@ 2022-01-19 13:15 ` Jon Turney
2022-01-20 16:43 ` Jon Turney
2022-01-19 13:15 ` [PATCH 3/4] Cygwin: silence xsltproc when writing chunked html Jon Turney
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Jon Turney @ 2022-01-19 13:15 UTC (permalink / raw)
To: cygwin-patches; +Cc: Jon Turney
Unless make is invoked with V=1, have xmlto pass '-q' to dblatex when
building PDFs, to avoid "default template used in programlisting or
screen" warnings from dblatex's verbatim.xsl stylesheet.
---
winsup/doc/Makefile.am | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/winsup/doc/Makefile.am b/winsup/doc/Makefile.am
index 44b64babc..57b74341a 100644
--- a/winsup/doc/Makefile.am
+++ b/winsup/doc/Makefile.am
@@ -17,6 +17,9 @@ doc_DATA = \
htmldir = $(datarootdir)/doc
XMLTO=@XMLTO@ --skip-validation --with-dblatex
+XMLTO_DBLATEX_QUIET_=-p '-q'
+XMLTO_DBLATEX_QUIET=$(XMLTO_DBLATEX_QUIET_$(V))
+
DOCBOOK2XTEXI=@DOCBOOK2XTEXI@ --xinclude --info --utf8trans-map=charmap
-include Makefile.dep
@@ -117,7 +120,7 @@ cygwin-ug-net/cygwin-ug-net.html: $(cygwin-ug-net_SOURCES) html.xsl
$(AM_V_GEN)$(XMLTO) html -o cygwin-ug-net/ -m $(srcdir)/html.xsl $<
cygwin-ug-net/cygwin-ug-net.pdf: $(cygwin-ug-net_SOURCES) fo.xsl
- $(AM_V_GEN)$(XMLTO) pdf -o cygwin-ug-net/ -m $(srcdir)/fo.xsl $<
+ $(AM_V_GEN)$(XMLTO) pdf -o cygwin-ug-net/ -m $(srcdir)/fo.xsl $(XMLTO_DBLATEX_QUIET) $<
utils2man.stamp: $(cygwin-ug-net_SOURCES) man.xsl
$(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $<
@@ -130,7 +133,7 @@ cygwin-api/cygwin-api.html: $(cygwin-api_SOURCES) html.xsl
$(AM_V_GEN)$(XMLTO) html -o cygwin-api/ -m $(srcdir)/html.xsl $<
cygwin-api/cygwin-api.pdf: $(cygwin-api_SOURCES) fo.xsl
- $(AM_V_GEN)$(XMLTO) pdf -o cygwin-api/ -m $(srcdir)/fo.xsl $<
+ $(AM_V_GEN)$(XMLTO) pdf -o cygwin-api/ -m $(srcdir)/fo.xsl $(XMLTO_DBLATEX_QUIET) $<
api2man.stamp: $(cygwin-api_SOURCES) man.xsl
$(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $<
--
2.34.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] Cygwin: silence dblatex when building PDFs
2022-01-19 13:15 ` [PATCH 2/4] Cygwin: silence dblatex when building PDFs Jon Turney
@ 2022-01-20 16:43 ` Jon Turney
2022-01-20 16:46 ` Corinna Vinschen
0 siblings, 1 reply; 12+ messages in thread
From: Jon Turney @ 2022-01-20 16:43 UTC (permalink / raw)
To: Cygwin Patches
On 19/01/2022 13:15, Jon Turney wrote:
> Unless make is invoked with V=1, have xmlto pass '-q' to dblatex when
> building PDFs, to avoid "default template used in programlisting or
> screen" warnings from dblatex's verbatim.xsl stylesheet.
> ---
> winsup/doc/Makefile.am | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/winsup/doc/Makefile.am b/winsup/doc/Makefile.am
> index 44b64babc..57b74341a 100644
> --- a/winsup/doc/Makefile.am
> +++ b/winsup/doc/Makefile.am
> @@ -17,6 +17,9 @@ doc_DATA = \
> htmldir = $(datarootdir)/doc
>
> XMLTO=@XMLTO@ --skip-validation --with-dblatex
> +XMLTO_DBLATEX_QUIET_=-p '-q'
> +XMLTO_DBLATEX_QUIET=$(XMLTO_DBLATEX_QUIET_$(V))
This doesn't seem to be working as expected when building on Fedora
Rawhide [1], but it looks like xmlto isn't using dblatex despite '
--with-dblatex'?
[1]
https://github.com/cygwin/cygwin/runs/4876704875?check_suite_focus=true#step:16:2211
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] Cygwin: silence dblatex when building PDFs
2022-01-20 16:43 ` Jon Turney
@ 2022-01-20 16:46 ` Corinna Vinschen
2022-01-20 20:02 ` Jon Turney
0 siblings, 1 reply; 12+ messages in thread
From: Corinna Vinschen @ 2022-01-20 16:46 UTC (permalink / raw)
To: cygwin-patches
On Jan 20 16:43, Jon Turney wrote:
> On 19/01/2022 13:15, Jon Turney wrote:
> > Unless make is invoked with V=1, have xmlto pass '-q' to dblatex when
> > building PDFs, to avoid "default template used in programlisting or
> > screen" warnings from dblatex's verbatim.xsl stylesheet.
> > ---
> > winsup/doc/Makefile.am | 7 +++++--
> > 1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/winsup/doc/Makefile.am b/winsup/doc/Makefile.am
> > index 44b64babc..57b74341a 100644
> > --- a/winsup/doc/Makefile.am
> > +++ b/winsup/doc/Makefile.am
> > @@ -17,6 +17,9 @@ doc_DATA = \
> > htmldir = $(datarootdir)/doc
> > XMLTO=@XMLTO@ --skip-validation --with-dblatex
> > +XMLTO_DBLATEX_QUIET_=-p '-q'
> > +XMLTO_DBLATEX_QUIET=$(XMLTO_DBLATEX_QUIET_$(V))
>
>
> This doesn't seem to be working as expected when building on Fedora Rawhide
> [1], but it looks like xmlto isn't using dblatex despite ' --with-dblatex'?
Did you install dblatex?
Corinna
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] Cygwin: silence dblatex when building PDFs
2022-01-20 16:46 ` Corinna Vinschen
@ 2022-01-20 20:02 ` Jon Turney
2022-01-26 15:19 ` Jon Turney
0 siblings, 1 reply; 12+ messages in thread
From: Jon Turney @ 2022-01-20 20:02 UTC (permalink / raw)
To: Cygwin Patches
On 20/01/2022 16:46, Corinna Vinschen wrote:
> On Jan 20 16:43, Jon Turney wrote:
>> On 19/01/2022 13:15, Jon Turney wrote:
>>> Unless make is invoked with V=1, have xmlto pass '-q' to dblatex when
>>> building PDFs, to avoid "default template used in programlisting or
>>> screen" warnings from dblatex's verbatim.xsl stylesheet.
>>> ---
>>> winsup/doc/Makefile.am | 7 +++++--
>>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/winsup/doc/Makefile.am b/winsup/doc/Makefile.am
>>> index 44b64babc..57b74341a 100644
>>> --- a/winsup/doc/Makefile.am
>>> +++ b/winsup/doc/Makefile.am
>>> @@ -17,6 +17,9 @@ doc_DATA = \
>>> htmldir = $(datarootdir)/doc
>>> XMLTO=@XMLTO@ --skip-validation --with-dblatex
>>> +XMLTO_DBLATEX_QUIET_=-p '-q'
>>> +XMLTO_DBLATEX_QUIET=$(XMLTO_DBLATEX_QUIET_$(V))
>>
>>
>> This doesn't seem to be working as expected when building on Fedora Rawhide
>> [1], but it looks like xmlto isn't using dblatex despite ' --with-dblatex'?
>
> Did you install dblatex?
Yes, I meant to write "... and dblatex being installed." :)
https://github.com/cygwin/cygwin/runs/4876704875?check_suite_focus=true#step:11:10
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] Cygwin: silence dblatex when building PDFs
2022-01-20 20:02 ` Jon Turney
@ 2022-01-26 15:19 ` Jon Turney
0 siblings, 0 replies; 12+ messages in thread
From: Jon Turney @ 2022-01-26 15:19 UTC (permalink / raw)
To: Cygwin Patches
On 20/01/2022 20:02, Jon Turney wrote:
> On 20/01/2022 16:46, Corinna Vinschen wrote:
>> On Jan 20 16:43, Jon Turney wrote:
>>> On 19/01/2022 13:15, Jon Turney wrote:
>>>> Unless make is invoked with V=1, have xmlto pass '-q' to dblatex when
>>>> building PDFs, to avoid "default template used in programlisting or
>>>> screen" warnings from dblatex's verbatim.xsl stylesheet.
>>>> ---
>>>> winsup/doc/Makefile.am | 7 +++++--
>>>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/winsup/doc/Makefile.am b/winsup/doc/Makefile.am
>>>> index 44b64babc..57b74341a 100644
>>>> --- a/winsup/doc/Makefile.am
>>>> +++ b/winsup/doc/Makefile.am
>>>> @@ -17,6 +17,9 @@ doc_DATA = \
>>>> htmldir = $(datarootdir)/doc
>>>> XMLTO=@XMLTO@ --skip-validation --with-dblatex
>>>> +XMLTO_DBLATEX_QUIET_=-p '-q'
>>>> +XMLTO_DBLATEX_QUIET=$(XMLTO_DBLATEX_QUIET_$(V))
>>>
>>>
>>> This doesn't seem to be working as expected when building on Fedora
>>> Rawhide
Actually it's running on F35
>>> [1], but it looks like xmlto isn't using dblatex despite '
>>> --with-dblatex'?
>>
>> Did you install dblatex?
>
> Yes, I meant to write "... and dblatex being installed." :)
>
> https://github.com/cygwin/cygwin/runs/4876704875?check_suite_focus=true#step:11:10
This seems to be the output of 'mktexfmt pdflatex.fmt' which is run once
to generate some stuff (the 'TeX format') which is cached in
~/.texlive2021 (and so is appearing in every run in the ephermeral VM
used by github actions)
So this could be suppressed by running something like that in the setup
script.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/4] Cygwin: silence xsltproc when writing chunked html
2022-01-19 13:15 [PATCH 0/4] Silence more build rules Jon Turney
2022-01-19 13:15 ` [PATCH 1/4] Cygwin: silence most custom " Jon Turney
2022-01-19 13:15 ` [PATCH 2/4] Cygwin: silence dblatex when building PDFs Jon Turney
@ 2022-01-19 13:15 ` Jon Turney
2022-01-19 13:15 ` [PATCH 4/4] Cygwin: silence xsltproc when writing manpages Jon Turney
2022-01-19 14:39 ` [PATCH 0/4] Silence more build rules Corinna Vinschen
4 siblings, 0 replies; 12+ messages in thread
From: Jon Turney @ 2022-01-19 13:15 UTC (permalink / raw)
To: cygwin-patches; +Cc: Jon Turney
Unless make is invoked with V=1, have xmlto pass the parameter
'chunk.quietly=1' to xsltproc to suppress repeated "Writing foo.html for
sect1(foo)" output from the chunker.xsl stylesheet.
---
winsup/doc/Makefile.am | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/winsup/doc/Makefile.am b/winsup/doc/Makefile.am
index 57b74341a..fb3ab711c 100644
--- a/winsup/doc/Makefile.am
+++ b/winsup/doc/Makefile.am
@@ -19,6 +19,8 @@ htmldir = $(datarootdir)/doc
XMLTO=@XMLTO@ --skip-validation --with-dblatex
XMLTO_DBLATEX_QUIET_=-p '-q'
XMLTO_DBLATEX_QUIET=$(XMLTO_DBLATEX_QUIET_$(V))
+XMLTO_HTML_CHUNK_QUIET_=--stringparam chunk.quietly=1
+XMLTO_HTML_CHUNK_QUIET=$(XMLTO_HTML_CHUNK_QUIET_$(V))
DOCBOOK2XTEXI=@DOCBOOK2XTEXI@ --xinclude --info --utf8trans-map=charmap
@@ -117,7 +119,7 @@ cygwin-ug-net/cygwin-ug-net-nochunks.html.gz: $(cygwin-ug-net_SOURCES) html.xsl
$(AM_V_at)gzip cygwin-ug-net/cygwin-ug-net-nochunks.html
cygwin-ug-net/cygwin-ug-net.html: $(cygwin-ug-net_SOURCES) html.xsl
- $(AM_V_GEN)$(XMLTO) html -o cygwin-ug-net/ -m $(srcdir)/html.xsl $<
+ $(AM_V_GEN)$(XMLTO) html -o cygwin-ug-net/ -m $(srcdir)/html.xsl $(XMLTO_HTML_CHUNK_QUIET) $<
cygwin-ug-net/cygwin-ug-net.pdf: $(cygwin-ug-net_SOURCES) fo.xsl
$(AM_V_GEN)$(XMLTO) pdf -o cygwin-ug-net/ -m $(srcdir)/fo.xsl $(XMLTO_DBLATEX_QUIET) $<
@@ -130,7 +132,7 @@ cygwin-ug-net.info: $(cygwin-ug-net_SOURCES) charmap
$(AM_V_GEN)$(DOCBOOK2XTEXI) $(srcdir)/cygwin-ug-net.xml --string-param output-file=cygwin-ug-net
cygwin-api/cygwin-api.html: $(cygwin-api_SOURCES) html.xsl
- $(AM_V_GEN)$(XMLTO) html -o cygwin-api/ -m $(srcdir)/html.xsl $<
+ $(AM_V_GEN)$(XMLTO) html -o cygwin-api/ -m $(srcdir)/html.xsl $(XMLTO_HTML_CHUNK_QUIET) $<
cygwin-api/cygwin-api.pdf: $(cygwin-api_SOURCES) fo.xsl
$(AM_V_GEN)$(XMLTO) pdf -o cygwin-api/ -m $(srcdir)/fo.xsl $(XMLTO_DBLATEX_QUIET) $<
@@ -153,7 +155,7 @@ intro2man.stamp: intro.xml man.xsl
@touch $@
faq/faq.html: $(faq_SOURCES) html.xsl
- $(AM_V_GEN)$(XMLTO) html -o faq -m $(srcdir)/html.xsl $(srcdir)/faq.xml
+ $(AM_V_GEN)$(XMLTO) html -o faq -m $(srcdir)/html.xsl $(XMLTO_HTML_CHUNK_QUIET) $(srcdir)/faq.xml
@sed -i 's;<a name="id[mp][0-9]*"></a>;;g' faq/faq.html
# faq body is not installed, but is intended to be deployed to website, where it
--
2.34.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/4] Cygwin: silence xsltproc when writing manpages
2022-01-19 13:15 [PATCH 0/4] Silence more build rules Jon Turney
` (2 preceding siblings ...)
2022-01-19 13:15 ` [PATCH 3/4] Cygwin: silence xsltproc when writing chunked html Jon Turney
@ 2022-01-19 13:15 ` Jon Turney
2022-01-19 14:39 ` [PATCH 0/4] Silence more build rules Corinna Vinschen
4 siblings, 0 replies; 12+ messages in thread
From: Jon Turney @ 2022-01-19 13:15 UTC (permalink / raw)
To: cygwin-patches; +Cc: Jon Turney
Unless make is invoked with V=1, have xmlto pass the parameter
'man.output.quietly=1' to xsltproc to suppress "Note: Writing foo.N"
output from the manpages stylesheet.
---
winsup/doc/Makefile.am | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/winsup/doc/Makefile.am b/winsup/doc/Makefile.am
index fb3ab711c..650e0c924 100644
--- a/winsup/doc/Makefile.am
+++ b/winsup/doc/Makefile.am
@@ -21,6 +21,8 @@ XMLTO_DBLATEX_QUIET_=-p '-q'
XMLTO_DBLATEX_QUIET=$(XMLTO_DBLATEX_QUIET_$(V))
XMLTO_HTML_CHUNK_QUIET_=--stringparam chunk.quietly=1
XMLTO_HTML_CHUNK_QUIET=$(XMLTO_HTML_CHUNK_QUIET_$(V))
+XMLTO_MAN_QUIET_=--stringparam man.output.quietly=1
+XMLTO_MAN_QUIET=$(XMLTO_MAN_QUIET_$(V))
DOCBOOK2XTEXI=@DOCBOOK2XTEXI@ --xinclude --info --utf8trans-map=charmap
@@ -125,7 +127,7 @@ cygwin-ug-net/cygwin-ug-net.pdf: $(cygwin-ug-net_SOURCES) fo.xsl
$(AM_V_GEN)$(XMLTO) pdf -o cygwin-ug-net/ -m $(srcdir)/fo.xsl $(XMLTO_DBLATEX_QUIET) $<
utils2man.stamp: $(cygwin-ug-net_SOURCES) man.xsl
- $(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $<
+ $(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $(XMLTO_MAN_QUIET) $<
@touch $@
cygwin-ug-net.info: $(cygwin-ug-net_SOURCES) charmap
@@ -138,7 +140,7 @@ cygwin-api/cygwin-api.pdf: $(cygwin-api_SOURCES) fo.xsl
$(AM_V_GEN)$(XMLTO) pdf -o cygwin-api/ -m $(srcdir)/fo.xsl $(XMLTO_DBLATEX_QUIET) $<
api2man.stamp: $(cygwin-api_SOURCES) man.xsl
- $(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $<
+ $(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $(XMLTO_MAN_QUIET) $<
@touch $@
cygwin-api.info: $(cygwin-api_SOURCES) charmap
@@ -150,7 +152,7 @@ charmap:
$(AM_V_at)echo "ae (R)" >>charmap
intro2man.stamp: intro.xml man.xsl
- $(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $<
+ $(AM_V_GEN)$(XMLTO) man -m $(srcdir)/man.xsl $(XMLTO_MAN_QUIET) $<
@echo ".so intro.1" >cygwin.1
@touch $@
--
2.34.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/4] Silence more build rules
2022-01-19 13:15 [PATCH 0/4] Silence more build rules Jon Turney
` (3 preceding siblings ...)
2022-01-19 13:15 ` [PATCH 4/4] Cygwin: silence xsltproc when writing manpages Jon Turney
@ 2022-01-19 14:39 ` Corinna Vinschen
2022-01-19 19:12 ` Brian Inglis
4 siblings, 1 reply; 12+ messages in thread
From: Corinna Vinschen @ 2022-01-19 14:39 UTC (permalink / raw)
To: cygwin-patches
On Jan 19 13:15, Jon Turney wrote:
> Jon Turney (4):
> Cygwin: silence most custom build rules
> Cygwin: silence dblatex when building PDFs
> Cygwin: silence xsltproc when writing chunked html
> Cygwin: silence xsltproc when writing manpages
>
> winsup/cygwin/Makefile.am | 38 ++++++++++++++++-----------------
> winsup/doc/Makefile.am | 45 ++++++++++++++++++++++-----------------
> 2 files changed, 45 insertions(+), 38 deletions(-)
Yesss!
Thanks,
Corinna
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/4] Silence more build rules
2022-01-19 14:39 ` [PATCH 0/4] Silence more build rules Corinna Vinschen
@ 2022-01-19 19:12 ` Brian Inglis
2022-01-20 14:58 ` Jon Turney
0 siblings, 1 reply; 12+ messages in thread
From: Brian Inglis @ 2022-01-19 19:12 UTC (permalink / raw)
To: cygwin-patches
On 2022-01-19 07:39, Corinna Vinschen wrote:
> On Jan 19 13:15, Jon Turney wrote:
>> Jon Turney (4):
>> Cygwin: silence most custom build rules
>> Cygwin: silence dblatex when building PDFs
>> Cygwin: silence xsltproc when writing chunked html
>> Cygwin: silence xsltproc when writing manpages
>>
>> winsup/cygwin/Makefile.am | 38 ++++++++++++++++-----------------
>> winsup/doc/Makefile.am | 45 ++++++++++++++++++++++-----------------
>> 2 files changed, 45 insertions(+), 38 deletions(-)
Hopefully these are now changed to be the helpful type of build rules
that output only "CC foo" when commands work and show the complete
command line and diagnostics when commands err?
Or do we have to now have to rerun with V=1 to see error diagnostics?
Some tests can be particularly obscure when hunting down the command
responsible and output resulting from failures: others DTRT!
--
Take care. Thanks, Brian Inglis, Calgary, Alberta, Canada
This email may be disturbing to some readers as it contains
too much technical detail. Reader discretion is advised.
[Data in binary units and prefixes, physical quantities in SI.]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/4] Silence more build rules
2022-01-19 19:12 ` Brian Inglis
@ 2022-01-20 14:58 ` Jon Turney
0 siblings, 0 replies; 12+ messages in thread
From: Jon Turney @ 2022-01-20 14:58 UTC (permalink / raw)
To: Cygwin Patches
On 19/01/2022 19:12, Brian Inglis wrote:
> On 2022-01-19 07:39, Corinna Vinschen wrote:
>> On Jan 19 13:15, Jon Turney wrote:
>>> Jon Turney (4):
>>> Cygwin: silence most custom build rules
>>> Cygwin: silence dblatex when building PDFs
>>> Cygwin: silence xsltproc when writing chunked html
>>> Cygwin: silence xsltproc when writing manpages
>>>
>>> winsup/cygwin/Makefile.am | 38 ++++++++++++++++-----------------
>>> winsup/doc/Makefile.am | 45 ++++++++++++++++++++++-----------------
>>> 2 files changed, 45 insertions(+), 38 deletions(-)
>
> Hopefully these are now changed to be the helpful type of build rules
> that output only "CC foo" when commands work and show the complete
> command line and diagnostics when commands err?
>
> Or do we have to now have to rerun with V=1 to see error diagnostics?
This just uses automake's standard way of silencing make [1], so the
latter is correct. You will need to run 'make V=1' to see the command.
Doing the former with full generality using make seems very challenging.
Please submit patches to automake for that! :)
[1]
https://www.gnu.org/software/automake/manual/html_node/Automake-Silent-Rules.html
^ permalink raw reply [flat|nested] 12+ messages in thread