Changeset 3259

Timestamp:

Apr 20, 2007, 3:27:48 PM (16 years ago)

Author:

Martin Svensson

Message:

References #536. Set SVN to ignore the generated helptext file.
Helptexts-import file is now generated at the same time as the chunked html-files

Location:

trunk

Files:

• build.xml (modified) (5 diffs)
• data (modified) (1 prop)

trunk/build.xml

@@ -255 +255 @@
       It will be included in the 'doc' target in the future."
   />
-  
-  <target 
-    name="helptext"
-    depends="dev.init, doc.helptext"
-    description="Generate import file with helptexts from the docbook documentation."
-  />
-
   
   <!-- init targets -->
@@ -1025 +1018 @@
   <target 
     name="doc.docbook.html"
-    depends="dev.init,doc.init"
+    depends="dev.init,doc.init,xsltprocessor"
     >
     <mkdir dir="${doc}/docbook/html" />
@@ -1065 +1058 @@
       <fileset dir="${doc}/docbook/html" defaultexcludes="no" />
     </delete>
+    <delete file="data/helptexts.xml" />
   <ant antfile="${lib}/docbook/ant-build-docbook.xml" inheritall="false" target="html.chunked">
       <property name="ant.docbook.styler.dir" location="${lib}/docbook" />
@@ -1073 +1067 @@
       <property name="base.version" value="${base.version}"/>
     </ant>
+    
+    <property name="catalog.location" location="${lib}/docbook/preprocess/catalog.xml" />
+    <path id="ant-extensions">
+        <fileset dir="${lib}/docbook/ant-extensions" includes="**/*.jar" />
+        <pathelement path="${lib}/docbook/ant-extensions" />
+      </path>
+    
+    <xmlcatalog id="dtdcatalog">
+          <catalogpath>
+              <fileset file="${catalog.location}"/>
+          </catalogpath>
+      </xmlcatalog>
+
+      <style
+          in      = "${build}/docbook/docbook-ready-file.tmp"
+          style   = "${lib}/docbook/preprocess/webclient_helptext.xsl"
+          out     = "data/helptexts.xml"
+          processor = "${xslt.processor}"
+          >
+          <xmlcatalog refid="dtdcatalog"/>
+          <classpath refid="ant-extensions" />
+
+          <param name="xsltproc.catalog" expression="${catalog.location}" />
+          <param name="xsltproc.option.--nonet"  expression="" />
+      </style>
+
+    <replaceregexp 
+      file="data/helptexts.xml"
+      match="&lt;(?!/?name|/?description|/?helpitem|/?helptexts)(/?([a-z]+)[^>]*)&gt;"
+      replace="&amp;lt;\$1&amp;gt;"
+      flags="sg"
+    />
   </target>
   
@@ -1106 +1132 @@
     </copy>
   </target>
-  
-  <target 
-    name="doc.helptext"
-    depends="doc.docbook.html, xsltprocessor"
-    description="Generate a import file with helptexts for the webclient"
-    >   
-    <delete file="${build}/docbook/helptext_docbook.xml"/>  
-    <property name="catalog.location" location="${lib}/docbook/preprocess/catalog.xml" />
-    <path id="ant-extensions">
-        <fileset dir="${lib}/docbook/ant-extensions" includes="**/*.jar" />
-        <pathelement path="${lib}/docbook/ant-extensions" />
-      </path>
-    
-    <xmlcatalog id="dtdcatalog">
-          <catalogpath>
-              <fileset file="${catalog.location}"/>
-          </catalogpath>
-      </xmlcatalog>
-
-      <style
-          in      = "${build}/docbook/docbook-ready-file.tmp"
-          style   = "${lib}/docbook/preprocess/webclient_helptext.xsl"
-          out     = "${build}/docbook/helptext_docbook.xml"
-          processor = "${xslt.processor}"
-          >
-          <xmlcatalog refid="dtdcatalog"/>
-          <classpath refid="ant-extensions" />
-
-          <param name="xsltproc.catalog" expression="${catalog.location}" />
-          <param name="xsltproc.option.--nonet"  expression="" />
-      </style>
-
-    <replaceregexp 
-      file="${build}/docbook/helptext_docbook.xml"
-      match="&lt;(?!/?name|/?description|/?helpitem|/?helptexts)(/?([a-z]+)[^>]*)&gt;"
-      replace="&amp;lt;\$1&amp;gt;"
-      flags="sg"
-    />
-    
-  </target>
-  
+
   <target name="xsltprocessor">
       <property environment="env"/>