www cleanup mega commit:
- Clean up XML dependency set. - Add "make lint" for validation.
This commit is contained in:
Hiroki Sato
parent
bc748f54ed
commit
fb0b3eec96
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/www/; revision=28472
2 changed files with 96 additions and 63 deletions
|
|
@ -1,25 +1,33 @@
|
|||
# doc.xml.mk
|
||||
# $FreeBSD: www/share/mk/doc.xml.mk,v 1.4 2005/10/04 17:18:41 hrs Exp $
|
||||
# $FreeBSD: www/share/mk/doc.xml.mk,v 1.5 2006/07/11 12:59:40 hrs Exp $
|
||||
|
||||
XML_CATALOG_FILES= file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \
|
||||
file://${DOC_PREFIX}/share/sgml/catalog.xml \
|
||||
file://${DOC_PREFIX}/share/sgml/catalog-common.xml \
|
||||
file://${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/catalog.xml \
|
||||
file://${WEB_PREFIX}/share/sgml/catalog.xml \
|
||||
file://${WEB_PREFIX}/share/sgml/catalog-common.xml \
|
||||
file://${LOCALBASE}/share/xml/catalog
|
||||
|
||||
# Variables used in DEPENDSET
|
||||
|
||||
_DEPENDSET.all= wwwstd transtable mirrors usergroups \
|
||||
_DEPENDSET.all= wwwstd transtable mirrors usergroups commercial \
|
||||
news press events navigation advisories notices
|
||||
|
||||
# DEPENDSET: wwwstd .........................................................
|
||||
_DEPENDSET.wwwstd= ${XML_INCLUDES}
|
||||
XML_INCLUDES= ${WEB_PREFIX}/${WWW_LANGCODE}/includes.xsl \
|
||||
${WEB_PREFIX}/share/sgml/includes.header.xsl \
|
||||
${WEB_PREFIX}/share/sgml/includes.misc.xsl \
|
||||
${WEB_PREFIX}/share/sgml/includes.release.xsl \
|
||||
${WEB_PREFIX}/share/sgml/includes.xsl
|
||||
_XML_INCLIST= libcommon.l10n.xsl \
|
||||
libcommon.xsl \
|
||||
navibar.l10n.ent \
|
||||
navibar.ent
|
||||
.for F in ${_INCLIST}
|
||||
.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/${F})
|
||||
XML_INCLUDES+= ${F}
|
||||
.endif
|
||||
.if exists(${WEB_PREFIX}/share/sgml/${F})
|
||||
XML_INCLUDES+= ${F}
|
||||
.endif
|
||||
.endfor
|
||||
|
||||
# DEPENDSET: transtable ......................................................
|
||||
_DEPENDSET.transtable= ${XML_TRANSTABLE} ${XSL_TRANSTABLE} \
|
||||
|
|
@ -102,59 +110,69 @@ XSL_USERGROUPS= ${WEB_PREFIX}/share/sgml/templates.usergroups.xsl
|
|||
|
||||
# DEPENDSET: news ............................................................
|
||||
_DEPENDSET.news= ${XML_NEWS_NEWS_MASTER} ${XML_NEWS_NEWS} \
|
||||
${XML_NEWS_INCLUDES_MASTER} ${XML_NEWS_INCLUDES} \
|
||||
${XSL_NEWS_NEWSFLASH} \
|
||||
${XSL_NEWS_NEWS_RDF} \
|
||||
${XML_INCLUDES}
|
||||
_PARAMS.news= --param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
|
||||
--param news.project.xml "'${XML_NEWS_NEWS}'"
|
||||
XML_NEWS_INCLUDES_MASTER=${WEB_PREFIX}/en/news/includes.xsl
|
||||
XML_NEWS_INCLUDES= ${WEB_PREFIX}/${WWW_LANGCODE}/news/includes.xsl
|
||||
XML_NEWS_NEWS_MASTER= ${WEB_PREFIX}/en/news/news.xml
|
||||
XML_NEWS_NEWS= ${WEB_PREFIX}/${WWW_LANGCODE}/news/news.xml
|
||||
XML_NEWS_NEWS_MASTER= ${WEB_PREFIX}/share/sgml/news.xml
|
||||
.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/news.xml)
|
||||
XML_NEWS_NEWS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/news.xml
|
||||
.else
|
||||
XML_NEWS_NEWS= ${WEB_PREFIX}/share/sgml/news.xml
|
||||
.endif
|
||||
|
||||
XSL_NEWS_NEWSFLASH= ${WEB_PREFIX}/share/sgml/templates.newsflash.xsl
|
||||
XSL_NEWS_NEWSFLASH_OLD= ${WEB_PREFIX}/share/sgml/templates.oldnewsflash.xsl
|
||||
XSL_NEWS_NEWS_RDF= ${WEB_PREFIX}/share/sgml/templates.news-rdf.xsl
|
||||
|
||||
# DEPENDSET: press ..........................................................
|
||||
_DEPENDSET.press= ${XML_NEWS_PRESS_MASTER} ${XML_NEWS_PRESS} \
|
||||
${XML_NEWS_INCLUDES_MASTER} ${XML_NEWS_INCLUDES} \
|
||||
${XSL_NEWS_PRESS} \
|
||||
${XML_INCLUDES}
|
||||
_PARAMS.press= --param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
|
||||
--param news.press.xml "'${XML_NEWS_PRESS}'"
|
||||
XML_NEWS_INCLUDES_MASTER=${WEB_PREFIX}/en/news/includes.xsl
|
||||
XML_NEWS_INCLUDES= ${WEB_PREFIX}/${WWW_LANGCODE}/news/includes.xsl
|
||||
XML_NEWS_PRESS_MASTER= ${WEB_PREFIX}/en/news/press.xml
|
||||
XML_NEWS_PRESS= ${WEB_PREFIX}/${WWW_LANGCODE}/news/press.xml
|
||||
XML_NEWS_PRESS_MASTER= ${WEB_PREFIX}/share/sgml/press.xml
|
||||
.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/press.xml)
|
||||
XML_NEWS_PRESS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/press.xml
|
||||
.else
|
||||
XML_NEWS_PRESS= ${WEB_PREFIX}/share/sgml/press.xml
|
||||
.endif
|
||||
XSL_NEWS_PRESS= ${WEB_PREFIX}/share/sgml/templates.press.xsl
|
||||
XSL_NEWS_PRESS_OLD= ${WEB_PREFIX}/share/sgml/templates.oldpress.xsl
|
||||
|
||||
# DEPENDSET: events ..........................................................
|
||||
_DEPENDSET.events= ${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_EVENTS} \
|
||||
${XML_EVENTS_CURDATE} ${XML_INCLUDES}
|
||||
${XSL_EVENTS} \
|
||||
${XSL_EVENTS_ICS} \
|
||||
${XML_INCLUDES}
|
||||
_PARAMS.events= --param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
|
||||
--param events.xml "'${XML_EVENTS_EVENTS}'" \
|
||||
--param curdate.xml "'${XML_EVENTS_CURDATE}'"
|
||||
XML_EVENTS_EVENTS_MASTER=${WEB_PREFIX}/en/events/events.xml
|
||||
.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/events/events.xml)
|
||||
XML_EVENTS_EVENTS= ${WEB_PREFIX}/${WWW_LANGCODE}/events/events.xml
|
||||
--param events.xml "'${XML_EVENTS_EVENTS}'"
|
||||
XML_EVENTS_EVENTS_MASTER=${WEB_PREFIX}/share/sgml/events.xml
|
||||
.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml)
|
||||
XML_EVENTS_EVENTS= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/events.xml
|
||||
.else
|
||||
XML_EVENTS_EVENTS= ${XML_EVENTS_EVENTS_MASTER}
|
||||
.endif
|
||||
XML_EVENTS_CURDATE= ${WEB_PREFIX}/en/events/curdate.xml
|
||||
XSL_EVENTS= ${WEB_PREFIX}/share/sgml/templates.events.xsl
|
||||
XSL_EVENTS_ICS= ${WEB_PREFIX}/share/sgml/templates.events2ics.xsl
|
||||
|
||||
DATE?= /bin/date
|
||||
TR?= /usr/bin/tr
|
||||
# DEPENDSET: commercial ........................................................
|
||||
_DEPENDSET.commercial= ${XML_COMMERCIAL_CONSULT} \
|
||||
${XML_COMMERCIAL_HARDWARE} \
|
||||
${XML_COMMERCIAL_ISP} \
|
||||
${XML_COMMERCIAL_MISC} \
|
||||
${XML_COMMERCIAL_SOFTWARE} \
|
||||
${XSL_ENTRIES} \
|
||||
${XML_INCLUDES}
|
||||
_PARAMS.commercial=
|
||||
XML_COMMERCIAL_CONSULT= ${WEB_PREFIX}/share/sgml/commercial.consult.xml
|
||||
XML_COMMERCIAL_HARDWARE=${WEB_PREFIX}/share/sgml/commercial.hardware.xml
|
||||
XML_COMMERCIAL_ISP= ${WEB_PREFIX}/share/sgml/commercial.isp.xml
|
||||
XML_COMMERCIAL_MISC= ${WEB_PREFIX}/share/sgml/commercial.misc.xml
|
||||
XML_COMMERCIAL_SOFTWARE=${WEB_PREFIX}/share/sgml/commercial.software.xml
|
||||
|
||||
${XML_EVENTS_CURDATE}:
|
||||
@${ECHO} "Generating ${.TARGET}"
|
||||
@${ECHO_CMD} '<?xml version="1.0"?>' > ${.TARGET}
|
||||
@${ECHO_CMD} '<curdate>' >> ${.TARGET}
|
||||
@${ECHO_CMD} -n ' <year>' >> ${.TARGET}
|
||||
@${DATE} +%Y | ${TR} -d "\n" >> ${.TARGET}
|
||||
@${ECHO_CMD} '</year>' >> ${.TARGET}
|
||||
@${ECHO_CMD} -n ' <month>' >> ${.TARGET}
|
||||
@${DATE} +%m | ${TR} -d "\n" >> ${.TARGET}
|
||||
@${ECHO_CMD} '</month>' >> ${.TARGET}
|
||||
@${ECHO_CMD} -n ' <day>' >> ${.TARGET}
|
||||
@${DATE} +%d | ${TR} -d "\n" >> ${.TARGET}
|
||||
@${ECHO_CMD} '</day>' >> ${.TARGET}
|
||||
@${ECHO_CMD} '</curdate>' >> ${.TARGET}
|
||||
|
||||
CLEANFILES+= ${XML_EVENTS_CURDATE}
|
||||
XSL_ENTRIES= ${WEB_PREFIX}/share/sgml/templates.entries.xsl
|
||||
|
||||
# DEPENDSET: navigation .....................................................
|
||||
_DEPENDSET.navigation= ${XML_NAVIGATION} ${XML_INCLUDES}
|
||||
|
|
@ -234,6 +252,13 @@ XSLTPROCOPTS+= --nonet --catalogs
|
|||
.endif
|
||||
XSLTPROC= env ${XSLTPROC_ENV} ${LOCALBASE}/bin/xsltproc
|
||||
|
||||
XMLLINTOPTS= ${XMLLINTFLAGS}
|
||||
XMLLINTOPTS+= --xinclude --valid --noout
|
||||
.if defined(XML_CATALOG_FILES) && !empty(XML_CATALOG_FILES)
|
||||
XMLLINTOPTS+= --nonet --catalogs
|
||||
.endif
|
||||
XMLLINT= env ${XSLTPROC_ENV} ${PREFIX}/bin/xmllint
|
||||
|
||||
.for D in ${XMLDOCS}
|
||||
# parse "docid:xslt:xml:target".
|
||||
# XXX: ${__ID} is used because ${A}=B does not work except
|
||||
|
|
@ -324,5 +349,13 @@ ${TARGET.${_ID}}: ${XML.${_ID}} ${DEPENDS.${_ID}}
|
|||
-${TIDY} ${TIDYOPTS} ${.TARGET}
|
||||
. endif
|
||||
. endif
|
||||
|
||||
VALIDATE_DOCS+= VALIDATE.${_ID}
|
||||
VALIDATE.${_ID}:
|
||||
@${ECHO} "==>[xmllint] ${XML.${_ID}}"
|
||||
-@${XMLLINT} ${XMLLINTOPTS} ${XML.${_ID}} 2>&1 \
|
||||
| ${SED} -e 's/^/ | /'
|
||||
. endfor
|
||||
.endfor
|
||||
.endfor
|
||||
|
||||
lint: ${VALIDATE_DOCS}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# bsd.web.mk
|
||||
# $FreeBSD: www/share/mk/web.site.mk,v 1.72 2006/02/25 23:19:40 hrs Exp $
|
||||
# $FreeBSD: www/share/mk/web.site.mk,v 1.73 2006/05/13 03:27:22 simon Exp $
|
||||
|
||||
#
|
||||
# Build and install a web site.
|
||||
|
|
@ -56,8 +56,7 @@ SGMLNORM?= ${PREFIX}/bin/sgmlnorm
|
|||
.else
|
||||
SGMLNORM?= ${PREFIX}/bin/osgmlnorm
|
||||
.endif
|
||||
CATALOG?= ${PREFIX}/share/sgml/html/catalog
|
||||
SGMLNORMOPTS?= -d ${SGMLNORMFLAGS} -c ${CATALOG} -D ${.CURDIR}
|
||||
SGMLNORMOPTS?= -d ${SGMLNORMFLAGS} ${CATALOG:S,^,-c ,} -D ${.CURDIR}
|
||||
|
||||
XSLTPROC?= ${PREFIX}/bin/xsltproc
|
||||
XSLTPROCOPTS?= ${XSLTPROCFLAGS}
|
||||
|
|
@ -151,24 +150,25 @@ WWW_LANGCODE:= ${.CURDIR:S,^${_WEB_PREFIX}/,,:C,^([^/]+)/.*,\1,}
|
|||
.endif
|
||||
.endif # !defined(WITHOUT_DOC)
|
||||
|
||||
_INCLIST= navibar.ent \
|
||||
navibar.l10n.ent
|
||||
_SGML_INCLUDES= ${SGML_INCLUDES}
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/${WWW_LANGCODE}/includes.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/${WWW_LANGCODE}/includes.navabout.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/${WWW_LANGCODE}/includes.navcommunity.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/${WWW_LANGCODE}/includes.navdevelopers.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/${WWW_LANGCODE}/includes.navdocs.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/${WWW_LANGCODE}/includes.navdownload.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/${WWW_LANGCODE}/includes.navsupport.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.header.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.navabout.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.navcommunity.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.navdevelopers.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.navdocs.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.navdownload.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.navsupport.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.misc.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.release.sgml
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/includes.sgml
|
||||
|
||||
.for F in ${_INCLIST}
|
||||
.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/${F})
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/${F}
|
||||
.endif
|
||||
.if exists(${WEB_PREFIX}/share/sgml/${F})
|
||||
_SGML_INCLUDES+=${WEB_PREFIX}/share/sgml/${F}
|
||||
.endif
|
||||
.endfor
|
||||
|
||||
CATALOG?= ${PREFIX}/share/sgml/html/catalog \
|
||||
${PREFIX}/share/sgml/catalog
|
||||
.if exists(${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/catalog)
|
||||
CATALOG+= ${WEB_PREFIX}/${WWW_LANGCODE}/share/sgml/catalog
|
||||
.endif
|
||||
CATALOG+= ${WEB_PREFIX}/share/sgml/catalog
|
||||
|
||||
##################################################################
|
||||
# Transformation rules
|
||||
|
|
|
|||
Loading…
Reference in a new issue