|
|
@@ -44,6 +44,9 @@
|
|
|
<property name="ivy.jar" value="${ant.lib}/ivy.jar"/>
|
|
|
<property name="ivy.dep.file" value="${ant.conf.dir}/ivy.xml" />
|
|
|
<available property="ivy.installed" file="${ivy.jar}"/>
|
|
|
+
|
|
|
+ <property name="kotlin.lib" value="/opt/kotlinc/lib" />
|
|
|
+ <typedef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
|
|
|
|
|
|
<target name="help" description="Display build help">
|
|
|
<echo>iEat v${build.version}</echo>
|
|
|
@@ -118,7 +121,7 @@
|
|
|
description="Compile server source files">
|
|
|
<mkdir dir="${target.dir.server}"/>
|
|
|
<javac srcdir="${source.dir.java}"
|
|
|
- excludes="name.tflucke.ieat2/client/**"
|
|
|
+ excludes="name/tflucke/ieat2/client/**"
|
|
|
verbose="${compile.verbose}"
|
|
|
destdir="${target.dir.server}"
|
|
|
debug="${compile.debug}"
|
|
|
@@ -130,12 +133,31 @@
|
|
|
target="${build.java.version}"
|
|
|
source="${build.java.version}">
|
|
|
<classpath refid="compile.classpath" />
|
|
|
+ <withKotlin/>
|
|
|
</javac>
|
|
|
+ <!--
|
|
|
+ TF 2019-09-09: May not be nessisary because of withKotlin
|
|
|
+ <kotlinc src="${source.dir.kotlin}"
|
|
|
+ output="${target.dir.server}"
|
|
|
+ nowarn="${compile.nowarn}"
|
|
|
+ classpath="${compile.classpath}">
|
|
|
+ <compilerarg value="-verbose"/>
|
|
|
+ <compilerarg line="-jvm-target ${build.java.version}"/>
|
|
|
+
|
|
|
+ verbose="${compile.verbose}" -verbose
|
|
|
+ deprecation="${compile.deprecation}" -progressive
|
|
|
+ optimize="${compile.optimize}" -Xno-optimize
|
|
|
+ </kotlinc>
|
|
|
+ -->
|
|
|
</target>
|
|
|
|
|
|
<target name="compile.client" depends="ivy.resolve.compile"
|
|
|
description="Compile client source files">
|
|
|
<mkdir dir="${target.dir.client}"/>
|
|
|
+ <kotlin2js src="${source.dir.java}"
|
|
|
+ output="${target.dir.client}/generated.js"
|
|
|
+ nowarn="${compile.nowarn}">
|
|
|
+ </kotlin2js>
|
|
|
</target>
|
|
|
|
|
|
<target name="compile.tests" depends="ivy.resolve.test,compile.server"
|