azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed some of the cruft and redundant copies of junit.jar

Browse Source
This commit is contained in:
James Strachan
2012-03-21 09:09:09 +00:00
parent 81294d43ae
commit e740c47e29
9 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/build.xml
+5 -5
View File
@@ -2,7 +2,7 @@
<property name="tests-dir" location="${output}/ant-test/build-tools-test"/>
<property name="tests-jar" location="${tests-dir}/out.jar"/>
<property name="junit-jar" location="${basedir}/libraries/testlib/lib/junit-4.9.jar"/>
<property name="junit-jar" location="${basedir}/libraries/lib/junit-4.9.jar"/>
<property name="failonerror" value="true"/> <!-- Whether invoking compiled classes should file on error -->
<property name="use-ivy" value="false"/> <!-- Whether Ivy should be used to define "kotlin.classpath" and <kotlinc> task -->
<!-- Override with "-Duse-ivy=true" -->
@@ -378,19 +378,19 @@
<macrodef name="testlib-tests">
<sequential>
<!-- Dir => Dir -->
<kotlinc-dir src = "${basedir}/libraries/testlib/test"/>
<kotlinc-dir src = "${basedir}/libraries/stdlib/test"/>
<testlib-junit-tests classpath = "${tests-dir}"/>
<!-- Dir => Jar -->
<kotlinc-jar src = "${basedir}/libraries/testlib/test"/>
<kotlinc-jar src = "${basedir}/libraries/stdlib/test"/>
<testlib-junit-tests classpath = "${tests-jar}"/>
<!-- Module => Explicit Jar -->
<kotlinc-jar module = "${basedir}/libraries/testlib/module.kt"/>
<kotlinc-jar module = "${basedir}/libraries/stdlib/testModule.kt"/>
<testlib-junit-tests classpath = "${tests-jar}"/>
<!-- Module => Default Jar -->
<kotlinc-jar module = "${basedir}/libraries/testlib/module.kt" jar=""/>
<kotlinc-jar module = "${basedir}/libraries/stdlib/testModule.kt" jar=""/>
<move file="${basedir}/libraries/testlib/testlib.jar" todir="${tests-dir}"/>
<testlib-junit-tests classpath = "${tests-dir}/testlib.jar"/>
</sequential>