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

Rename package jet -> kotlin in ant

Browse Source 
org.jetbrains.jet.buildtools.ant -> org.jetbrains.kotlin.ant

The old antlib.xml is kept for migration purposes
This commit is contained in:
Alexander Udalov
2015-01-03 13:33:56 +03:00
parent b5c7f885a8
commit fad40ac11e
41 changed files with 93 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml
+5 -13
View File
@@ -1,15 +1,7 @@
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <!-- NOTE: this Antlib is deprecated. Use org/jetbrains/kotlin/ant/antlib.xml instead -->
<!-- http://evgeny-goldin.org/javadoc/ant/Types/antlib.html --> <!-- TODO: delete this file -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<antlib> <antlib>
<taskdef <taskdef name="kotlinc" classname="org.jetbrains.kotlin.ant.Kotlin2JvmTask"/>
name = "kotlinc" <taskdef name="kotlin2js" classname="org.jetbrains.kotlin.ant.Kotlin2JsTask"/>
classname = "org.jetbrains.jet.buildtools.ant.Kotlin2JvmTask"/> <typedef name="withKotlin" classname="org.jetbrains.kotlin.ant.KotlinCompilerAdapter"/>
<taskdef
name = "kotlin2js"
classname = "org.jetbrains.jet.buildtools.ant.Kotlin2JsTask"/>
<typedef
name = "withKotlin"
classname = "org.jetbrains.jet.buildtools.ant.KotlinCompilerAdapter"/>
</antlib> </antlib>
ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt → ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2014 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.buildtools.ant package org.jetbrains.kotlin.ant
import org.apache.tools.ant.types.Path import org.apache.tools.ant.types.Path
import java.io.File import java.io.File
ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt → ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2014 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.buildtools.ant package org.jetbrains.kotlin.ant
import org.apache.tools.ant.types.Path import org.apache.tools.ant.types.Path
import org.apache.tools.ant.types.Reference import org.apache.tools.ant.types.Reference
ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java → ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.java
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2013 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.buildtools.ant; package org.jetbrains.kotlin.ant;
import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Javac; import org.apache.tools.ant.taskdefs.Javac;
ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt → ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2014 JetBrains s.r.o. * Copyright 2010-2015 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.jet.buildtools.ant package org.jetbrains.kotlin.ant
import org.apache.tools.ant.Task import org.apache.tools.ant.Task
import org.apache.tools.ant.types.Path import org.apache.tools.ant.types.Path
ant/src/org/jetbrains/kotlin/ant/antlib.xml
+5
View File
@@ -0,0 +1,5 @@
<antlib>
<taskdef name="kotlinc" classname="org.jetbrains.kotlin.ant.Kotlin2JvmTask"/>
<taskdef name="kotlin2js" classname="org.jetbrains.kotlin.ant.Kotlin2JsTask"/>
<typedef name="withKotlin" classname="org.jetbrains.kotlin.ant.KotlinCompilerAdapter"/>
</antlib>
compiler/testData/integration/ant/js/additionalArguments/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/hello.kt" noStdlib="true" output="${temp}/out.js"> <kotlin2js src="${test.data}/hello.kt" noStdlib="true" output="${temp}/out.js">
compiler/testData/integration/ant/js/bothPrefixAndPostfix/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" <kotlin2js src="${test.data}/root1"
compiler/testData/integration/ant/js/manySources/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" > <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" >
compiler/testData/integration/ant/js/noOutputParam/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1"/> <kotlin2js src="${test.data}/root1"/>
compiler/testData/integration/ant/js/noSrcParam/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js output="${temp}/out.js"/> <kotlin2js output="${temp}/out.js"/>
compiler/testData/integration/ant/js/outputPostfix/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" outputPostfix="${test.data}/postfix" /> <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" outputPostfix="${test.data}/postfix" />
compiler/testData/integration/ant/js/outputPrefix/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" outputPrefix="${test.data}/prefix" /> <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" outputPrefix="${test.data}/prefix" />
compiler/testData/integration/ant/js/simple/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"/> <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js"/>
compiler/testData/integration/ant/js/simpleWithMain/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" main="call"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" main="call"/>
compiler/testData/integration/ant/js/simpleWithMainFQArgs/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/> <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
compiler/testData/integration/ant/js/simpleWithStdlib/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"/>
compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<property name="library.path" value="${test.data}/jslib-example.jar"/> <property name="library.path" value="${test.data}/jslib-example.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<property name="library.path" value="${test.data}/jslib-example"/> <property name="library.path" value="${test.data}/jslib-example"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call"> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
compiler/testData/integration/ant/js/simpleWithVarargMain/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/> <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call"/>
compiler/testData/integration/ant/js/sourcemap/build.log.expected → compiler/testData/integration/ant/js/sourceMap/build.log.expected
View File
compiler/testData/integration/ant/js/sourcemap/build.xml → compiler/testData/integration/ant/js/sourceMap/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" sourcemap="true"/> <kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" sourcemap="true"/>
compiler/testData/integration/ant/js/sourcemap/root1/foo.kt → compiler/testData/integration/ant/js/sourceMap/root1/foo.kt
View File
compiler/testData/integration/ant/js/suppressWarnings/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" nowarn="true"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" nowarn="true"/>
compiler/testData/integration/ant/js/verbose/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" verbose="true"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" verbose="true"/>
compiler/testData/integration/ant/js/version/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" printVersion="true"/> <kotlin2js src="${test.data}/root1" output="${temp}/out.js" noStdlib="true" printVersion="true"/>
compiler/testData/integration/ant/jvm/additionalArguments/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar"> <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar">
compiler/testData/integration/ant/jvm/externalAnnotations/build.xml
+18 -18
View File
@@ -1,23 +1,23 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<path id="classpath"> <path id="classpath">
<fileset dir="${idea.sdk}/lib" includes="annotations.jar"/> <fileset dir="${idea.sdk}/lib" includes="annotations.jar"/>
<fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/> <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
</path> </path>
<typedef name = "withKotlin" classname = "org.jetbrains.jet.buildtools.ant.KotlinCompilerAdapter"/> <typedef name="withKotlin" classname="org.jetbrains.kotlin.ant.KotlinCompilerAdapter"/>
<target name="build"> <target name="build">
<delete dir="${temp}/classes" failonerror="false"/> <delete dir="${temp}/classes" failonerror="false"/>
<mkdir dir="${temp}/classes"/> <mkdir dir="${temp}/classes"/>
<javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1"> <javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1">
<classpath refid="classpath"/> <classpath refid="classpath"/>
<withKotlin externalannotations="${test.data}/root1/b/"> <withKotlin externalannotations="${test.data}/root1/b/">
<externalannotations path="${test.data}/root1/a/" /> <externalannotations path="${test.data}/root1/a/"/>
</withKotlin> </withKotlin>
</javac> </javac>
<jar destfile="${temp}/hello.jar"> <jar destfile="${temp}/hello.jar">
<fileset dir="${temp}/classes"/> <fileset dir="${temp}/classes"/>
</jar> </jar>
</target> </target>
</project> </project>
compiler/testData/integration/ant/jvm/helloWorld/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar"/> <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar"/>
compiler/testData/integration/ant/jvm/javacCompiler/build.xml
+8 -8
View File
@@ -1,18 +1,18 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<path id="classpath"> <path id="classpath">
<fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/> <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
</path> </path>
<target name="build"> <target name="build">
<delete dir="${temp}/classes" failonerror="false"/> <delete dir="${temp}/classes" failonerror="false"/>
<mkdir dir="${temp}/classes"/> <mkdir dir="${temp}/classes"/>
<javac destdir="${temp}/classes" includeantruntime="false" compiler="org.jetbrains.jet.buildtools.ant.KotlinCompilerAdapter"> <javac destdir="${temp}/classes" includeantruntime="false" compiler="org.jetbrains.kotlin.ant.KotlinCompilerAdapter">
<src path="${test.data}/root1"/> <src path="${test.data}/root1"/>
<classpath refid="classpath"/> <classpath refid="classpath"/>
</javac> </javac>
<jar destfile="${temp}/hello.jar"> <jar destfile="${temp}/hello.jar">
<fileset dir="${temp}/classes"/> <fileset dir="${temp}/classes"/>
</jar> </jar>
</target> </target>
</project> </project>
compiler/testData/integration/ant/jvm/jvmClasspath/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar"/> <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar"/>
compiler/testData/integration/ant/jvm/kotlinCompiler/build.xml
+19 -19
View File
@@ -1,24 +1,24 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<path id="classpath"> <path id="classpath">
<fileset dir="${idea.sdk}/lib" includes="annotations.jar"/> <fileset dir="${idea.sdk}/lib" includes="annotations.jar"/>
<fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/> <fileset dir="${kotlin.home}" includes="kotlin-runtime.jar"/>
</path> </path>
<taskdef name = "kotlinc" classname = "org.jetbrains.jet.buildtools.ant.Kotlin2JvmTask"/> <taskdef name="kotlinc" classname="org.jetbrains.kotlin.ant.Kotlin2JvmTask"/>
<target name="build"> <target name="build">
<delete dir="${temp}/classes" failonerror="false"/> <delete dir="${temp}/classes" failonerror="false"/>
<mkdir dir="${temp}/classes"/> <mkdir dir="${temp}/classes"/>
<kotlinc output="${temp}/classes" src="${test.data}/root1" externalannotations="${test.data}/root1/b/"> <kotlinc output="${temp}/classes" src="${test.data}/root1" externalannotations="${test.data}/root1/b/">
<classpath refid="classpath"/> <classpath refid="classpath"/>
<externalannotations path="${test.data}/root1/a/" /> <externalannotations path="${test.data}/root1/a/"/>
</kotlinc> </kotlinc>
<javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1"> <javac destdir="${temp}/classes" includeAntRuntime="false" srcdir="${test.data}/root1">
<classpath refid="classpath"/> <classpath refid="classpath"/>
</javac> </javac>
<jar destfile="${temp}/hello.jar"> <jar destfile="${temp}/hello.jar">
<fileset dir="${temp}/classes"/> <fileset dir="${temp}/classes"/>
</jar> </jar>
</target> </target>
</project> </project>
compiler/testData/integration/ant/jvm/manySourceRoots/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlinc output="${temp}/hello.jar"> <kotlinc output="${temp}/hello.jar">
compiler/testData/integration/ant/jvm/suppressWarnings/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" nowarn="true" /> <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" nowarn="true" />
compiler/testData/integration/ant/jvm/verbose/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" verbose="true" /> <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" verbose="true" />
compiler/testData/integration/ant/jvm/version/build.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Ant Task Test" default="build"> <project name="Ant Task Test" default="build">
<taskdef resource="org/jetbrains/jet/buildtools/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/> <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
<target name="build"> <target name="build">
<kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" printVersion="true" /> <kotlinc src="${test.data}/hello.kt" output="${temp}/hello.jar" printVersion="true" />
docs/confluence.jetbrains.com/Kotlin/40702623_Kotlin+Build+Tools.confluence
+1 -1
View File
@@ -8,7 +8,7 @@ One way to define Ant's {{*<kotlinc>*}} task is by using your local Kotlin setup
{code:xml} {code:xml}
<property environment="env"/> <property environment="env"/>
<taskdef resource = "org/jetbrains/jet/buildtools/ant/antlib.xml"> <taskdef resource = "org/jetbrains/kotlin/ant/antlib.xml">
<classpath> <classpath>
<fileset dir = "${env.KOTLIN_HOME}/lib" includes = "*.jar"/> <fileset dir = "${env.KOTLIN_HOME}/lib" includes = "*.jar"/>
</classpath> </classpath>