aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2005-03-04 13:24:47 +0000
committerJörg Mayer <jmayer@loplof.de>2005-03-04 13:24:47 +0000
commit0a71da16a8c4eae2781bcb81075a94c52a843b7c (patch)
tree5d82ef20861d48f6cde378c384e6a5b8f31064fb /docbook
parent6fec8dca5f044a14896d50294c99744470abbafe (diff)
- Add -Xmx256m automatically on unixish systems.
- Make build process for A4 and letter pdfs more similar. svn path=/trunk/; revision=13585
Diffstat (limited to 'docbook')
-rw-r--r--docbook/Makefile16
-rw-r--r--docbook/README.txt1
2 files changed, 10 insertions, 7 deletions
diff --git a/docbook/Makefile b/docbook/Makefile
index 7705ef3cc5..0cd5348e47 100644
--- a/docbook/Makefile
+++ b/docbook/Makefile
@@ -6,13 +6,17 @@
#
# formatting objects processor
+# Additional options to fop.
+# This needs to contain at least the argument '-Xmx256m'
+FOP_OPTS=-Xmx256m
# (comment this out, if you don't want pdf or don't have fop installed)
-# for win32 (cygwin) environments
-FOP="fop-0.20.5/fop.bat"
+# for win32 (cygwin) environments (as of fop-0.20 the cygwin script does
+# not use $FOP_OPTS)
+FOP=FOP_OPTS="${FOP_OPTS}" fop-0.20.5/fop.bat
# for unix like environments (if you have problems with fop, try to use an absolute path here)
#FOP="/usr/share/fop-0.20.5/fop.sh"
# One SUSE 9.1 and 9.2 uncomment the following line (make sure you have at least fop-0.20.5-71.2)
-#FOP="fop"
+FOP=FOP_OPTS="${FOP_OPTS}" fop
# html help compiler (Win32 only)
# (comment this out, if you don't want chm or don't have hhc installed)
@@ -89,8 +93,7 @@ eug_html_chunked: svn_version.xml
eug_pdf_us: svn_version.xml
ifdef FOP
@ echo --- PDF US PAPER ---
- # $(XSLTPROC) --nonet custom_layer_pdf.xsl http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl user-guide.xml > user-guide-us.fo
- $(XSLTPROC) --nonet custom_layer_pdf.xsl user-guide.xml > user-guide-us.fo
+ $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl user-guide.xml > user-guide-us.fo
$(FOP) user-guide-us.fo user-guide-us.pdf
endif
@@ -148,8 +151,7 @@ edg_html_chunked: svn_version.xml
edg_pdf_us: svn_version.xml
ifdef FOP
@ echo --- PDF US PAPER ---
- # $(XSLTPROC) --nonet custom_layer_pdf.xsl http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl developer-guide.xml > developer-guide-us.fo
- $(XSLTPROC) --nonet custom_layer_pdf.xsl developer-guide.xml > developer-guide-us.fo
+ $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl developer-guide.xml > developer-guide-us.fo
$(FOP) developer-guide-us.fo developer-guide-us.pdf
endif
diff --git a/docbook/README.txt b/docbook/README.txt
index da414a5490..ddc8e05236 100644
--- a/docbook/README.txt
+++ b/docbook/README.txt
@@ -68,6 +68,7 @@ As I got OutOfMemoryException when running fop, I had to insert -Xmx256m into th
java -cp "%LOCALCLASSPATH%" org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
to:
java -Xmx256m -cp "%LOCALCLASSPATH%" org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
+This should be added automatically on unixish systems.
HTML help compiler (for chm file generation only)
-------------------------------------------------