Author: hibou
Date: Wed Aug 28 21:18:33 2013
New Revision: 1518391
URL: http://svn.apache.org/r1518391
Log:
Improve the build files for adhoc tests
Added:
ant/sandbox/antdsl/branches/import-experiment/test/ant-antunit-1.2-patched.bnd
- copied unchanged from r1385264,
ant/sandbox/antdsl/branches/import-experiment/test/ant-antunit-1.2.bnd
Removed:
ant/sandbox/antdsl/branches/import-experiment/test/ant-antunit-1.2.bnd
Modified:
ant/sandbox/antdsl/branches/import-experiment/test/ant/ivy-fixed.xml
ant/sandbox/antdsl/branches/import-experiment/test/build.xml
Modified: ant/sandbox/antdsl/branches/import-experiment/test/ant/ivy-fixed.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/test/ant/ivy-fixed.xml?rev=1518391&r1=1518390&r2=1518391&view=diff
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/test/ant/ivy-fixed.xml
(original)
+++ ant/sandbox/antdsl/branches/import-experiment/test/ant/ivy-fixed.xml Wed
Aug 28 21:18:33 2013
@@ -2,9 +2,9 @@
<ivy-module version="2.0">
<info organisation="org.apache.ant.antdsl"
module="test-build"
- revision="[email protected]"
+ revision="[email protected]"
status="integration"
- publication="20120829210819"
+ publication="20120922143732"
/>
<configurations>
<conf name="default" visibility="public"/>
Modified: ant/sandbox/antdsl/branches/import-experiment/test/build.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antdsl/branches/import-experiment/test/build.xml?rev=1518391&r1=1518390&r2=1518391&view=diff
==============================================================================
--- ant/sandbox/antdsl/branches/import-experiment/test/build.xml (original)
+++ ant/sandbox/antdsl/branches/import-experiment/test/build.xml Wed Aug 28
21:18:33 2013
@@ -1,13 +1,27 @@
<project xmlns:ivy="antlib:org.apache.ivy.ant">
<target name="get-bnd">
- <get src="http://dl.dropbox.com/u/2590603/bnd/biz.aQute.bnd.jar";
dest="biz.aQute.bnd-1.50.0.jar" />
+ <get src="http://dl.dropbox.com/u/2590603/bnd/biz.aQute.bnd.jar";
dest="biz.aQute.bnd-1.50.0.jar" skipexisting="true" />
</target>
<target name="build-antunit">
- <taskdef resource="aQute/bnd/ant/taskdef.properties"
classpath="biz.aQute.bnd-1.50.0.jar" />
- <get
src="http://repo1.maven.org/maven2/org/apache/ant/ant-antunit/1.2/ant-antunit-1.2.jar";
dest="ant-antunit-1.2.jar" />
- <bndwrap jars="ant-antunit-1.2.jar"
output="org.apache.ant.antunit-1.2.jar" />
+ <taskdef resource="aQute/bnd/ant/taskdef.properties"
classpath="biz.aQute.bnd-1.50.0.jar" />
+ <get
src="http://repo1.maven.org/maven2/org/apache/ant/ant-antunit/1.2/ant-antunit-1.2.jar";
dest="ant-antunit-1.2.jar" skipexisting="true" />
+ <mkdir dir="ant-antunit" />
+ <unzip src="ant-antunit-1.2.jar" dest="ant-antunit" />
+ <copy file="ant-antunit/org/apache/ant/antunit/antlib.xml"
tofile="antunit-antlib.xml" />
+ <copy file="antunit-antlib.xml"
tofile="ant-antunit/org/apache/ant/antunit/antlib.xml">
+ <filterchain>
+ <tokenfilter>
+ <replacestring from="antlib:org.apache.ant.antunit"
to="ant:current"/>
+ </tokenfilter>
+ </filterchain>
+ </copy>
+ <jar basedir="ant-antunit" destfile="ant-antunit-1.2-patched.jar" />
+ <bndwrap jars="ant-antunit-1.2-patched.jar"
output="org.apache.ant.antunit-1.2.jar" />
+ <delete dir="ant-antunit" />
+ <delete file="antunit-antlib.xml" />
+ <delete file="ant-antunit-1.2-patched.jar" />
</target>
<target name="build-module">
