diff options
| author | Gerald Combs <gerald@zing.org> | 2014-07-23 18:28:32 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-08-24 02:56:35 +0000 |
| commit | d31011572def589f5c7926c780e0e82a3f61216d (patch) | |
| tree | 0d534d0ffae5b989c8d2374e97c9658cbd65245e /docbook/Makefile.nmake | |
| parent | 7d035a12b3762fccfd28694dd1ade2c8cd72ea7f (diff) | |
Convert admon graphics to SVG.
Use a common set of SVG files for AsciiDoc / DocBook admonition
graphics. Put them in a common directory. According to
http://caniuse.com/svg all common browsers have had SVG support for
a while now.
The graphics themselves were created with Inkscape. If you would like
to refine them further you are more than welcome.
Use variables to assemble xsltproc commands in Autotools and Nmake
while we're here.
Try to update Debian rules to reflect ga92c3fb.
Change-Id: If82647af27a60117c517125dff0aca81c033be72
Reviewed-on: https://code.wireshark.org/review/3206
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook/Makefile.nmake')
| -rw-r--r-- | docbook/Makefile.nmake | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index eb3e9c32ff..0a55ffa326 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -103,9 +103,11 @@ wsug_html\index.html: $(WSUG_SOURCE) wsluarm @ echo --- WSUG - HTML SINGLE PAGE --- if not exist wsug_html\wsug_graphics\toolbar md wsug_html\wsug_graphics\toolbar cp wsug_graphics/*.* wsug_html/wsug_graphics + cp common_graphics/*.* wsug_html/wsug_graphics cp wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar cp ws.css wsug_html - $(XSLTPROC) --stringparam base.dir wsug_html/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl user-guide.xml > $@ + $(XSLTPROC) --stringparam base.dir wsug_html/ $(COMMON_XSLTPROC_ARGS) \ + $(SINGLE_XSLTPROC_ARGS) user-guide.xml > $@ -chmod -R og+rX wsug_html # create html chunked page files @@ -115,9 +117,11 @@ wsug_html_chunked\index.html: $(WSUG_SOURCE) wsluarm @ echo --- WSUG - HTML CHUNKED --- if not exist wsug_html_chunked\wsug_graphics\toolbar md wsug_html_chunked\wsug_graphics\toolbar cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics + cp common_graphics/*.* wsug_html_chunked/wsug_graphics cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar cp ws.css wsug_html_chunked - $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl user-guide.xml + $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ + $(CHUNKED_XSLTPROC_ARGS) user-guide.xml -chmod -R og+rX wsug_html_chunked # create pdf file (through XSL-FO), portrait pages on US letter paper (the default) @@ -141,9 +145,11 @@ user-guide.chm: $(WSUG_SOURCE) wsluarm !ifdef HHC_EXE @ echo --- WSUG - MICROSOFT HTML HELP --- if not exist wsug_chm\wsug_graphics\toolbar md wsug_chm\wsug_graphics\toolbar - -cp wsug_graphics/*.* wsug_chm/wsug_graphics/ - -cp wsug_graphics/toolbar/* wsug_chm/wsug_graphics/toolbar/ - $(XSLTPROC) --stringparam base.dir wsug_chm/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl user-guide.xml + -cp wsug_graphics/*.* wsug_chm/wsug_graphics + -cp common_graphics/*.* wsug_chm/wsug_graphics + -cp wsug_graphics/toolbar/* wsug_chm/wsug_graphics/toolbar + $(XSLTPROC) --stringparam base.dir wsug_chm/ $(COMMON_XSLTPROC_ARGS) \ + $(HTMLHELP_XSLTPROC_ARGS) user-guide.xml -$(HHC_EXE) htmlhelp.hhp -mv htmlhelp.chm $@ -rm -r htmlhelp.hhp @@ -183,10 +189,12 @@ wsdg_html\index.html: $(WSDG_SOURCE) @ echo --- WSDG - HTML SINGLE PAGE --- if not exist wsdg_html\wsdg_graphics md wsdg_html\wsdg_graphics if not exist wsdg_html\wsdg_graphics\toolbar md wsdg_html\wsdg_graphics\toolbar - cp wsdg_graphics/*.* wsdg_html/wsdg_graphics/ - cp wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar/ + cp wsdg_graphics/*.* wsdg_html/wsdg_graphics + cp common_graphics/*.* wsdg_html/wsdg_graphics + cp wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar cp ws.css wsdg_html - $(XSLTPROC) --stringparam base.dir wsdg_html/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl developer-guide.xml > $@ + $(XSLTPROC) --stringparam base.dir wsdg_html/ $(COMMON_XSLTPROC_ARGS) \ + $(SINGLE_XSLTPROC_ARGS) developer-guide.xml > $@ -chmod -R og+rX wsdg_html # create html chunked page files @@ -196,11 +204,12 @@ wsdg_html_chunked\index.html: $(WSDG_SOURCE) @ echo --- WSDG - HTML CHUNKED --- if not exist wsdg_html_chunked\wsdg_graphics md wsdg_html_chunked\wsdg_graphics if not exist wsdg_html_chunked\wsdg_graphics\toolbar md wsdg_html_chunked\wsdg_graphics\toolbar - cp wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics/ - cp wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar/ + cp wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics + cp common_graphics/*.* wsdg_html_chunked/wsdg_graphics + cp wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar cp ws.css wsdg_html_chunked - $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl developer-guide.xml - -chmod -R og+rX wsdg_html_chunked + $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ $(COMMON_XSLTPROC_ARGS) \ + $(CHUNKED_XSLTPROC_ARGS) developer-guide.xml # create pdf file (through XSL-FO), portrait pages on US letter paper (the default) # you will get lot's of errors, but that's ok @@ -224,9 +233,11 @@ developer-guide.chm: $(WSDG_SOURCE) @ echo --- WSDG - MICROSOFT HTML HELP --- if not exist wsdg_chm\wsdg_graphics md wsdg_chm\wsdg_graphics if not exist wsdg_chm\wsdg_graphics\toolbar md wsdg_chm\wsdg_graphics\toolbar - cp wsdg_graphics/*.* wsdg_chm/wsdg_graphics/ - cp wsdg_graphics/toolbar/* wsdg_chm/wsdg_graphics/toolbar/ - $(XSLTPROC) --stringparam base.dir wsdg_chm/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl developer-guide.xml + cp wsdg_graphics/*.* wsdg_chm/wsdg_graphics + cp common_graphics/*.* wsdg_chm/wsdg_graphics + cp wsdg_graphics/toolbar/* wsdg_chm/wsdg_graphics/toolbar + $(XSLTPROC) --stringparam base.dir wsdg_chm/ $(COMMON_XSLTPROC_ARGS) \ + $(HTMLHELP_XSLTPROC_ARGS) developer-guide.xml -$(HHC_EXE) htmlhelp.hhp -mv htmlhelp.chm $@ -rm -r htmlhelp.hhp |