Force tidy(1) to use '-raw' and newly added '-preserve' options

to process generated HTML. This not cause any side effects except
leaving some character entities in their numeric form instead
converting them into alphabetical notation (< instead of <),
but since all browsers understand such cases it is not a problem.

This commit should make all translations tidy clean, since
tidy should not arise entities conversion problem as it did
for long time before. Therefore all occurences of manual settings
of TIDYFLAGS and NO_TIDY declarations for translations are removed.

Also clean *OPTS/*FLAGS variables declaration like it was done in doc/ tree
some time ago. Currently all local additions to commands parameters that used
in make process should be passed thru *FLAGS variables. All variables
with OPTS suffix are reserved for internal use of web.site.mk now.
Cleanup part is based on work done by Cyrille Lefevre <clefevre-lists@noos.fr>

No objections from: -doc
Requested by: Russian and Japanese translation teams
This commit is contained in:
Alexey Zelkin 2001-12-12 11:57:44 +00:00
parent 12e900ee3a
commit 66e0a1cacf
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=11412
13 changed files with 61 additions and 65 deletions

View file

@ -1,6 +1,6 @@
# The FreeBSD Documentation Project
# The FreeBSD German Documentation Project
# $FreeBSD$
# $FreeBSD: www/de/Makefile,v 1.1 2001/02/25 11:54:42 alex Exp $
# $FreeBSDde: de-www/Makefile,v 1.6 2001/02/25 11:48:33 alex Exp $
.if exists(Makefile.conf)
@ -34,7 +34,7 @@ CLEANFILES+=atoz.sgml site.sgml
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

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/en/Makefile,v 1.74 2001/10/29 10:14:30 murray Exp $
# $FreeBSD: www/en/Makefile,v 1.75 2001/11/14 18:31:14 phantom Exp $
.if exists(Makefile.conf)
.include "Makefile.conf"
.endif
@ -83,9 +83,9 @@ DATA+= index.html
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
# Handle the FAQ/ and handbook/ directories specially.
FAQ:
@ -108,13 +108,13 @@ afterinstall:
${LN} -fs doc/en_US.ISO8859-1/books/handbook ${DOCINSTALLDIR}/handbook
LINBOT?= ${PREFIX}/bin/linbot
LINBOTFLAGS?= -ab
LINBOTOPTS?= -ab
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"

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/en/gallery/Makefile,v 1.13 2001/09/05 07:51:40 kuriyama Exp $
# $FreeBSD: www/en/gallery/Makefile,v 1.14 2001/10/29 10:14:31 murray Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@ -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 @@ CLEANFILES+= ${DATA}
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"

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/en/news/Makefile,v 1.29 2001/09/05 15:31:58 kuriyama Exp $
# $FreeBSD: www/en/news/Makefile,v 1.30 2001/10/29 10:14:31 murray Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@ -35,17 +35,17 @@ DATA= newsflash.html news.rdf press.html
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"

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/en/news/status/Makefile,v 1.9 2001/10/29 10:14:32 murray Exp $
# $FreeBSD: www/en/news/status/Makefile,v 1.10 2001/11/12 22:25:12 chris Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@ -22,9 +22,9 @@ DATA+= report-sample.xml
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

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/es/Makefile,v 1.10 2001/06/30 20:27:52 jesusr Exp $
# $FreeBSD: www/es/Makefile,v 1.11 2001/06/30 20:31:48 jesusr Exp $
.if exists(Makefile.conf)
.include "Makefile.conf"
@ -67,7 +67,7 @@ SUBDIR+= ports
#DOCSUBDIR= FAQ handbook
DOCSUBDIR= FAQ
.endif
SGMLOPTS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
SGMLFLAGS+= -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
WEBDIR= data/es

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/en/ports/Makefile,v 1.33 2001/06/14 03:09:56 dd Exp $
# $FreeBSD: www/es/ports/Makefile,v 1.10 2001/12/06 12:28:23 phantom Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@ -43,6 +43,6 @@ index.sgml: ${INDEX} packages.exists portindex ports.inc .NOTMAIN
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"

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/ja/Makefile,v 1.52 2001/10/30 15:09:52 hrs Exp $
# $FreeBSD: www/ja/Makefile,v 1.53 2001/11/17 17:21:09 hrs Exp $
# The FreeBSD Japanese Documentation Project
# Original revision: 1.75
@ -72,7 +72,7 @@ DOCSUBDIR= FAQ handbook
#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 -e EUC-JP
WEBDIR= data/ja
@ -81,9 +81,9 @@ DATA+= index.html
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

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/ja/gallery/Makefile,v 1.15 2001/09/17 03:07:39 kuriyama Exp $
# $FreeBSD: www/ja/gallery/Makefile,v 1.16 2001/11/18 22:33:58 hrs Exp $
# The FreeBSD Japanese Documentation Project
# Original revision: 1.14
@ -23,22 +23,22 @@ CLEANFILES+= ${DATA}
gallery.html: ${SRC} gallery.xsl ../includes.xsl
${XSLT} ${.CURDIR}/gallery.xsl ${.CURDIR}/${SRC} > ${.TARGET}
# -${TIDY} ${TIDYFLAGS} ${.TARGET}
-${TIDY} ${TIDYOPTS} ${.TARGET}
cgallery.html: ${SRC} gallery-entry.xsl
${XSLT} --param type \'commercial\' \
${.CURDIR}/gallery-entry.xsl ${.CURDIR}/${SRC} > ${.TARGET}
# -${TIDY} ${TIDYFLAGS} ${.TARGET}
-${TIDY} ${TIDYOPTS} ${.TARGET}
npgallery.html: ${SRC} gallery-entry.xsl
${XSLT} --param type \'nonprofit\' \
${.CURDIR}/gallery-entry.xsl ${.CURDIR}/${SRC} > ${.TARGET}
# -${TIDY} ${TIDYFLAGS} ${.TARGET}
-${TIDY} ${TIDYOPTS} ${.TARGET}
pgallery.html: ${SRC} gallery-entry.xsl
${XSLT} --param type \'personal\' \
${.CURDIR}/gallery-entry.xsl ${.CURDIR}/${SRC} > ${.TARGET}
# -${TIDY} ${TIDYFLAGS} ${.TARGET}
-${TIDY} ${TIDYOPTS} ${.TARGET}
### Revision checking
REVCHECK= yes

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/ja/news/Makefile,v 1.29 2001/09/05 15:32:56 kuriyama Exp $
# $FreeBSD: www/ja/news/Makefile,v 1.30 2001/11/19 15:35:42 hrs Exp $
# The FreeBSD Japanese Documentation Project
# Original revision: 1.30
@ -40,7 +40,7 @@ CLEANFILES+= newsflash.html press.html
newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
${XSLTPROC} ${XSLTPROCFLAGS} -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} \
@ -49,7 +49,7 @@ news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
press.html: press.xsl press.xml includes.xsl ../includes.xsl
${XSLTPROC} ${XSLTPROCFLAGS} -o ${.TARGET} \
${.CURDIR}/press.xsl ${.CURDIR}/press.xml
# -${TIDY} ${TIDYFLAGS} ${.TARGET}
-${TIDY} ${TIDYOPTS} ${.TARGET}
### Revision checking
REVCHECK= YES

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/ru/Makefile,v 1.16 2000/12/29 13:37:57 phantom Exp $
# $FreeBSD: www/ru/Makefile,v 1.17 2001/08/08 02:08:09 kuriyama Exp $
# The FreeBSD Russian Documentation Project
# $FreeBSDru: frdp/www/ru/Makefile,v 1.9 2000/12/29 13:17:32 phantom Exp $
# Original revision: 1.55
@ -69,8 +69,8 @@ SUBDIR+= handbook
DOCSUBDIR= FAQ
.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

View file

@ -1,5 +1,5 @@
# bsd.web.mk
# $FreeBSD: www/share/mk/web.site.mk,v 1.39 2001/10/30 16:51:34 hrs Exp $
# $FreeBSD: www/share/mk/web.site.mk,v 1.40 2001/11/12 19:17:39 phantom Exp $
#
# Build and install a web site.
@ -15,9 +15,6 @@
.include "${.CURDIR}/../Makefile.inc"
.endif
# XXX: translations are not ready!
NO_TIDY= YES
WEBDIR?= ${.CURDIR:T}
CGIDIR?= ${.CURDIR:T}
DESTDIR?= ${HOME}/public_html
@ -45,9 +42,9 @@ SORT?= /usr/bin/sort
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 -raw -preserve -f /dev/null ${TIDYFLAGS}
#
# Install dirs derived from the above.
@ -82,37 +79,36 @@ PORTSBASE?= /usr
.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
###
@ -121,15 +117,15 @@ ORPHANS:= ${ORPHANS:N*.sgml}
# 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

View file

@ -1,4 +1,4 @@
# $FreeBSD: www/zh/Makefile,v 1.4 2000/02/28 12:51:21 phantom Exp $
# $FreeBSD: www/zh/Makefile,v 1.5 2000/11/07 05:20:40 kuriyama Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@ -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