Removing cruft

diff --git a/xsl/webhelp/build.properties b/xsl/webhelp/build.properties
index 2f070d2c5dc5c6a2c26a9b12a5934c423431fdb7..348d1593ad6e4e779606fe71fb1226cfe911cc65 100755 (executable)
--- a/xsl/webhelp/build.properties
+++ b/xsl/webhelp/build.properties
@@ -1,3 +1,4 @@
+
 # The path (relative to the build.xml file) to your input document.
 # To use your own input document, create a build.xml file of your own
 # and import this build.xml.
@@ -24,16 +25,11 @@ stylesheet-path=${ant.file.dir}/xsl/webhelp.xsl
 #input-images-basedir=/path/to/image/location
 
 # Modify this so that it points to your copy of the Saxon 6.5 jar.
-xslt-processor-classpath=/usr/share/java/saxon.jar
-
-# 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.
-# Better yet, you can list the DTD's catalog file in your
-# CatalogManager.properties file.
-docbookx.dtd=c:/workhead/export/DocBookDTD/4.5/docbookx.dtd
-validate=true
+xslt-processor-classpath=/usr/share/java/saxon-6.5.5.jar
+
+# For non-ns version only, this validates the document 
+# against a dtd.
+validate-against-dtd=true
 
 # Set this to false if you don't need a search tab.
 webhelp.include.search.tab=true

diff --git a/xsl/webhelp/build.xml b/xsl/webhelp/build.xml
index fd1326bf5546913f037a6d0a9eff5159a322a866..9148146eaa990203cc2f72e10ec150559df2041e 100755 (executable)
--- a/xsl/webhelp/build.xml
+++ b/xsl/webhelp/build.xml
@@ -4,13 +4,6 @@
   <loadproperties srcFile="${ant.file.dir}/build.properties"/>
   <property name="webhelp.include.search.tab" value="true"/>
 
-  <xmlcatalog id="catalog">
-       <catalogpath>
-         <pathelement location="${docbook-xsl-catalog}"/>
-       </catalogpath>
-       <dtd publicId="-//OASIS//DTD DocBook XML V4.5//EN" location="${docbookx.dtd}"/>
-  </xmlcatalog>
-
   <property environment="env"/>
   <property name="ant.jar" value="${env.ANT_HOME}/lib/ant.jar"/>
 
@@ -21,17 +14,15 @@
         <pathelement path="${ant.jar}"/>  
     </path>
 
-  <condition property="perform-validation">
-       <equals arg1="${validate}" arg2="true"/>
+  <condition property="perform-validation-dtd">
+       <equals arg1="${validate-against-dtd}" arg2="true"/>
   </condition>
   <condition property="do-search-indexing">
        <equals arg1="${webhelp.include.search.tab}" arg2="true"/>
   </condition>
 
-  <target name="validate" if="perform-validation">
-       <xmlvalidate file="${input-xml}" classname="org.apache.xerces.parsers.SAXParser">
-         <xmlcatalog refid="catalog"/>
-       </xmlvalidate>
+  <target name="validate" if="perform-validation-dtd">
+    <xmlvalidate file="${input-xml}" classname="org.apache.xerces.parsers.SAXParser"/>
   </target>
 
   <target name="chunk" depends="clean">
@@ -43,7 +34,6 @@
          style="${stylesheet-path}"
          scanincludeddirectories="false"
          classpath="${xslt-processor-classpath}">
-         <xmlcatalog refid="catalog"/>
          <param name="webhelp.include.search.tab" expression="${webhelp.include.search.tab}"
                if="webhelp.include.search.tab"/>
          <param name="output_file_name" expression="${output_file_name}"/>
@@ -132,70 +122,18 @@
 
   </target>
 
-  <target name="zip" depends="build-indexer,webhelp">
-
-       <!--xslt
-         in="${ant.file.dir}/xsl/webhelp-common.xsl"
-         out="${ant.file.dir}/xsl/profile-webhelp-common.xsl"
-         force="yes"
-         style="${ant.file.dir}/../profiling/xsl2profile.xsl"
-         classpath="${xslt-processor-classpath}">
-         <xmlcatalog refid="catalog"/>
-       </xslt-->
-
-       <zip destfile="../webhelp-gsoc2010-beta.zip"
-         basedir=".."
-         includes="webhelp/**"/>
-
-  </target>
-
   <target name="clean">
        <delete dir="${output-dir}"/>
   </target>
 
   <target name="help">
-       <echo>Usage:</echo>
-       <echo>webhelp: Generate the document in webhelp format.</echo>
-       <echo>index: Index the content.</echo>
-       <echo>build-indexer: Rebuilds the indexer jar.</echo>
-  </target>
-
-  <target name="create-ns-version" depends="zip">
-
-       <!-- TODO: Prep for profiling, then run xslt over ../profiling/xsl2profile.xsl over webhelp-common.xsl -->
-
-       <exec executable="perl" dir="${ant.file.dir}">
-         <arg line="..\..\releasetools\xslns-build ../webhelp ../webhelp-ns"/>
-       </exec>
-
-       <xslt
-         in="${input-xml}"
-         out="../webhelp-ns/${input-xml}"
-         force="yes"
-         style="${ant.file.dir}/../../docbook/relaxng/tools/db4-upgrade.xsl"
-         classpath="${xslt-processor-classpath}">
-         <xmlcatalog refid="catalog"/>
-       </xslt>
-
-       <replace 
-         file="../webhelp-ns/build.properties" 
-         token="validate=true" 
-         value="validate=false"/> 
-       <replace 
-         file="../webhelp-ns/build.properties" 
-         token="docbook-xsl-1." 
-         value="docbook-xsl-ns-1."/> 
-       <replace 
-         file="../webhelp-ns/xsl/webhelp.xsl" 
-         token="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" 
-         value="http://docbook.sourceforge.net/release/xsl-ns/current/xhtml/chunk.xsl"/> 
-
-       <!-- TODO: Add xinclude step to build? -->
-
-       <zip destfile="../webhelp-ns-gsoc2010-beta.zip"
-         basedir=".."
-         includes="webhelp-ns/**"/>
-
+       <echo>
+Usage:
+webhelp:       Generates the document in webhelp format and indexes the content.
+clean:         Deletes webhelp output directory.
+index:         Indexes the content.
+build-indexer: Rebuilds the indexer jar if necessary (required JDK).
+       </echo>
   </target>
 
 </project>