Author: gtrasuk
Date: Mon Jan 18 21:53:20 2016
New Revision: 1725357
URL: http://svn.apache.org/viewvc?rev=1725357&view=rev
Log:
There's now a little more success in executing the 'hudson-ci' target with the
downloaded dependencies, but signature verification is still not up and
running. Hence the Jenkins jobs that run 'ant verify' will fail. Reason is
that the animal-sniffer signatures are not downloading properly yet.
Modified:
river/jtsk/trunk/ (props changed)
river/jtsk/trunk/build.xml
river/jtsk/trunk/hudson.xml
river/jtsk/trunk/test/ (props changed)
Propchange: river/jtsk/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 18 21:53:20 2016
@@ -12,5 +12,6 @@ LICENSE.txt
doc
le
NOTICE.txt
+dep-libs
netbeans
.*
Modified: river/jtsk/trunk/build.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/build.xml?rev=1725357&r1=1725356&r2=1725357&view=diff
==============================================================================
--- river/jtsk/trunk/build.xml (original)
+++ river/jtsk/trunk/build.xml Mon Jan 18 21:53:20 2016
@@ -241,6 +241,7 @@
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.classes.dir}"/>
<mkdir dir="${build.deps.dir}"/>
+ <mkdir dir="${ivy.jar.dir}"/>
<mkdir dir="${configentry.dir}"/>
<mkdir dir="${lib-dl.dir}"/>
<mkdir dir="${lib-ext.dir}"/>
@@ -556,7 +557,7 @@
</target>
<property name="ivy.install.version" value="2.4.0"/>
- <property name="ivy.jar.dir" value="${build}/lib"/>
+ <property name="ivy.jar.dir" value="dep-libs/ivy"/>
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
<condition property="skip.ivy.download">
<available file="${ivy.jar.file}"/>
@@ -589,7 +590,7 @@
</target>
- <target name="get-dep-libs" depends="install-ivy">
+ <target name="get-dep-libs" depends="prep,install-ivy">
<!-- Let's use Ivy instead... -->
<mkdir dir="dep-libs"/>
<mkdir dir="dep-libs/animal-sniffer"/>
@@ -654,10 +655,13 @@
description="Removes all files and dirs created by the build">
<delete dir="${build.dir}" quiet="true"/>
<delete dir="${configentry.dir}" quiet="true"/>
+ </target>
+
+ <target name="clean-deps">
<delete dir="dep-libs" quiet="true"/>
<delete dir="test/lib" quiet="true"/>
</target>
-
+
<target name="clean-dist"
description="Deletes the distribution directory.">
<delete dir="${dist.dir}" quiet="true"/>
@@ -2269,7 +2273,10 @@
<target name="prep-tests" depends="">
<mkdir dir="${test.classes.dir}"/>
<mkdir dir="${test.results.dir}"/>
- <copy file="dep-libs/high-scale-lib/*.jar" todir="test/lib"/>
+ <copy todir="test/lib">
+ <fileset dir="dep-libs/high-scale-lib" includes="*.jar"/>
+ </copy>
+
</target>
<target name="clean-tests" depends="">
Modified: river/jtsk/trunk/hudson.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/hudson.xml?rev=1725357&r1=1725356&r2=1725357&view=diff
==============================================================================
--- river/jtsk/trunk/hudson.xml (original)
+++ river/jtsk/trunk/hudson.xml Mon Jan 18 21:53:20 2016
@@ -19,6 +19,10 @@
<project name="hudson" basedir="."
xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" >
+ <ant>
+ <target name="get-dep-libs"/>
+ </ant>
+
<target name="verify" depends="river-runtime,verify-15-sun"
description="River-verify entry">
</target>
@@ -43,6 +47,8 @@
<target name="river-runtime" >
<ant>
<target name="clean" />
+ </ant>
+ <ant>
<target name="river-runtime" />
</ant>
</target>
Propchange: river/jtsk/trunk/test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 18 21:53:20 2016
@@ -1,2 +1,3 @@
+lib
classes
results
