[PATCH] build PDFs with xmlto (was: Instability with signals and threads)

[PATCH] build PDFs with xmlto (was: Instability with signals and threads)

[Yaakov Selkowitz]

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

On 2014-11-21 14:36, Corinna Vinschen wrote:
> On Nov 21 14:06, Yaakov Selkowitz wrote:
>> On 2014-11-21 10:06, Corinna Vinschen wrote:
>>> On Nov 21 16:50, Marco Atzeri wrote:
>>>> On 11/21/2014 3:43 PM, Corinna Vinschen wrote:
>>>>>> On 32-bit. The rebuild of cygwin1.dll requires large number of packages to
>>>>>> create the documentation (including tex and java) and I haven't bloated
>>>>>
>>>>> Java?!?
>>>>
>>>> FOP is a Java application....grrr...
>>>
>>> Oh, right.
>>
>> https://cygwin.com/ml/cygwin-developers/2013-07/msg00008.html
>>
>> Which resulted in:
>>
>> https://sourceware.org/viewvc/src/winsup/doc/Makefile.in?r1=1.33&r2=1.34
>>
>> Has this bug been fixed yet in TeX Live?  I had no problems building the
>> PDFs after reverting this commit.  I'll have to try on Fedora 20 and 21,
>> unless someone else can get to it first.
>
> Again, if you have another way to create pdf files from xml input, which
> works on Cygwin and Linux, please feel free to provide one.  I had no
> problems creating pdfs on Linux using fop, so I had no incentive to
> switch.  Just provide a patch to cygwin-patches.  If it works it's as
> good as applied.

Attached.  Tested and works on Cygwin and Fedora 19 through 21, but 
still fails on RHEL/CentOS 7.

--
Yaakov


[-- Attachment #2: winsup-doc-dblatex.patch --]
[-- Type: text/plain, Size: 1618 bytes --]

2014-11-28  Yaakov Selkowitz  <yselkowitz@...>

	* Makefile.in (XSLTPROC): Remove.
	(cygwin-ug-net/cygwin-ug-net.pdf): Build with xmlto pdf.
	(cygwin-api/cygwin-api.pdf): Ditto.
	(faq/faq.html): Fix extraneous anchor removal.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/winsup/doc/Makefile.in,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile.in
--- Makefile.in	22 Oct 2014 20:04:42 -0000	1.38
+++ Makefile.in	28 Nov 2014 17:12:17 -0000
@@ -24,7 +24,6 @@ MKDIRP:=$(INSTALL) -m 755 -d
 CC:=@CC@
 CC_FOR_TARGET:=@CC@
 
-XSLTPROC:=xsltproc --xinclude
 XMLTO:=xmlto --skip-validation --with-dblatex
 
 include $(srcdir)/../Makefile.common
@@ -80,19 +79,17 @@ cygwin-ug-net/cygwin-ug-net.html : cygwi
 	-$(XMLTO) html -o cygwin-ug-net/ -m $(srcdir)/cygwin.xsl $<
 
 cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.xml fo.xsl
-	@$(MKDIRP) cygwin-ug-net
-	-$(XSLTPROC) $(srcdir)/fo.xsl $< | fop -q -fo - $@
+	-$(XMLTO) pdf -o cygwin-ug-net/ $<
 
 cygwin-api/cygwin-api.html : cygwin-api.xml cygwin.xsl
 	-$(XMLTO) html -o cygwin-api/ -m $(srcdir)/cygwin.xsl $<
 
 cygwin-api/cygwin-api.pdf : cygwin-api.xml fo.xsl
-	@$(MKDIRP) cygwin-api
-	-$(XSLTPROC) $(srcdir)/fo.xsl $< | fop -q -fo - $@
+	-$(XMLTO) pdf -o cygwin-api/ $<
 
 faq/faq.html : $(FAQ_SOURCES)
 	-$(XMLTO) html -o faq -m $(srcdir)/cygwin.xsl $(srcdir)/faq.xml
-	-sed -i 's;</a><a name="id[0-9]*"></a>;</a>;g' faq/faq.html
+	-sed -i 's;<a name="id[mp][0-9]*"></a>;;g' faq/faq.html
 
 TBFILES = cygwin-ug-net.dvi cygwin-ug-net.rtf cygwin-ug-net.ps \
 	  cygwin-ug-net.pdf cygwin-ug-net.xml \

Re: [PATCH] build PDFs with xmlto (was: Instability with signals and threads)

[Corinna Vinschen]

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

On Nov 28 12:51, Yaakov Selkowitz wrote:
> 2014-11-28  Yaakov Selkowitz  <yselkowitz@...>
> 
> 	* Makefile.in (XSLTPROC): Remove.
> 	(cygwin-ug-net/cygwin-ug-net.pdf): Build with xmlto pdf.
> 	(cygwin-api/cygwin-api.pdf): Ditto.
> 	(faq/faq.html): Fix extraneous anchor removal.

Looks good.  Please apply.


Thanks,
Corinna


-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]