jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1682749 - /jmeter/trunk/build.xml
Date Sun, 31 May 2015 17:03:10 GMT
Author: sebb
Date: Sun May 31 17:03:09 2015
New Revision: 1682749

URL: http://svn.apache.org/r1682749
Log:
Don't include Javadoc files in html fixes for docs-site

Modified:
    jmeter/trunk/build.xml

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1682749&r1=1682748&r2=1682749&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun May 31 17:03:09 2015
@@ -2320,10 +2320,15 @@ run JMeter unless all the JMeter jars ar
     <copy todir="${dest.docs}/css">
       <fileset dir="${src.css}"/>
     </copy>
+  	<!-- 
+  	Note: it's vital that the Javadoc files are excluded from any fixes applied here.
+  	Any fixes to Javadoc files need to be done in the docs-api target only.
+  	Otherwise the output from the build will depend on which is done first.
+  	-->
     <echo level="info">Fixing EOL</echo>
     <fixcrlf encoding="iso-8859-1" srcdir="${dest.docs}/" includes="**/*.html" excludes="api/**"
fixlast="false"/>
     <echo level="info">Removing unnecessary &lt;/br> tags</echo>
-    <replace encoding="iso-8859-1" dir="${dest.docs}/" includes="**/*.html" token="&lt;/br>"
value=""/>
+    <replace encoding="iso-8859-1" dir="${dest.docs}/" includes="**/*.html" excludes="api/**"
token="&lt;/br>" value=""/>
     <copy todir="${dest.docs}/demos">
       <fileset dir="${src.demos}"/>
     </copy>



Mime
View raw message