jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1682756 - /jmeter/branches/docs-2.13/build.xml
Date Sun, 31 May 2015 17:41:36 GMT
Author: sebb
Date: Sun May 31 17:41:36 2015
New Revision: 1682756

URL: http://svn.apache.org/r1682756
Log:
Must use force="true" for the xslt tasks otherwise reruns will cause too many & entities
to be replaced

Modified:
    jmeter/branches/docs-2.13/build.xml

Modified: jmeter/branches/docs-2.13/build.xml
URL: http://svn.apache.org/viewvc/jmeter/branches/docs-2.13/build.xml?rev=1682756&r1=1682755&r2=1682756&view=diff
==============================================================================
--- jmeter/branches/docs-2.13/build.xml (original)
+++ jmeter/branches/docs-2.13/build.xml Sun May 31 17:41:36 2015
@@ -2295,21 +2295,22 @@ run JMeter unless all the JMeter jars ar
 
   <target name="docs-site" depends="init-docs" description="Generate browsable HTML documentation
in web-site format.">
     <mkdir dir="${dest.docs}" />
+  	<!-- Must use force="true" for the xslt tasks otherwise reruns will cause too many
&amp; entities to be replaced -->
     <!-- The extending pages are rather out of date (and not linked from elsewhere) -->
     <xslt style="xdocs/stylesheets/website-style.xsl" basedir="${src.docs}" destdir="${dest.docs}"
-      excludes="extending.xml" includes="*.xml">
+      excludes="extending.xml" includes="*.xml" force="true">
       <param name="relative-path" expression="." />
       <param name="subdir" expression="" />
       <param name="year" expression="${year}" />
     </xslt>
     <xslt style="xdocs/stylesheets/website-style.xsl" basedir="${src.docs}/usermanual"
destdir="${dest.docs}/usermanual"
-      includes="*.xml">
+      includes="*.xml" force="true">
       <param name="relative-path" expression=".." />
       <param name="subdir" expression="usermanual" />
       <param name="year" expression="${year}" />
     </xslt>
     <xslt style="xdocs/stylesheets/website-style.xsl" basedir="${src.docs}/localising"
destdir="${dest.docs}/localising"
-      includes="*.xml">
+      includes="*.xml" force="true">
       <param name="relative-path" expression=".." />
       <param name="subdir" expression="usermanual" />
       <param name="year" expression="${year}" />
@@ -2327,6 +2328,7 @@ run JMeter unless all the JMeter jars ar
     -->
     <echo level="info">Fixing EOL</echo>
     <fixcrlf encoding="iso-8859-1" srcdir="${dest.docs}/" includes="**/*.html" excludes="api/**"
fixlast="false"/>
+    <!-- N.B. this is not idempotent, so must use force with xslt tasks -->
     <echo level="info">Remove superfluos &amp;amp;</echo>
     <replace encoding="iso-8859-1" dir="${dest.docs}" includes="**/*.html" excludes="api/**"
token="&amp;amp;" value="&amp;"/>
     <echo level="info">Removing unnecessary &lt;/br> tags</echo>



Mime
View raw message