diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-10-02 14:53:38 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2012-10-02 16:21:23 +0200 |
| commit | 4a21d2e7790f1c76cf0d0fcfb2f4a8ef13721532 (patch) | |
| tree | ec44e33388887a698a8cc29b8968e915e94c7a2b | |
| parent | dce8a8e284e544999d85aa7df3ef97c3701742b4 (diff) | |
| download | samba-4a21d2e7790f1c76cf0d0fcfb2f4a8ef13721532.tar.gz samba-4a21d2e7790f1c76cf0d0fcfb2f4a8ef13721532.tar.bz2 samba-4a21d2e7790f1c76cf0d0fcfb2f4a8ef13721532.zip | |
Fix release script to build full set of documentation
build-docs script was not setting XML catalog properly.
In addition, some time ago pdf versions of images were introduced as
generated dependencies in our books but svg -> pdf rule was not added,
so building books never finished properly.
Autobuild-User(master): Alexander Bokovoy <ab@samba.org>
Autobuild-Date(master): Tue Oct 2 16:21:23 CEST 2012 on sn-devel-104
| -rw-r--r-- | docs-xml/Makefile | 3 | ||||
| -rwxr-xr-x | release-scripts/build-docs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docs-xml/Makefile b/docs-xml/Makefile index 0b4e880a8b..b322bed8dc 100644 --- a/docs-xml/Makefile +++ b/docs-xml/Makefile @@ -191,6 +191,9 @@ $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-latex-eps %.eps: %.png $(PNGTOPNM) $< | $(PNMTOPS) > $@ +%.pdf: %.svg + $(INKSCAPE) -z -f $(abspath $<) --export-pdf=$(abspath $@) + $(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp $(XSLTPROC) --stringparam htmlhelp.chm $*.chm \ --stringparam manifest.in.base.dir "$@/" \ diff --git a/release-scripts/build-docs b/release-scripts/build-docs index 5da641ac69..e909e6e6c3 100755 --- a/release-scripts/build-docs +++ b/release-scripts/build-docs @@ -11,6 +11,7 @@ DOCSRCDIR=`dirname $0`/../docs-xml pushd $DOCSRCDIR || exit 1 git clean -d -x -f +export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" autoconf && \ ./configure --with-papersize=letter && \ make smbdotconf/parameters.all.xml && \ @@ -28,8 +29,6 @@ rsync -Ca --exclude=.svn archives/ ../docs/ cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/" /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test -mv manpages-3 manpages -mv htmldocs/manpages-3 htmldocs/manpages cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/" make distclean |