Skip to content

Commit

Permalink
Correction des erreurs trouvées par xmllint
Browse files Browse the repository at this point in the history
et activation de la vérification automatique par xmllint dans le
Makefile.
  • Loading branch information
gleu committed Oct 21, 2020
1 parent 457b96c commit c9ec916
Show file tree
Hide file tree
Showing 76 changed files with 4,061 additions and 4,063 deletions.
20 changes: 10 additions & 10 deletions postgresql/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pgfr: man html-website html INSTALL INSTALL.html postgres-A4.pdf
man distprep-man: man-stamp

man-stamp: stylesheet-man.xsl postgres.xml $(ALLXML)
#$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $(wordlist 1,2,$^)
touch $@

Expand All @@ -90,7 +90,7 @@ INSTALL: % : %.html
rm $@.tmp

INSTALL.html: %.html : stylesheet-text.xsl %.xml
#$(XMLLINT) --noout --valid $*.xml
$(XMLLINT) --noout --valid $*.xml
$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $^ >$@

INSTALL.xml: standalone-profile.xsl standalone-install.xml postgres.xml $(ALLXML)
Expand All @@ -108,14 +108,14 @@ endif
html: html-stamp

html-stamp: stylesheet.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
#$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $(wordlist 1,2,$^)
cp $(ALL_IMAGES) html/
cp $(srcdir)/css/*.css html/
touch $@

html-website: stylesheet.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
#$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --param website.stylesheet 1 $(wordlist 1,2,$^)
mv html $@
cp $(ALL_IMAGES) $@/
Expand All @@ -124,15 +124,15 @@ html-website: stylesheet.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
htmlhelp: htmlhelp-stamp

htmlhelp-stamp: stylesheet-hh.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
#$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(wordlist 1,2,$^)
cp $(ALL_IMAGES) htmlhelp/
cp $(srcdir)/css/stylesheet.css htmlhelp/
touch $@

# single-page HTML
postgres.html: stylesheet-html-nochunk.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
#$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) -o $@ $(wordlist 1,2,$^)

# single-page text
Expand All @@ -150,11 +150,11 @@ postgres.pdf:
XSLTPROC_FO_FLAGS += --stringparam img.src.path '$(srcdir)/'

%-A4.fo: stylesheet-fo.xsl %.xml $(ALLXML)
#$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_FO_FLAGS) --stringparam paper.type A4 -o $@ $(wordlist 1,2,$^)

%-US.fo: stylesheet-fo.xsl %.xml $(ALLXML)
#$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_FO_FLAGS) --stringparam paper.type USletter -o $@ $(wordlist 1,2,$^)

%.pdf: %.fo $(ALL_IMAGES)
Expand All @@ -167,7 +167,7 @@ XSLTPROC_FO_FLAGS += --stringparam img.src.path '$(srcdir)/'

epub: postgres.epub
postgres.epub: postgres.xml $(ALLXML) $(ALL_IMAGES)
#$(XMLLINT) --noout --valid $<
$(XMLLINT) --noout --valid $<
$(DBTOEPUB) -o $@ $<


Expand Down Expand Up @@ -195,7 +195,7 @@ MAKEINFO = makeinfo
##

# Quick syntax check without style processing
check: postgres.xml $(ALLXML) check-tabs
check: postgres.xml $(ALLXML)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $<


Expand Down

0 comments on commit c9ec916

Please sign in to comment.