From 3dcbc88fa7c94b1f4d8c5032c8a28e117ce5b4b0 Mon Sep 17 00:00:00 2001
From: sbohlen <sbohlen@gmail.com>
Date: Mon, 6 Dec 2010 19:56:14 +0000
Subject: [PATCH] - fix hardcoded path to hhc.exe to properly locate install
 location on x64 platforms (e.g., c:\program files (x86)\... instead of
 c:\program files\...) - increased heap space to 1024m on the docbook builder
 (PDF target) so that it doesn't crash when building

---
 doc/build.xml                      | 3 ++-
 doc/reference/docbook.build        | 6 +++---
 doc/reference/lib/fop-0.95/fop.bat | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/build.xml b/doc/build.xml
index e5c4792c..59613685 100644
--- a/doc/build.xml
+++ b/doc/build.xml
@@ -155,8 +155,9 @@
       <arg value="${basedir}/${doc.ref.dir}/src/index.xml" />
       <arg value="${basedir}/${doc.ref.dir}/styles/htmlhelp.xsl" />
     </java>
+	<readregistry property="hhc.path" key="software\microsoft\html help workshop\installdir" hive="currentuser" />
     <exec dir="${doc.ref.output.dir}/htmlhelp" executable="cmd.exe">
-      <arg line="/c 'C:\Program Files\HTML Help Workshop\hhc.exe' htmlhelp.hhp"/>
+      <arg line="/c '${hhc.path}\hhc.exe' htmlhelp.hhp"/>
     </exec>
     <delete includeEmptyDirs="true">
       <fileset dir="${doc.ref.output.dir}/htmlhelp">
diff --git a/doc/reference/docbook.build b/doc/reference/docbook.build
index e6576556..488530ab 100644
--- a/doc/reference/docbook.build
+++ b/doc/reference/docbook.build
@@ -73,8 +73,8 @@
     <!-- docbook -> HTML Help Workshop project (.hhp) -->
     <exec workingdir="${project.targetdir}" program="java" commandline='-cp "..\lib\saxon6-5-5\saxon.jar;..\lib\xslthl-2.0.0\xslthl-2.0.0.jar" com.icl.saxon.StyleSheet ../src/index.xml "..\lib\docbook-xsl-snapshot\htmlhelp\springnet.xsl" highlight.xslthl.config="file:///${project.basedir}/lib/docbook-xsl-snapshot/highlighting/xslthl-config.xml"' />
     <!-- HTML Help Workshop project (.hhp) -> HTML Help file (.chm) -->
-    <!--<readregistry property="hhc.path" key="SOFTWARE\Microsoft\HTML Help Workshop\InstallDir" hive="CurrentUser" />-->
-    <exec program="C:\Program Files\HTML Help Workshop\hhc.exe" commandline="${project.targetdir}\htmlhelp\htmlhelp.hhp" failonerror="false" />
+    <readregistry property="hhc.path" key="SOFTWARE\Microsoft\HTML Help Workshop\InstallDir" hive="CurrentUser" />
+    <exec program="${hhc.path}\hhc.exe" commandline="${project.targetdir}\htmlhelp\htmlhelp.hhp" failonerror="false" />
     <!-- cleanup -->
 
     <delete>
@@ -92,7 +92,7 @@
     <echo message="Generating PDF format..." />
     <mkdir dir="${project.targetdir}" />
     <!-- docbook -> fop -->
-    <exec workingdir="${project.targetdir}" program="java" commandline='-cp "..\lib\saxon6-5-5\saxon.jar;..\lib\xslthl-2.0.0\xslthl-2.0.0.jar" com.icl.saxon.StyleSheet -o pdf/spring-net-reference.fo ../src/index.xml "..\lib\docbook-xsl-snapshot\fo\springnet.xsl" highlight.xslthl.config="file:///${project.basedir}/lib/docbook-xsl-snapshot/highlighting/xslthl-config.xml"'/>
+    <exec workingdir="${project.targetdir}" program="java" commandline='-cp "..\lib\saxon6-5-5\saxon.jar;..\lib\xslthl-2.0.0\xslthl-2.0.0.jar"  -Xmx1024m  com.icl.saxon.StyleSheet -o pdf/spring-net-reference.fo ../src/index.xml "..\lib\docbook-xsl-snapshot\fo\springnet.xsl" highlight.xslthl.config="file:///${project.basedir}/lib/docbook-xsl-snapshot/highlighting/xslthl-config.xml"'/>
     <!-- fop -> pdf -->
     <exec program="${project.basedir}\lib\fop-0.95\fop.bat" commandline='-fo "${project.targetdir}\pdf\spring-net-reference.fo" -pdf "${project.targetdir}\pdf\spring-net-reference.pdf"'/>
     <!-- Delete temporary fop file -->
diff --git a/doc/reference/lib/fop-0.95/fop.bat b/doc/reference/lib/fop-0.95/fop.bat
index 85a7fec0..72ef70dc 100644
--- a/doc/reference/lib/fop-0.95/fop.bat
+++ b/doc/reference/lib/fop-0.95/fop.bat
@@ -69,7 +69,7 @@ set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_imageio.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\fop-hyph.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%FOP_HYPHENATION_PATH%
 
-set JAVAOPTS=-Denv.windir=%WINDIR% -Xmx256m
+set JAVAOPTS=-Denv.windir=%WINDIR% -Xmx1024m
 
 if "%JAVA_HOME%" == "" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome