Skip to content
This repository has been archived by the owner on Dec 16, 2022. It is now read-only.

Commit

Permalink
fix #81 no longer need junit jars to compile; removed ant test task
Browse files Browse the repository at this point in the history
  • Loading branch information
taivop committed Oct 17, 2016
1 parent 05f03da commit 44bc1dd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 25 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,7 @@ results/*
tmp/

# R
.Rhistory
.Rhistory

# Old JARs
lib2
29 changes: 5 additions & 24 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
<property name="jarfile" value="${dist.dir}/Middleware-${DSTAMP}.jar"/>

<!-- Set classpaths -->
<path id="test-classpath">
<path id="my-classpath">
<fileset dir="${lib.dir}">
<include name="junit-4.12.jar"/>
<include name="hamcrest-core-1.3.jar"/>
<include name="log4j-core-2.6.2.jar"/>
<include name="log4j-api-2.6.2.jar"/>
</fileset>
Expand All @@ -37,7 +35,8 @@
description="compile the source">
<!-- Compile the java code from ${src} into ${build} -->
<javac srcdir="${src.dir}" destdir="${build.dir}" target="1.7" source="1.7">
<classpath refid="test-classpath"/>
<classpath refid="my-classpath"/>
<exclude name="test/**/"/>
</javac>
</target>

Expand All @@ -51,7 +50,7 @@

<!-- Manifest classpath -->
<manifestclasspath property="manifest.classpath" jarfile="${jarfile}">
<classpath refid="test-classpath"/>
<classpath refid="my-classpath"/>
</manifestclasspath>

<!-- Put everything in ${build} into the JAR file -->
Expand Down Expand Up @@ -81,7 +80,7 @@

<!-- Manifest classpath -->
<manifestclasspath property="manifest.classpath" jarfile="${jarfile}">
<classpath refid="test-classpath"/>
<classpath refid="my-classpath"/>
</manifestclasspath>

<!-- Put everything in ${build} into the jar file -->
Expand All @@ -94,24 +93,6 @@
</jar>
</target>


<target name="test" depends="dist">
<junit>
<classpath>
<pathelement location="${build.dir}" />
<fileset dir="${lib.dir}">
<include name="*.jar" />
</fileset>
</classpath>
<batchtest>
<fileset dir="${build.dir}">
<include name="**/*Test*" />
</fileset>
</batchtest>
<formatter type="brief" usefile="false"/>
</junit>
</target>

<target name="clean"
description="clean up">
<!-- Delete the ${build} and ${dist} directory trees -->
Expand Down
Binary file removed lib/hamcrest-core-1.3.jar
Binary file not shown.
Binary file removed lib/junit-4.12.jar
Binary file not shown.

0 comments on commit 44bc1dd

Please sign in to comment.