Date: Tue, 13 Nov 2001 20:40:46 +0100 (CET) From: Cyrille Lefevre <clefevre@citeweb.net> To: Alexey Zelkin <phantom@FreeBSD.org> Cc: doc@FreeBSD.org Subject: Re: [PATCH] Re: Hidden feature == hidden breakage or tidy(1) usage (was: Re: cvs commit: www/en/news/1998 index.sgml www/en/projects mozilla.sgml ...) Message-ID: <200111131940.fADJekK49603@gits.dyndns.org> In-Reply-To: <20011113162526.A71174@ark.cris.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Alexey Zelkin wrote:
[snip]
> > PR: docs/31132
> > Submitted by: Cyrille Lefevre <clefevre@citeweb.net>
> > ----------------------------
> >
> > which "silently" added tidy(1) post-processing to whole web tree
> > generated html files.
you are right, I forgot to talk about that in the PR description.
next time, I'll take care of this.
putting TIDYFLAGS in the top level Makefile.inc (in languages which
need it) should suffice since it is included by all other Makefiles.
also, I change all XXXOPTS to XXXFLAGS to be more homogeneous w/ -doc
and all variables in www/share/mk/web.site.mk now use ?= instead of =.
so, users only have to deal w/ XXXFLAGS as usual except in targets
where XXXOPTS should be used instead.
since I have to free some space (/dev/da1s1a 1.9G 1.8G -1.9M 100% /disk2),
I don't have tested the following patch. if someone w/ a power machine
could validate it...
PS : I've reviewed it twince w/ my open eyes and it looks fine.
Index: www/share/mk/web.site.mk
===================================================================
RCS file: /home/ncvs/www/share/mk/web.site.mk,v
retrieving revision 1.39
diff -u -r1.39 web.site.mk
--- www/share/mk/web.site.mk 2001/10/30 16:51:34 1.39
+++ www/share/mk/web.site.mk 2001/11/13 19:33:22
@@ -42,9 +42,9 @@
TOUCH?= /usr/bin/touch
XSLTPROC?= ${PREFIX}/bin/xsltproc
-XSLTPROCFLAGS?= -nonet
+XSLTPROCOPTS?= -nonet ${XSLTPROCFLAGS}
TIDY?= ${PREFIX}/bin/tidy
-TIDYFLAGS?= -i -m -f /dev/null
+TIDYOPTS?= -i -m -f /dev/null ${TITYFLAGS}
#
# Install dirs derived from the above.
@@ -79,37 +79,36 @@
.SUFFIXES: .sgml .html
.if defined(REVCHECK)
-PREHTML= ${WEB_PREFIX}/ja/prehtml
-PREHTMLFLAGS= ${PREHTMLOPTS}
+PREHTML?= ${WEB_PREFIX}/ja/prehtml
CANONPREFIX0!= cd ${WEB_PREFIX}; ${ECHO_CMD} $${PWD};
CANONPREFIX= ${PWD:S/^${CANONPREFIX0}//:S/^\///}
LOCALTOP!= ${ECHO_CMD} ${CANONPREFIX} | \
${PERL} -pe 's@[^/]+@..@g; $$_.="/." if($$_ eq".."); s@^\.\./@@;'
DIR_IN_LOCAL!= ${ECHO_CMD} ${CANONPREFIX} | ${PERL} -pe 's@^[^/]+/?@@;'
-PREHTMLFLAGS+= -revcheck "${LOCALTOP}" "${DIR_IN_LOCAL}"
+PREHTMLOPTS?= -revcheck "${LOCALTOP}" "${DIR_IN_LOCAL}" ${PREHTMLFLAGS}
.else
-DATESUBST= 's/<!ENTITY date[ \t]*"$$Free[B]SD. .* \(.* .*\) .* .* $$">/<!ENTITY date "Last modified: \1">/'
-PREHTML= ${SED} -e ${DATESUBST}
+DATESUBST?= 's/<!ENTITY date[ \t]*"$$Free[B]SD. .* \(.* .*\) .* .* $$">/<!ENTITY date "Last modified: \1">/'
+PREHTML?= ${SED} -e ${DATESUBST}
.endif
.if !defined(OPENJADE)
-SGMLNORM= ${PREFIX}/bin/sgmlnorm
+SGMLNORM?= ${PREFIX}/bin/sgmlnorm
.else
-SGMLNORM= ${PREFIX}/bin/osgmlnorm
+SGMLNORM?= ${PREFIX}/bin/osgmlnorm
.endif
LOCALBASE?= /usr/local
PREFIX?= ${LOCALBASE}
CATALOG?= ${PREFIX}/share/sgml/html/catalog
-SGMLNORMFLAGS= -d ${SGMLNORMOPTS} -c ${CATALOG} -D ${.CURDIR}
+SGMLNORMOPTS?= -d ${SGMLNORMFLAGS} -c ${CATALOG} -D ${.CURDIR}
GENDOCS+= ${DOCS:M*.sgml:S/.sgml$/.html/g}
ORPHANS:= ${ORPHANS:N*.sgml}
.sgml.html:
- ${PREHTML} ${PREHTMLFLAGS} ${.IMPSRC} | \
+ ${PREHTML} ${PREHTMLOPTS} ${.IMPSRC} | \
${SETENV} SGML_CATALOG_FILES= \
- ${SGMLNORM} ${SGMLNORMFLAGS} > ${.TARGET} || \
+ ${SGMLNORM} ${SGMLNORMOPTS} > ${.TARGET} || \
(${RM} -f ${.TARGET} && false)
.if !defined(NO_TIDY)
- -${TIDY} ${TIDYFLAGS} ${.TARGET}
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
.endif
###
@@ -118,15 +117,15 @@
# Generate HTML from docbook
SGMLFMT?= ${PREFIX}/bin/sgmlfmt
-SGMLFMTFLAGS?= -d docbook -f html ${SGMLOPTS}
+SGMLFMTOPTS?= -d docbook -f html ${SGMLFMTFLAGS} ${SGMLFLAGS}
.SUFFIXES: .docb
GENDOCS+= ${DOCS:M*.docb:S/.docb$/.html/g}
ORPHANS:= ${ORPHANS:N*.docb}
.docb.html:
- ${SGMLFMT} ${SGMLFMTFLAGS} ${.IMPSRC}
+ ${SGMLFMT} ${SGMLFMTOPTS} ${.IMPSRC}
.if !defined(NO_TIDY)
- -${TIDY} ${TIDYFLAGS} ${.TARGET}
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
.endif
Index: www/de/Makefile
===================================================================
RCS file: /home/ncvs/www/de/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- www/de/Makefile 2001/02/25 11:54:42 1.1
+++ www/de/Makefile 2001/11/13 19:13:59
@@ -34,7 +34,7 @@
DOCSUBDIR= FAQ handbook
.endif
-SGMLOPTS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
+SGMLFLAGS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
WEBDIR= data/de
Index: www/en/Makefile
===================================================================
RCS file: /home/ncvs/www/en/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- www/en/Makefile 2001/10/29 10:14:30 1.74
+++ www/en/Makefile 2001/11/13 19:09:30
@@ -83,9 +83,9 @@
CLEANFILES+= index.html
index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xsl
- ${XSLTPROC} ${XSLTPROCFLAGS} -o index.html \
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml
- -${TIDY} ${TIDYFLAGS} index.html
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
# Handle the FAQ/ and handbook/ directories specially.
CLEANFILES+= FAQ
@@ -103,13 +103,13 @@
${LN} -fs doc/en_US.ISO8859-1/books/handbook ${DOCINSTALLDIR}/handbook
LINBOT?= ${PREFIX}/bin/linbot
-LINBOTFLAGS?= -ab
+LINBOTOPTS?= -ab ${LINBOTFLAGS}
LINBOTDIR?= /linbot
LINBOTINSTALLDIR?= ${DESTDIR}${LINBOTDIR}
LINBOTURL?= http://www.FreeBSD.org/
linbot:
@[ -d ${LINBOTINSTALLDIR} ] || ${MKDIR} ${LINBOTINSTALLDIR}
- ${LINBOT} ${LINBOTFLAGS} -o ${LINBOTINSTALLDIR} ${LINBOTURL}
+ ${LINBOT} ${LINBOTOPTS} -o ${LINBOTINSTALLDIR} ${LINBOTURL}
.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: www/en/gallery/Makefile
===================================================================
RCS file: /home/ncvs/www/en/gallery/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- www/en/gallery/Makefile 2001/10/29 10:14:31 1.14
+++ www/en/gallery/Makefile 2001/11/13 19:11:20
@@ -9,7 +9,7 @@
XSLTPROCFLAGS= --catalogs
XSLT= ${SETENV} SGML_CATALOG_FILES=${PREFIX}/share/xml/dtd/xhtml/xhtml.soc \
- ${XSLTPROC} ${XSLTPROCFLAGS}
+ ${XSLTPROC} ${XSLTPROCOPTS}
INDEXLINK= gallery.html
@@ -19,21 +19,21 @@
gallery.html: gallery.xml gallery.xsl ../includes.xsl
${XSLT} ${.CURDIR}/gallery.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
- -${TIDY} ${TIDYFLAGS} ${.TARGET}
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
cgallery.html: gallery.xml gallery-entry.xsl
${XSLT} --param type \'commercial\' \
${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
- -${TIDY} ${TIDYFLAGS} ${.TARGET}
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
npgallery.html: gallery.xml gallery-entry.xsl
${XSLT} --param type \'nonprofit\' \
${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
- -${TIDY} ${TIDYFLAGS} ${.TARGET}
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
pgallery.html: gallery.xml gallery-entry.xsl
${XSLT} --param type \'personal\' \
${.CURDIR}/gallery-entry.xsl ${.CURDIR}/gallery.xml > ${.TARGET}
- -${TIDY} ${TIDYFLAGS} ${.TARGET}
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: www/en/news/Makefile
===================================================================
RCS file: /home/ncvs/www/en/news/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- www/en/news/Makefile 2001/10/29 10:14:31 1.30
+++ www/en/news/Makefile 2001/11/13 19:11:43
@@ -35,17 +35,17 @@
CLEANFILES+= newsflash.html news.rdf press.html
newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
- ${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
- -${TIDY} ${TIDYFLAGS} ${.TARGET}
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
- ${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
press.html: press.xsl press.xml includes.xsl ../includes.xsl
- ${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
${.CURDIR}/press.xsl ${.CURDIR}/press.xml
- -${TIDY} ${TIDYFLAGS} ${.TARGET}
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: www/en/news/status/Makefile
===================================================================
RCS file: /home/ncvs/www/en/news/status/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- www/en/news/status/Makefile 2001/10/29 10:14:32 1.9
+++ www/en/news/status/Makefile 2001/11/13 19:11:48
@@ -21,9 +21,9 @@
CLEANFILES+= ${DATA:M*.html}
.xml.html: report.xsl includes.xsl
- ${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
+ ${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
${.CURDIR}/report.xsl ${.IMPSRC}
- -${TIDY} ${TIDYFLAGS} ${.TARGET}
+ -${TIDY} ${TIDYOPTS} ${.TARGET}
INDEXLINK= status.html
Index: www/es/Makefile
===================================================================
RCS file: /home/ncvs/www/es/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- www/es/Makefile 2001/06/30 20:31:48 1.11
+++ www/es/Makefile 2001/11/13 19:14:19
@@ -64,10 +64,9 @@
# Extern
#SUBDIR+= tutorials
-#DOCSUBDIR= FAQ handbook
-DOCSUBDIR= FAQ
+DOCSUBDIR= FAQ # handbook
.endif
-SGMLOPTS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
+SGMLFLAGS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
WEBDIR= data/es
Index: www/es/ports/Makefile
===================================================================
RCS file: /home/ncvs/www/es/ports/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- www/es/ports/Makefile 2001/01/02 01:49:05 1.9
+++ www/es/ports/Makefile 2001/11/13 19:14:44
@@ -47,6 +47,6 @@
install: all
all install clean:
- (cd ${.CURDIR} &&${MAKE} ${MAKEFLAGS} -f ${.CURDIR}/Makefile.inc0 ${.TARGET})
+ (cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} -f ${.CURDIR}/Makefile.inc0 ${.TARGET})
.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: www/ja/Makefile
===================================================================
RCS file: /home/ncvs/www/ja/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- www/ja/Makefile 2001/10/30 15:09:52 1.52
+++ www/ja/Makefile 2001/11/13 19:35:43
@@ -72,7 +72,8 @@
#SUBDIR+= gifs
#SUBDIR+= cgi
-SGMLOPTS= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr -e EUC-JP
+SGMLFLAGS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
+SGMLFLAGS+= -e EUC-JP
WEBDIR= data/ja
@@ -81,9 +82,9 @@
CLEANFILES+= index.html
index.html: index.xsl news/news.xml news/press.xml includes.xsl news/includes.xsl
- ${XSLTPROC} ${XSLTPROCFLAGS} -o index.html \
+ ${XSLTPROC} ${XSLTPROCOPTS} -o index.html \
${.CURDIR}/index.xsl ${.CURDIR}/news/news.xml
-# -${TIDY} ${TIDYFLAGS} index.html
+# -${TIDY} ${TIDYOPTS} index.html
### Revision checking
REVCHECK= yes
Index: www/ja/Makefile.inc
===================================================================
RCS file: /home/ncvs/www/ja/Makefile.inc,v
retrieving revision 1.9
diff -u -r1.9 Makefile.inc
--- www/ja/Makefile.inc 2000/11/07 11:37:51 1.9
+++ www/ja/Makefile.inc 2001/11/13 19:20:23
@@ -4,3 +4,5 @@
WEBBASE?= /data/ja
WEB_PREFIX?= ${.CURDIR}/../..
+
+TIDYFLAGS?= -raw
Index: www/ja/ports/Makefile
===================================================================
RCS file: /home/ncvs/www/ja/ports/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- www/ja/ports/Makefile 2001/09/06 13:35:08 1.24
+++ www/ja/ports/Makefile 2001/11/13 19:12:10
@@ -76,7 +76,7 @@
install: all
all install clean:
- (cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} -f Makefile.inc0 ${.TARGET})
+ (cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} -f Makefile.inc0 ${.TARGET})
.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: www/ru/Makefile
===================================================================
RCS file: /home/ncvs/www/ru/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- www/ru/Makefile 2001/08/08 02:08:09 1.17
+++ www/ru/Makefile 2001/11/13 19:15:04
@@ -65,12 +65,11 @@
SUBDIR+= tutorials
SUBDIR+= handbook
-#DOCSUBDIR= FAQ handbook
-DOCSUBDIR= FAQ
+DOCSUBDIR= FAQ # handbook
.endif
-SGMLOPTS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
-SGMLOPTS+= -e KOI8-R
+SGMLFLAGS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
+SGMLFLAGS+= -e KOI8-R
FORMATS= "html ps koi8-r"
WEBDIR?= data/ru
Index: www/ru/Makefile.inc
===================================================================
RCS file: /home/ncvs/www/ru/Makefile.inc,v
retrieving revision 1.3
diff -u -r1.3 Makefile.inc
--- www/ru/Makefile.inc 2000/11/10 17:27:22 1.3
+++ www/ru/Makefile.inc 2001/11/13 19:20:42
@@ -4,3 +4,5 @@
WEBBASE?= /data/ru
WEB_PREFIX?= ${.CURDIR}/../..
+
+TIDYFLAGS?= -latin1
Index: www/ru/ports/Makefile
===================================================================
RCS file: /home/ncvs/www/ru/ports/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/ru/ports/Makefile 2000/11/10 17:27:39 1.3
+++ www/ru/ports/Makefile 2001/11/13 19:12:29
@@ -78,6 +78,6 @@
install: all
all install clean:
- (cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} -f Makefile.inc0 ${.TARGET})
+ (cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} -f Makefile.inc0 ${.TARGET})
.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: www/zh/Makefile
===================================================================
RCS file: /home/ncvs/www/zh/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/zh/Makefile 2000/11/07 05:20:40 1.5
+++ www/zh/Makefile 2001/11/13 19:15:42
@@ -11,9 +11,9 @@
DOCSUBDIR= FAQ
.endif
-SGMLOPTS= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
-SGMLOPTS+=-e big5
-FORMATS= "html ps"
+SGMLFLAGS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
+SGMLFLAGS+= -e big5
+FORMATS= "html ps"
WEBBASE= /data/zh
Cyrille.
--
Cyrille Lefevre mailto:clefevre@citeweb.net
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200111131940.fADJekK49603>