From owner-svn-doc-all@freebsd.org Fri Oct 6 14:08:47 2017 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34A78E38212; Fri, 6 Oct 2017 14:08:47 +0000 (UTC) (envelope-from wosch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00F73F84; Fri, 6 Oct 2017 14:08:46 +0000 (UTC) (envelope-from wosch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v96E8k0x090425; Fri, 6 Oct 2017 14:08:46 GMT (envelope-from wosch@FreeBSD.org) Received: (from wosch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v96E8jQ3090419; Fri, 6 Oct 2017 14:08:45 GMT (envelope-from wosch@FreeBSD.org) Message-Id: <201710061408.v96E8jQ3090419@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wosch set sender to wosch@FreeBSD.org using -f From: Wolfram Schneider Date: Fri, 6 Oct 2017 14:08:45 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: 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 X-SVN-Group: doc-head X-SVN-Commit-Author: wosch X-SVN-Commit-Paths: 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 X-SVN-Commit-Revision: 51066 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Oct 2017 14:08:47 -0000 Author: wosch Date: Fri Oct 6 14:08:45 2017 New Revision: 51066 URL: https://svnweb.freebsd.org/changeset/doc/51066 Log: 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 '' \ - ${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 handles implicit dependencies of +# DocBook documentation in the FreeBSD Documentation Project. +# + +# +# extract the depending *.xml files from the main +# input sources on the fly: +# +# +# +# => ./releng-building.xml +# + +.if ${.TARGETS} == "all" +_DOCBOOK_DEPS_SYSTEM != for i in $$(egrep '' ${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"