Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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\...)

Browse Source 
- increased heap space to 1024m on the docbook builder (PDF target) so that it doesn't crash when building
This commit is contained in:
sbohlen
2010-12-06 19:56:14 +00:00
parent 69b2b885be
commit 3dcbc88fa7
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/build.xml
View File

@@ -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">

6
doc/reference/docbook.build
View File

@@ -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 -->

2
doc/reference/lib/fop-0.95/fop.bat
View File

@@ -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