svn commit: r51066 - in head: de_DE.ISO8859-1/books/fdp-primer en_US.ISO8859-1/articles/freebsd-releng share/mk zh_TW.UTF-8/books/fdp-primer zh_TW.UTF-8/books/handbook

Author: wosch
Date: Fri Oct  6 14:08:45 2017
New Revision: 51066
URL: https://svnweb.freebsd.org/changeset/doc/51066

Log:
  <doc.docbook-dep.mk> handles implicit dependencies of DocBook documentation
  
  This feature can be disabled with DOCBOOK_DEPS_DISABLE=YES
  
  Missing dependencies will be reported as a warning, and should
  be fixed by the document authors.
  
  PR: 222826

Added:
  head/share/mk/doc.docbook-dep.mk   (contents, props changed)
Modified:
  head/de_DE.ISO8859-1/books/fdp-primer/Makefile
  head/en_US.ISO8859-1/articles/freebsd-releng/Makefile
  head/share/mk/doc.project.mk
  head/zh_TW.UTF-8/books/fdp-primer/Makefile
  head/zh_TW.UTF-8/books/handbook/Makefile

Modified: head/de_DE.ISO8859-1/books/fdp-primer/Makefile
==============================================================================
--- head/de_DE.ISO8859-1/books/fdp-primer/Makefile	Fri Oct  6 10:44:00 2017	(r51065)
+++ head/de_DE.ISO8859-1/books/fdp-primer/Makefile	Fri Oct  6 14:08:45 2017	(r51066)
@@ -52,4 +52,7 @@ SRCS+= chapters.ent
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
+# Fixme!
+DOCBOOK_DEPS_DISABLE=YES
+
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"

Modified: head/en_US.ISO8859-1/articles/freebsd-releng/Makefile
==============================================================================
--- head/en_US.ISO8859-1/articles/freebsd-releng/Makefile	Fri Oct  6 10:44:00 2017	(r51065)
+++ head/en_US.ISO8859-1/articles/freebsd-releng/Makefile	Fri Oct  6 14:08:45 2017	(r51066)
@@ -12,14 +12,10 @@ INSTALL_ONLY_COMPRESSED?=
 
 SRCS=		article.xml
 
-DEPS!= egrep '<!ENTITY release\.[^ ]+ SYSTEM "./releng-[^ ]+\.xml">' \
-	${SRCS} | sed -E 's,.*"./([^"]+)".*,\1,'
-
 CSS_SHEET_ADDITIONS=extra.css
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
-index.html ${DOC}.html: ${DEPS}
-
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
+

Added: head/share/mk/doc.docbook-dep.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/mk/doc.docbook-dep.mk	Fri Oct  6 14:08:45 2017	(r51066)
@@ -0,0 +1,30 @@
+#
+# $FreeBSD$
+#
+# This include file <doc.docbook-dep.mk> handles implicit dependencies of
+# DocBook documentation in the FreeBSD Documentation Project.
+#
+
+#
+# extract the depending *.xml files from the main
+# input sources on the fly:
+#
+# <!ENTITY release.building SYSTEM "./releng-building.xml">
+#
+# 	=> ./releng-building.xml
+#
+
+.if ${.TARGETS} == "all"
+_DOCBOOK_DEPS_SYSTEM != for i in $$(egrep '<!ENTITY [^ ]+ SYSTEM "[^ ]+\.xml">' ${SRCS} | sed -E 's,.*"([^"]+)".*,\1,');do \
+			  if [ -e $$i ]; then \
+			    echo $i; \
+			  else \
+			    echo "Warning: dep file $$(pwd)/$$i does not exists" >&2; \
+			  fi; \
+			done
+.endif
+
+DOCBOOK_DEPS += ${_DOCBOOK_DEPS_SYSTEM}
+
+index.html ${DOC}.html: ${DOCBOOK_DEPS}
+

Modified: head/share/mk/doc.project.mk
==============================================================================
--- head/share/mk/doc.project.mk	Fri Oct  6 10:44:00 2017	(r51065)
+++ head/share/mk/doc.project.mk	Fri Oct  6 14:08:45 2017	(r51066)
@@ -99,6 +99,11 @@ DOC_LOCAL_MK=	${DOC_PREFIX}/${LANGCODE}/share/mk/doc.l
 .if defined(DOC)
 .if ${DOCFORMAT} == "docbook"
 .include "doc.docbook.mk"
+
+.if !defined(DOCBOOK_DEPS_DISABLE) || ${DOCBOOK_DEPS_DISABLE} != "YES"
+.include "doc.docbook-dep.mk"
+.endif
+
 .endif
 .if ${DOCFORMAT} == "slides"
 .include "doc.slides.mk"

Modified: head/zh_TW.UTF-8/books/fdp-primer/Makefile
==============================================================================
--- head/zh_TW.UTF-8/books/fdp-primer/Makefile	Fri Oct  6 10:44:00 2017	(r51065)
+++ head/zh_TW.UTF-8/books/fdp-primer/Makefile	Fri Oct  6 14:08:45 2017	(r51066)
@@ -31,4 +31,7 @@ IMAGES_LIB+=	callouts/5.png
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
+# Fixme!
+DOCBOOK_DEPS_DISABLE=YES
+
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"

Modified: head/zh_TW.UTF-8/books/handbook/Makefile
==============================================================================
--- head/zh_TW.UTF-8/books/handbook/Makefile	Fri Oct  6 10:44:00 2017	(r51065)
+++ head/zh_TW.UTF-8/books/handbook/Makefile	Fri Oct  6 14:08:45 2017	(r51066)
@@ -161,4 +161,7 @@ SYMLINKS=	${DESTDIR} index.html handbook.html
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?=	${.CURDIR}/../../..
 
+# Fixme!
+DOCBOOK_DEPS_DISABLE=YES
+
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"