1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
Index: com.zwitserloot.cmdreader-1/build.xml
===================================================================
--- com.zwitserloot.cmdreader-1.orig/build.xml
+++ com.zwitserloot.cmdreader-1/build.xml
@@ -19,7 +19,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
-<project name="com.zwitserloot.cmdreader" default="dist" xmlns:ivy="antlib:com.zwitserloot.ivyplusplus">
+<project name="com.zwitserloot.cmdreader" default="dist" xmlns:ivy="antlib:org.apache.ivy.ant">
<description>
com.zwitserloot.cmdreader is a library to read command line arguments for java.
To use it, first build a class containing fields, with each field representing a command line option.
@@ -62,7 +62,7 @@ and finally call CmdReader.of(ThatClass.
<target name="ensure-ipp" depends="load-ipp, checkver-ipp" />
- <target name="config-ivy" depends="ensure-ipp" unless="ivy.config">
+ <target name="config-ivy" unless="ivy.config">
<ivy:configure file="buildScripts/ivysettings.xml" />
<property name="ivy.config" value="true" />
</target>
@@ -105,20 +105,20 @@ and finally call CmdReader.of(ThatClass.
<target name="compile" depends="ensureBuildDeps" description="Compiles program code">
<mkdir dir="build/prog" />
- <ivy:compile destdir="build/prog" target="1.5" source="1.5">
+ <javac destdir="build/prog" target="1.5" source="1.5">
<src path="src" />
<classpath refid="build.path" />
- </ivy:compile>
+ </javac>
</target>
<target name="compileTests" depends="compile, ensureTestDeps" description="Compiles test code">
- <ivy:compile destdir="build/tests" source="1.5" target="1.5">
+ <javac destdir="build/tests" source="1.5" target="1.5">
<src path="test" />
<classpath refid="test.path" />
<classpath>
<pathelement path="build/prog" />
</classpath>
- </ivy:compile>
+ </javac>
</target>
<target name="dist" depends="compile, -test.quiet, -test, javadoc" description="Creates the distributable">
|
