From: David Cramer <david@thingbag.net>
Date: Mon, 12 Jul 2010 20:49:12 +0000 (+0000)
Subject: Add a switch so that they can omit the search tab. Fix the validate property so it... 
X-Git-Tag: release/1.79.1~6^2~831^2~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc394be173cc1dac20a28c93c5ea224783caefd8;p=docbook-dsssl

Add a switch so that they can omit the search tab. Fix the validate property so it can be set to true or false (rather than needing to to be true or unset).
---

diff --git a/xsl/webhelp/build.properties b/xsl/webhelp/build.properties
index 0c62a35b2..852ad1c34 100755
--- a/xsl/webhelp/build.properties
+++ b/xsl/webhelp/build.properties
@@ -1,14 +1,25 @@
 input-xml=docsrc/readme.xml
 frameset.base.dir=doc
+
+# Modify this so that it points to your copy of the Saxon 6.5 jar.
 xslt-processor-classpath=c:/workhead/export/saxon/6.5/lib/saxon.jar
+
 # To use this catalog, make sure the resolver is in your classpath.
 # Download xml-commons-resolver from http://xml.apache.org/commons/dist/
 # and add it to your CLASSPATH. Then use the following property to point 
 # to your docbook xsl stylesheets' catalog
-#docbook-xsl-catalog=c:/gsoc2010/docbook-xsl-1.75.2/catalog.xml
 docbook-xsl-catalog=/media/DATA/ACADEMIC/GSOC/docbook/repository/docbook/trunk/maven/docbook-xsl/target/xsltmp/docbook-xsl-1.75.2/catalog.xml
+
+# If you wish to have the ant script validate the document before
+# building it, set this property to the location
+# of your DocBook DTD. The sample document is 
+# a DocBook 4.5 document and uncomment the line validate=true.
 docbookx.dtd=file:///media/DATA/ACADEMIC/GSOC/docbook/repository/docbook/trunk/defguide/en/schema/docbookx.dtd
 validate=true
+
+# Set this to true if you don't need a search tab.
+exclude.search.from.chunked.html=false
+
 #indexe-language is used to tell the search indexer which language the docbook is written.
 #This will be used to identify the correct stemmer, and punctuations that differs from language to language.
 #see the documentation for details. en=English, cn=Chinese, jp=Japanese etc. 
diff --git a/xsl/webhelp/build.xml b/xsl/webhelp/build.xml
index e86d1aa83..4ed4f47a8 100755
--- a/xsl/webhelp/build.xml
+++ b/xsl/webhelp/build.xml
@@ -13,7 +13,14 @@
   <property environment="env"/>
   <property name="ant.jar" value="${env.ANT_HOME}/lib/ant.jar"/>
 
-  <target name="validate" if="validate">                            
+  <condition property="perform-validation">
+	<equals arg1="${validate}" arg2="true"/>
+  </condition>
+  <condition property="skip-search-indexing">
+	<equals arg1="${exclude.search.from.chunked.html}" arg2="true"/>
+  </condition>
+
+  <target name="validate" if="perform-validation">                            
 	<xmlvalidate file="${input-xml}">
 	  <xmlcatalog refid="catalog"/>
 	</xmlvalidate>
@@ -33,6 +40,7 @@
 	  <param name="exclude.search.from.chunked.html" expression="${exclude.search.from.chunked.html}" if="exclude.search.from.chunked.html"/>
 	  <param name="output_file_name" expression="${output_file_name}"/>
 	  <param name="frameset.base.dir" expression="${frameset.base.dir}" if="frameset.base.dir"/>
+	  <param name="exclude.search.from.chunked.html" expression="${exclude.search.from.chunked.html}" if="exclude.search.from.chunked.html"/>
 	  <param name="indexer.language" expression="${indexer-language}" if="indexer-language"/>
 	</xslt>
 
@@ -46,7 +54,7 @@
 	</copy>
   </target>
 
-  <target name="index">
+  <target name="index" unless="skip-search-indexing">
 
 	<path id="nw-cms.jar.path">
 	  <pathelement location="${ant.file.dir}/indexer/lib/nw-cms.jar" />