Skip to content

Commit eacca15

Browse files
committed
Add Ivy support.
1 parent ce4034e commit eacca15

4 files changed

Lines changed: 20 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
build
22
dist
3+
lib

build.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0"?>
2-
<project name="SampleJavaProject" default="jar">
2+
<project name="SampleJavaProject" default="jar"
3+
xmlns:ivy="antlib:org.apache.ivy.ant">
4+
35
<!-- Project-specific configuration -->
46
<property name="package" value="sample.java.project"/>
57
<property name="main.class" value="${package}.${ant.project.name}"/>
@@ -15,6 +17,7 @@
1517
<property name="lib.dir" value="lib"/>
1618

1719
<!-- Project classpath -->
20+
<available file="${lib.dir}" property="lib.present"/>
1821
<path id="build.classpath">
1922
<fileset dir="${lib.dir}">
2023
<include name="*.jar"/>
@@ -32,7 +35,12 @@
3235
<mkdir dir="${dist.dir}"/>
3336
</target>
3437

35-
<target name="compile" depends="init"
38+
<target name="resolve" unless="lib.present"
39+
description="Retrieve dependencies with ivy.">
40+
<ivy:retrieve type="jar,bundle"/>
41+
</target>
42+
43+
<target name="compile" depends="init,resolve"
3644
description="Compile all source files.">
3745
<javac srcdir="${src.dir}" destdir="${build.classes.dir}"
3846
optimize="on" debug="on" deprecation="on"
@@ -62,6 +70,7 @@
6270
<target name="clean" description="Delete all generated files.">
6371
<delete dir="${build.dir}"/>
6472
<delete dir="${dist.dir}"/>
73+
<delete dir="${lib.dir}"/>
6574
</target>
6675

6776
<target name="javadoc" description="Generate Javadoc HTML.">
@@ -114,6 +123,7 @@
114123
<classpath>
115124
<pathelement path="${build.classes.dir}"/>
116125
<pathelement path="${test.classes.dir}"/>
126+
<path refid="build.classpath"/>
117127
</classpath>
118128
<batchtest>
119129
<formatter type="brief" usefile="false"/>

ivy.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0"?>
2+
<ivy-module version="2.0">
3+
<info organisation="com.nullprogram" module="Hypernova"/>
4+
<dependencies>
5+
<dependency org="commons-cli" name="commons-cli" rev="1.2"/>
6+
</dependencies>
7+
</ivy-module>

lib/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)