From 789c5c57d320c3b73dce5056c5c4933e9106fa42 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 27 Jun 2017 15:42:00 +0200 Subject: [PATCH] use rsvg-convert instead of inkscape MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit we save quite a few build (reverse-)dependencies with this change rsvg-convert is also a lot faster. both use the same backend to process SVGs – cairo Signed-off-by: Thomas Lamprecht --- Makefile | 9 +++++---- asciidoc/dblatex-export.conf | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 asciidoc/dblatex-export.conf diff --git a/Makefile b/Makefile index 44d9842..51b2872 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${PKGREL}_${ARCH}.deb DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb MEDIAWIKI_DEB=${MEDIAWIKI_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb -DOC_BUILDDEPS := asciidoc-dblatex, source-highlight, inkscape, imagemagick +DOC_BUILDDEPS := asciidoc-dblatex, source-highlight, librsvg2-bin all: index.html @@ -123,15 +123,16 @@ pve-admin-guide.chunked: ${PVE_ADMIN_GUIDE_ADOCDEPENDS} a2x -a docinfo -a docinfo1 -a icons -f chunked pve-admin-guide.adoc PVE_DOCBOOK_CONF=-b $(shell pwd)/asciidoc/pve-docbook -f asciidoc/asciidoc-pve.conf +PVE_DBLATEX_OPTS='-p ./asciidoc/pve-dblatex.xsl -s asciidoc/dblatex-custom.sty -c asciidoc/dblatex-export.conf' pve-admin-guide-docinfo.xml: pve-admin-guide-docinfo.xml.in sed -e 's/@RELEASE@/${DOCRELEASE}/' <$< >$@ pve-admin-guide.pdf: ${PVE_ADMIN_GUIDE_ADOCDEPENDS} docinfo.xml pve-admin-guide-docinfo.xml - inkscape -z -D --export-pdf=proxmox-logo.pdf images/proxmox-logo.svg - inkscape -z -D --export-pdf=proxmox-ci-header.pdf images/proxmox-ci-header.svg + rsvg-convert -f pdf -o proxmox-logo.pdf images/proxmox-logo.svg + rsvg-convert -f pdf -o proxmox-ci-header.pdf images/proxmox-ci-header.svg grep ">Release ${DOCRELEASE}<" pve-admin-guide-docinfo.xml || (echo "wrong release in pve-admin-guide-docinfo.xml" && false); - a2x -a docinfo -a docinfo1 -f pdf -L --asciidoc-opts="${PVE_DOCBOOK_CONF}" --dblatex-opts "-p ./asciidoc/pve-dblatex.xsl -s asciidoc/dblatex-custom.sty" pve-admin-guide.adoc + a2x -a docinfo -a docinfo1 -f pdf -L --asciidoc-opts="${PVE_DOCBOOK_CONF}" --dblatex-opts ${PVE_DBLATEX_OPTS} pve-admin-guide.adoc rm proxmox-logo.pdf proxmox-ci-header.pdf pve-admin-guide.epub: ${PVE_ADMIN_GUIDE_ADOCDEPENDS} diff --git a/asciidoc/dblatex-export.conf b/asciidoc/dblatex-export.conf new file mode 100644 index 0000000..c42666b --- /dev/null +++ b/asciidoc/dblatex-export.conf @@ -0,0 +1,15 @@ + + + + + + + rsvg-convert -a -f %(dst)s -o %(output)s %(input)s + + + + -- 2.39.2