svn commit: r1719077 - in /jmeter/trunk: build.properties build.xml

[se...@apache.org]

Author: sebb
Date: Thu Dec 10 13:01:04 2015
New Revision: 1719077

URL: http://svn.apache.org/viewvc?rev=1719077&view=rev
Log:
Add download task for checkstyle (mainly for use by Jenkins)

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=1719077&r1=1719076&r2=1719077&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Dec 10 13:01:04 2015
@@ -372,3 +372,9 @@ commons-lang.version        = 2.6
 commons-lang.jar            = commons-lang-${commons-lang.version}.jar
 commons-lang.loc            = ${maven2.repo}/commons-lang/commons-lang/${commons-lang.version}
 commons-lang.md5            = 4d5c1693079575b362edf41500630bbd
+
+# Optional for use by checkstyle
+checkstyle-all.version       = 6.13
+checkstyle-all.jar           = checkstyle-${checkstyle-all.version}-all.jar
+checkstyle-all.loc           = http://downloads.sourceforge.net/checkstyle/checkstyle/${checkstyle-all.version}/checkstyle-${checkstyle-all.version}-all.jar?ts=${EPOCHSECONDS}&use_mirror=autoselect
+checkstyle-all.md5           = ac6e1e81d09bcaf4c0c22181e9bda1d9

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1719077&r1=1719076&r2=1719077&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Dec 10 13:01:04 2015
@@ -86,6 +86,10 @@
   <!-- The version of this file -->
   <property name="version.build" value="$Revision$"/>
 
+  <script language="javascript">
+    project.setProperty('EPOCHSECONDS', new Date().getTime());
+  </script>
+
   <property file="build-local.properties"/> <!-- allow local overrides -->
 
    <!-- Findbugs task and target -->
@@ -2898,6 +2902,10 @@ run JMeter unless all the JMeter jars ar
       <process_jarfile jarname="velocity"   dest.dir="${lib.doc}"/>
     </target>
 
+    <target name="_process_checkstyle_jars">
+      <process_jarfile jarname="checkstyle-all"    dest.dir="${lib.opt}"/>
+    </target>
+
     <!-- Update a jar (clean, download, package in one shot.-->
     <target name="update_jar" depends="clean, download_jars, package">
     </target>
@@ -2929,6 +2937,14 @@ run JMeter unless all the JMeter jars ar
       </antcall>
     </target>
 
+    <target name="download_checkstyle">
+      <!-- build.dir may be needed as a temporary work area -->
+     <mkdir dir="${build.dir}" />
+      <antcall target="_process_checkstyle_jars">
+        <param name="_get_file" value="true"/>
+      </antcall>
+    </target>
+
     <target name="_check_exists" if="_check_exists">
         <fail message="Invalid call sequence - file.exists should not be defined" if="file.exists"/>
         <available file="${file}" property="file.exists"/>