Author: sebb Date: Sun Mar 14 13:41:26 2010 New Revision: 922843 URL: http://svn.apache.org/viewvc?rev=922843&view=rev Log: Run 3rdparty check later, so still works if called after download_jars
Modified: jakarta/jmeter/trunk/build.xml Modified: jakarta/jmeter/trunk/build.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=922843&r1=922842&r2=922843&view=diff ============================================================================== --- jakarta/jmeter/trunk/build.xml (original) +++ jakarta/jmeter/trunk/build.xml Sun Mar 14 13:41:26 2010 @@ -941,16 +941,18 @@ run JMeter unless all the JMeter jars ar </target> <!-- Check that the 3rd party libraries are present --> - <condition property="3rdparty.present"> - <and> - <!-- No need to check all jars; just check a few --> - <available classpathref="classpath" classname="org.apache.bsf.BSFEngine"/> - <available classpathref="classpath" classname="org.htmlparser.Parser"/> - <available classpathref="classpath" classname="com.thoughtworks.xstream.XStream"/> - </and> - </condition> + <target name="_check_3rdparty"> + <condition property="3rdparty.present"> + <and> + <!-- No need to check all jars; just check a few --> + <available classpathref="classpath" classname="org.apache.bsf.BSFEngine"/> + <available classpathref="classpath" classname="org.htmlparser.Parser"/> + <available classpathref="classpath" classname="com.thoughtworks.xstream.XStream"/> + </and> + </condition> + </target> - <target name="_message_3rdParty" unless="3rdparty.present"> + <target name="_message_3rdParty" depends="_check_3rdparty" unless="3rdparty.present"> <echo>Cannot find all the required 3rd party libraries.</echo> <echo>If building from a release, you can get most of them from the binary archive.</echo> <echo>Use "ant download_jars" to download any missing jars.</echo> @@ -1290,7 +1292,7 @@ run JMeter unless all the JMeter jars ar depends="_gump_properties,clean,install" description="Build JMeter"> <property name="dist.name" value="jakarta-jmeter-${jmeter.version}"/> - <available file="${velocity.jar}" property="3rdparty.present"/> + <available file="${velocity.jar}" property="velocity.present"/> <!-- No need to create the archives for Gump <antcall target="_pack-binaries"/> <antcall target="_pack-libraries"/> @@ -1525,6 +1527,7 @@ run JMeter unless all the JMeter jars ar overview="${src.docs}/overview.html" additionalparam="-breakiterator" destdir="${dest.docs.api}" + verbose="false" protected="yes" version="yes" doctitle="Apache JMeter API" @@ -2040,7 +2043,7 @@ run JMeter unless all the JMeter jars ar </target> <!-- Download jars only needed by Gump (unless already done) --> - <target name="_process_gump_jars" unless="3rdparty.present"> + <target name="_process_gump_jars" unless="velocity.present"> <process_jarfile jarname="excalibur-datasource"/> <process_jarfile jarname="excalibur-instrument"/> <process_jarfile jarname="excalibur-logger"/> --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org