diff options
| author | Sven Gothel <[email protected]> | 2010-05-12 00:23:09 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-05-12 00:23:09 +0200 |
| commit | e7188b0711f0a46c1d0ffec5668467f603a859df (patch) | |
| tree | 90a99302a37ce92fc8c3f3e82bbd2aaf8754f1d8 /make/build.xml | |
| parent | eb33345f2bf83f35fa9c425f9d23a5f0a7107983 (diff) | |
Put junit.jar 4.8.2, antlr.jar 2.7.7 into make/lib, and use it as the default, if not specified otherwise in /home/sven/gluegen.properties
Diffstat (limited to 'make/build.xml')
| -rwxr-xr-x | make/build.xml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml index c49c714..722e601 100755 --- a/make/build.xml +++ b/make/build.xml @@ -22,10 +22,6 @@ <!-- This is the version of GlueGen you are building --> <property name="gluegen_base_version" value="1.0-beta07"/> - <!-- On jpackage.org-compatible systems, antlr.jar can be found in /usr/share/java --> - <available property="antlr.jar" file="/usr/share/java/antlr.jar" - value="/usr/share/java/antlr.jar"/> - <import file="gluegen-cpptasks.xml" /> <condition property="rootrel.build" value="build"> @@ -653,7 +649,7 @@ <javac destdir="${build}/test/build/classes" failonerror="false" source="1.5" srcdir="${gluegen.root}/test/junit" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"> - <classpath path="${gluegen.root}/make/lib/junit-4.5.jar:${build}/classes:${build}/test/gensrc/java:${tools.jar}:${ant.core.lib}"/> + <classpath path="${junit.jar}:${build}/classes:${build}/test/gensrc/java:${tools.jar}:${ant.core.lib}"/> </javac> <junit forkmode="once" showoutput="true" fork="true"> @@ -671,7 +667,7 @@ <formatter usefile="true" type="xml"/> </batchtest> <classpath> - <path path="${build}/test/build/classes:${build}/test/gensrc/java:${build}/classes:${antlr.jar}:${gluegen.root}/make/lib/junit-4.5.jar:${tools.jar}:${ant.core.lib}"/> + <path path="${build}/test/build/classes:${build}/test/gensrc/java:${build}/classes:${antlr.jar}:${junit.jar}:${tools.jar}:${ant.core.lib}"/> </classpath> </junit> </target> |