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

Build tools - "${basedir}/testlib" => "${basedir}/libraries/testlib"

Browse Source
This commit is contained in:
Evgeny Goldin
2012-03-07 21:04:03 +01:00
parent f2135d97cf
commit 710b22debe
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/build.xml
+8 -8
View File
@@ -2,7 +2,7 @@
<property name="tests-dir" location="${output}/ant-test/build-tools-test"/> <property name="tests-dir" location="${output}/ant-test/build-tools-test"/>
<property name="tests-jar" location="${tests-dir}/out.jar"/> <property name="tests-jar" location="${tests-dir}/out.jar"/>
<property name="junit-jar" location="${basedir}/testlib/lib/junit-4.9.jar"/> <property name="junit-jar" location="${basedir}/libraries/testlib/lib/junit-4.9.jar"/>
<property name="failonerror" value="true"/> <!-- Whether invoking compiled classes should file on error --> <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 --> <property name="use-ivy" value="false"/> <!-- Whether Ivy should be used to define "kotlin.classpath" and <kotlinc> task -->
<!-- Override with "-Duse-ivy=true" --> <!-- Override with "-Duse-ivy=true" -->
@@ -61,7 +61,7 @@
<antcall target = "zip"/> <antcall target = "zip"/>
<verify-exists file="${output}/${output.name}.zip" type="file"/> <verify-exists file="${output}/${output.name}.zip" type="file"/>
<delete dir = "${kotlin-home}" failonerror="true"/> <delete dir = "${kotlin-home}" failonerror="false"/>
<mkdir dir = "${kotlin-home}"/> <mkdir dir = "${kotlin-home}"/>
<unzip src = "${output}/${output.name}.zip" dest="${output}"/> <unzip src = "${output}/${output.name}.zip" dest="${output}"/>
@@ -377,20 +377,20 @@
<macrodef name="testlib-tests"> <macrodef name="testlib-tests">
<sequential> <sequential>
<!-- Dir => Dir --> <!-- Dir => Dir -->
<kotlinc-dir src = "${basedir}/testlib/test"/> <kotlinc-dir src = "${basedir}/libraries/testlib/test"/>
<testlib-junit-tests classpath = "${tests-dir}"/> <testlib-junit-tests classpath = "${tests-dir}"/>
<!-- Dir => Jar --> <!-- Dir => Jar -->
<kotlinc-jar src = "${basedir}/testlib/test"/> <kotlinc-jar src = "${basedir}/libraries/testlib/test"/>
<testlib-junit-tests classpath = "${tests-jar}"/> <testlib-junit-tests classpath = "${tests-jar}"/>
<!-- Module => Explicit Jar --> <!-- Module => Explicit Jar -->
<kotlinc-jar module = "${basedir}/testlib/module.kt"/> <kotlinc-jar module = "${basedir}/libraries/testlib/module.kt"/>
<testlib-junit-tests classpath = "${tests-jar}"/> <testlib-junit-tests classpath = "${tests-jar}"/>
<!-- Module => Default Jar --> <!-- Module => Default Jar -->
<kotlinc-jar module = "${basedir}/testlib/module.kt" jar=""/> <kotlinc-jar module = "${basedir}/libraries/testlib/module.kt" jar=""/>
<move file="${basedir}/testlib/testlib.jar" todir="${tests-dir}"/> <move file="${basedir}/libraries/testlib/testlib.jar" todir="${tests-dir}"/>
<testlib-junit-tests classpath = "${tests-dir}/testlib.jar"/> <testlib-junit-tests classpath = "${tests-dir}/testlib.jar"/>
</sequential> </sequential>
</macrodef> </macrodef>
@@ -469,7 +469,7 @@
<hello-tests/> <hello-tests/>
<longer-examples-tests/> <longer-examples-tests/>
<module-tests/> <module-tests/>
<!--<testlib-tests/>--> <testlib-tests/>
<compilation-fail-test/> <compilation-fail-test/>
</target> </target>
</project> </project>