svn commit: r554630 - /jakarta/jmeter/branches/rel-2-2/build.xml

[se...@apache.org]

Author: sebb
Date: Mon Jul  9 06:05:16 2007
New Revision: 554630

URL: http://svn.apache.org/viewvc?view=rev&rev=554630
Log:
Tidy up Javadoc generation

Modified:
    jakarta/jmeter/branches/rel-2-2/build.xml

Modified: jakarta/jmeter/branches/rel-2-2/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.xml?view=diff&rev=554630&r1=554629&r2=554630
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/build.xml Mon Jul  9 06:05:16 2007
@@ -402,18 +402,19 @@
   	    JMeter version
   	    This is overridden for formal releases.
   	-->
-    <property name="jmeter.version" value="2.2.${DSTAMP}"/>
+    <property name="jmeter.version" value="2.3.${DSTAMP}"/>
    	<echo>jmeter.version = ${jmeter.version}</echo>
   </target>
 
-  <!-- Get version from SVN status -->
+  <!-- JMeter Javadoc version (own variable is used so can be overriden independently) -->
+  <property name="docversion" value="2.3"/>
+
+	<!-- Get version from SVN status -->
   <target name="init-svnVersion" depends="svnCheck">
    	<property name="jmeter.version" value="r${svnCheck.revision}"/>
    	<echo>jmeter.version = ${jmeter.version}</echo>
   </target>
 
-  	<!-- JMeter Javadoc version (own variable is used so can be overriden independently) -->
-  <property name="docversion" value="${jmeter.version}"/>
   
   <target name="init-docs" depends="check-anakia,report-anakia-missing">
   	<echo>eclipse.anakia = ${eclipse.anakia}</echo>
@@ -1310,24 +1311,45 @@
     <delete dir="${site.dir}"/>
   </target>
 
-  <target name="docs-api" depends="init-version" description="Generate the API documentation.">
+  <target name="docs-api" description="Generate the API documentation.">
   	<tstamp>
   	  <!-- Used to ensure end-year is up to date -->
       <format property="THISYEAR" pattern="yyyy"/>
     </tstamp>
     <mkdir dir="${dest.docs.api}"/>
-    <javadoc sourcepathref="srcpaths" 
-    additionalparam="-breakiterator" 
-    destdir="${dest.docs.api}" 
-    protected="yes" author="yes" version="yes" 
-       doctitle="Apache JMeter API Specification" 
-    windowtitle="Apache JMeter API Specification" 
-    header="&lt;b&gt;Apache JMeter&lt;/b&gt;&lt;br&gt;&lt;font size='-1'&gt;${docversion}&lt;/font&gt;" bottom="Copyright &#xA9; 1998-${THISYEAR} Apache Software Foundation. All Rights Reserved."
-    packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
-    excludepackagenames="org.apache.jmeter.util.keystore,org.apache.jorphan.timer">
+  	<delete quiet="true">
+  		<fileset dir="${dest.docs.api}" includes="**/*.html"/>
+  	</delete>
+  	<echo level="info">Updating overview to ${docversion}</echo>
+  	<replaceregexp match="version [\d.]+" 
+  		         replace="version ${docversion}" 
+  		         flags="g" byline="true">
+  	   <fileset dir="${src.docs}" includes="overview.html" />
+  	</replaceregexp>
+    <javadoc 
+      sourcepathref="srcpaths" 
+      overview="${src.docs}/overview.html"
+      additionalparam="-breakiterator" 
+      destdir="${dest.docs.api}" 
+      protected="yes" 
+      version="yes" 
+      doctitle="Apache JMeter API" 
+      windowtitle="Apache JMeter API" 
+      header="&lt;b&gt;Apache JMeter&lt;/b&gt;" 
+      bottom="Copyright &#xA9; 1998-${THISYEAR} Apache Software Foundation. All Rights Reserved."
+      packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
+      excludepackagenames="org.apache.jorphan.timer">
       <classpath refid="classpath"/>
-      <link href="http://java.sun.com/products/jdk/1.3/docs/api/"/>
+      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
     </javadoc>
+  	<!-- Remove date/time from generated output (else messes up versioning) -->
+  	<echo level="info">Removing javadoc timestamps</echo>
+  	<replaceregexp match="Generated by javadoc on .*--" 
+  		         replace="Generated by javadoc --" 
+  		         flags="g" byline="true">
+  	   <fileset dir="${dest.docs.api}" includes="**/*.html" />
+  	</replaceregexp>
+
   </target>
 
 <!--



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org