You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2013/07/07 11:13:34 UTC
svn commit: r1500390 - in /jmeter/trunk: build.properties build.xml
Author: milamber
Date: Sun Jul 7 09:13:34 2013
New Revision: 1500390
URL: http://svn.apache.org/r1500390
Log:
Get rsyntaxtextarea jar file from official binary zip
Bugzilla Id: 55202
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1500390&r1=1500389&r2=1500390&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Jul 7 09:13:34 2013
@@ -225,8 +225,9 @@ mongo-java-driver.md5 = fed5e6d99825
rsyntaxtextarea.version = 2.0.7
rsyntaxtextarea.jar = rsyntaxtextarea-${rsyntaxtextarea.version}.jar
-# Disabler, please download for http://fifesoft.com/rsyntaxtextarea/
-rsyntaxtextarea.md5 = 00ab3c8ce58bb8bb1dbb3ae506f06d30
+rsyntaxtextarea.loc = http://downloads.sourceforge.net/project/rsyntaxtextarea/rsyntaxtextarea/${rsyntaxtextarea.version}
+rsyntaxtextarea.md5 = d469519149f071f65316a0cf7e5f54da
+rsyntaxtextarea.name = rsyntaxtextarea
slf4j-api.version = 1.7.5
slf4j-api.jar = slf4j-api-${slf4j-api.version}.jar
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1500390&r1=1500389&r2=1500390&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Jul 7 09:13:34 2013
@@ -2881,7 +2881,6 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="junit"/>
<process_jarfile jarname="logkit"/>
<process_jarfile jarname="mongo-java-driver"/>
- <process_jarfile jarname="rsyntaxtextarea"/>
<process_jarfile jarname="serializer"/>
<process_jarfile jarname="slf4j-api"/>
<process_jarfile jarname="soap"/>
@@ -2896,6 +2895,8 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="xmlpull"/>
<process_jarfile jarname="xpp3"/>
<process_jarfile jarname="xstream"/>
+ <!-- special -->
+ <antcall target="_process_rsyntaxtextarea"/>
</target>
<target name="_process_doc_jars">
@@ -2940,6 +2941,41 @@ run JMeter unless all the JMeter jars ar
</antcall>
</target>
+ <!-- Special: process to get RSyntaxTextArea-->
+ <target name="_process_rsyntaxtextarea">
+ <available file="./lib/${rsyntaxtextarea.jar}" property="rsyntaxtextarea.exists"/>
+ <antcall target="_get_rsyntaxtextarea"/>
+ </target>
+
+ <!-- Get RSyntaxTextArea binary zip file, unpack it, pick up jar file and remove the zip -->
+ <target name="_get_rsyntaxtextarea" unless="rsyntaxtextarea.exists">
+ <property name="loc" value="${rsyntaxtextarea.loc}"/>
+ <property name="zip" value="${rsyntaxtextarea.name}_${rsyntaxtextarea.version}.zip"/>
+ <property name="jar" value="${rsyntaxtextarea.name}.jar"/>
+ <property name="md5" value="${rsyntaxtextarea.md5}"/>
+ <property name="path" value="./lib"/>
+ <get src="${loc}/${zip}"
+ dest="${build.dir}/${zip}"
+ usetimestamp="true" ignoreerrors="false"/>
+ <unzip dest="${build.dir}" src="${build.dir}/${zip}">
+ <patternset>
+ <include name="**/${jar}"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+ <antcall target="_checkMD5">
+ <param name="file" value="${build.dir}/${jar}"/>
+ <param name="path" value="${build.dir}"/>
+ <param name="md5" value="${md5}"/>
+ </antcall>
+ <delete>
+ <fileset dir="${path}" includes="${rsyntaxtextarea.name}-*.jar"/>
+ </delete>
+ <move preservelastmodified="true" overwrite="true"
+ file="${build.dir}/${jar}" tofile="${path}/${rsyntaxtextarea.jar}" verbose="true"/>
+ <delete file="${build.dir}/${zip}"/>
+ </target>
+
<target name="checkstyle">
<taskdef resource="checkstyletask.properties"
classpath="${lib.opt}/checkstyle-5.3-all.jar"/>