Merge branch 'master' of github.com:SpringSource/spring-net-vsnet

spring-attic · Jan 29, 2011 · 9869e84 · 9869e84
2 parents c652d95 + 52e3767
commit 9869e84
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/doc/reference/docbook.build b/doc/reference/docbook.build
@@ -93,7 +93,11 @@
     <!-- 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" />
+        <property name="hhc.path" value="c:\Program Files\HTML Help Workshop" />
+
+	<if test="${not directory::exists(hhc.path)}">
+		<readregistry property="hhc.path" key="SOFTWARE\Microsoft\HTML Help Workshop\InstallDir" hive="CurrentUser" />
+	</if>
     <exec program="${hhc.path}\hhc.exe" commandline="${project.targetdir}\htmlhelp\htmlhelp.hhp" failonerror="false" />
     <!-- cleanup -->