osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix admon.graphics.path. 

Change-Id: I43d7d56f0fc2bd73efc54a685aea90f635b145ff
Reviewed-on: https://code.wireshark.org/review/3807
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-08-23 22:21:38 -07:00 committed by Gerald Combs
parent d31011572d
commit f88eca47c3
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docbook/Makefile.am
View File

@ -116,7 +116,8 @@ wsug_html/index.html: $(WSUG_SOURCE) wsluarm
cp $(srcdir)/wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar
cp $(srcdir)/ws.css wsug_html
$(XSLTPROC) --stringparam base.dir wsug_html/ $(COMMON_XSLTPROC_ARGS) \
--path .:wsluarm_src $(SINGLE_XSLTPROC_ARGS) $< > $@
--path .:wsluarm_src \
$(WSUG_XSLTPROC_ARGS) $(SINGLE_XSLTPROC_ARGS) $< > $@
-chmod -R og+rX wsug_html
# create html chunked page files
@ -131,7 +132,7 @@ wsug_html_chunked/index.html: $(WSUG_SOURCE) wsluarm
cp $(srcdir)/ws.css wsug_html_chunked
$(XSLTPROC) --stringparam base.dir wsug_html_chunked/ $(COMMON_XSLTPROC_ARGS) \
--path .:wsluarm_src \
$(CHUNKED_XSLTPROC_ARGS) $<
$(WSUG_XSLTPROC_ARGS) $(CHUNKED_XSLTPROC_ARGS) $<
-chmod -R og+rX wsug_html_chunked
# create pdf file (through XSL-FO), portrait pages on US letter paper
@ -198,7 +199,7 @@ wsdg_html/index.html: $(WSDG_SOURCE)
cp $(srcdir)/wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar/
cp $(srcdir)/ws.css wsdg_html
$(XSLTPROC) --stringparam base.dir wsdg_html/ $(COMMON_XSLTPROC_ARGS) \
$(SINGLE_XSLTPROC_ARGS) $< > $@
$(WSDG_XSLTPROC_ARGS) $(SINGLE_XSLTPROC_ARGS) $< > $@
-chmod -R og+rX wsdg_html
# create html chunked page files
@ -212,7 +213,7 @@ wsdg_html_chunked/index.html: $(WSDG_SOURCE)
cp $(srcdir)/wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar/
cp $(srcdir)/ws.css wsdg_html_chunked
$(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ $(COMMON_XSLTPROC_ARGS) \
$(CHUNKED_XSLTPROC_ARGS) $<
$(WSDG_XSLTPROC_ARGS) $(CHUNKED_XSLTPROC_ARGS) $<
-chmod -R og+rX wsdg_html_chunked
# create pdf file (through XSL-FO), portrait pages on US letter paper

7
docbook/Makefile.common
View File

@ -281,12 +281,17 @@ WSLUA_MODULES = \
COMMON_XSLTPROC_ARGS = \
--stringparam use.id.as.filename 1 \
--stringparam admon.graphics 1 \
--stringparam admon.graphics.path common_graphics/ \
--stringparam admon.graphics.extension .svg \
--stringparam section.autolabel 1 \
--stringparam section.label.includes.component.label 1 \
--stringparam html.stylesheet ws.css
WSUG_XSLTPROC_ARGS = \
--stringparam admon.graphics.path wsug_graphics/
WSDG_XSLTPROC_ARGS = \
--stringparam admon.graphics.path wsdg_graphics/
SINGLE_XSLTPROC_ARGS = \
--nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl

12
docbook/Makefile.nmake
View File

@ -107,7 +107,7 @@ wsug_html\index.html: $(WSUG_SOURCE) wsluarm
cp wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar
cp ws.css wsug_html
$(XSLTPROC) --stringparam base.dir wsug_html/ $(COMMON_XSLTPROC_ARGS) \
$(SINGLE_XSLTPROC_ARGS) user-guide.xml > $@
$(WSUG_XSLTPROC_ARGS) $(SINGLE_XSLTPROC_ARGS) user-guide.xml > $@
-chmod -R og+rX wsug_html
# create html chunked page files
@ -121,7 +121,7 @@ wsug_html_chunked\index.html: $(WSUG_SOURCE) wsluarm
cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar
cp ws.css wsug_html_chunked
$(XSLTPROC) --stringparam base.dir wsug_html_chunked/ $(COMMON_XSLTPROC_ARGS) \
$(CHUNKED_XSLTPROC_ARGS) user-guide.xml
$(WSUG_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)
@ -149,7 +149,7 @@ user-guide.chm: $(WSUG_SOURCE) wsluarm
-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
$(WSUG_XSLTPROC_ARGS) $(HTMLHELP_XSLTPROC_ARGS) user-guide.xml
-$(HHC_EXE) htmlhelp.hhp
-mv htmlhelp.chm $@
-rm -r htmlhelp.hhp
@ -194,7 +194,7 @@ wsdg_html\index.html: $(WSDG_SOURCE)
cp wsdg_graphics/toolbar/* wsdg_html/wsdg_graphics/toolbar
cp ws.css wsdg_html
$(XSLTPROC) --stringparam base.dir wsdg_html/ $(COMMON_XSLTPROC_ARGS) \
$(SINGLE_XSLTPROC_ARGS) developer-guide.xml > $@
$(WSDG_XSLTPROC_ARGS) $(SINGLE_XSLTPROC_ARGS) developer-guide.xml > $@
-chmod -R og+rX wsdg_html
# create html chunked page files
@ -209,7 +209,7 @@ wsdg_html_chunked\index.html: $(WSDG_SOURCE)
cp wsdg_graphics/toolbar/* wsdg_html_chunked/wsdg_graphics/toolbar
cp ws.css wsdg_html_chunked
$(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ $(COMMON_XSLTPROC_ARGS) \
$(CHUNKED_XSLTPROC_ARGS) developer-guide.xml
$(WSDG_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
@ -237,7 +237,7 @@ developer-guide.chm: $(WSDG_SOURCE)
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
$(WSDG_XSLTPROC_ARGS) $(HTMLHELP_XSLTPROC_ARGS) developer-guide.xml
-$(HHC_EXE) htmlhelp.hhp
-mv htmlhelp.chm $@
-rm -r htmlhelp.hhp

4
docbook/custom_layer_pdf.xsl
View File

@ -14,7 +14,7 @@
<!-- use graphics for admons (note, tip, ...) -->
<xsl:param name="admon.graphics" select="1"/>
<xsl:param name="admon.graphics.path">wsug_graphics/</xsl:param>
<xsl:param name="admon.graphics.path">common_graphics/</xsl:param>
<xsl:param name="admon.graphics.extension" select="'.svg'"/>
<!-- use numbering for sections (not only for chapters) -->
@ -40,7 +40,7 @@
<xsl:attribute name="hyphenate">false</xsl:attribute>
</xsl:attribute-set>
<!-- put a page break after each section
<!-- put a page break after each section
<xsl:attribute-set name="section.level1.properties">
<xsl:attribute name="break-after">page</xsl:attribute>
</xsl:attribute-set>