|
43 | 43 | <target name="retrieve">
|
44 | 44 | <mkdir dir="${lib.dir}"/> <!-- Ensure lib directory exists -->
|
45 | 45 | <ivy:retrieve type="jar,bundle" sync="true" haltonfailure="false" />
|
46 |
| - <ivy:retrieve pattern="${lib.dir}/[artifact]-[revision].[ext]" conf="lib" type="jar,bundle" sync="true"/> |
| 46 | + <ivy:retrieve pattern="${lib.dir}/[artifact]-[revision].[ext]" conf="lib,default" type="jar,bundle" |
| 47 | + sync="true"/> |
47 | 48 | </target>
|
48 | 49 |
|
49 |
| - <path id="classpath"> |
50 |
| - <pathelement path="${bin.dir}" /> |
51 |
| - <pathelement path="${java.class.path}" /> |
52 |
| - <fileset dir="."> |
53 |
| - <include name="ivy/**/*.jar" /> |
54 |
| - <include name="lib/**/*.jar" /> |
55 |
| - <!--include name="stdlib/**/*.jar" /> |
56 |
| - <include name="packagelib/**/*.jar" /--> |
57 |
| - </fileset> |
58 |
| - </path> |
59 |
| - |
60 | 50 | <!-- Target for compiling Java source files -->
|
61 | 51 | <target name="compile">
|
62 | 52 | <mkdir dir="${bin.dir}"/>
|
63 |
| -<!-- <javac srcdir="${src.dir}" destdir="${bin.dir}">--> |
64 |
| -<!-- <classpath>--> |
65 |
| -<!-- <!– Include all JARs from the lib directory (retrieved by Ivy) –>--> |
66 |
| -<!-- <fileset dir="${lib.dir}">--> |
67 |
| -<!-- <include name="*.jar"/>--> |
68 |
| -<!-- </fileset>--> |
69 |
| -<!-- </classpath>--> |
70 |
| -<!-- </javac>--> |
71 |
| - <sequential> |
72 |
| - <!-- Compile the java code from ${src}-@{module} into ${build} --> |
73 |
| - <javac srcdir="${src.dir}" classpathref="classpath" destdir="${bin.dir}" nowarn="false" verbose="no" |
74 |
| - debug="true" debuglevel="lines,vars,source" deprecation="yes" source="1.8" |
75 |
| - target="1.8"> |
76 |
| - <!-- Check for unsafe operations --> |
77 |
| - <compilerarg value="-Xlint:unchecked" /> |
78 |
| - </javac> |
79 |
| - </sequential> |
| 53 | + <javac srcdir="${src.dir}" destdir="${bin.dir}"> |
| 54 | + <classpath> |
| 55 | + <!-- Include all JARs from the lib directory (retrieved by Ivy) --> |
| 56 | + <fileset dir="${lib.dir}"> |
| 57 | + <include name="*.jar"/> |
| 58 | + </fileset> |
| 59 | + </classpath> |
| 60 | + </javac> |
80 | 61 | </target>
|
81 | 62 |
|
82 | 63 | <target name="set-classpath" depends="retrieve, compile">
|
|
0 commit comments