diff build.xml @ 57:c6cccbe2f393

Port to OpenJDK 15 (mostly done).
author David Barts <n5jrn@me.com>
date Wed, 23 Mar 2022 23:56:29 -0700
parents b1198e4bec25
children 8b707fa0a4fc
line wrap: on
line diff
--- a/build.xml	Sat Mar 19 23:04:40 2022 -0700
+++ b/build.xml	Wed Mar 23 23:56:29 2022 -0700
@@ -23,24 +23,14 @@
            classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
   <!-- define the package-building tasks -->
-  <taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
+  <!-- <taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
            uri="javafx:com.sun.javafx.tools.ant"
-           classpath="${env.JRE_HOME}/lib/ant-javafx.jar"/>
-
-  <!-- cribbed from https://stackoverflow.com/questions/7129672/uppercase-lowercase-capitalize-an-ant-property -->
-  <scriptdef language="javascript" name="toLowerCase">
-    <attribute name="value" />
-    <attribute name="target" />
-    <![CDATA[
-      project.setProperty( attributes.get( "target" ),
-                           attributes.get( "value" ).toLowerCase() );
-    ]]>
-  </scriptdef>
+           classpath="${env.JRE_HOME}/lib/ant-javafx.jar"/> -->
 
   <!-- Define the properties used by the build -->
   <property name="app.name"      value="${ant.project.name}"/>
   <property name="app.entry"     value="name.blackcap.clipman.MainKt"/>
-  <toLowerCase target="lc.app.name" value="${app.name}"/>
+  <property name="lc.app.name"   value="clipman"/>
   <property name="jar.name"      value="${basedir}/${lc.app.name}.jar"/>
   <property name="work.jar"      value="${basedir}/work.jar"/>
   <property name="lib.home"      value="${basedir}/lib"/>
@@ -86,6 +76,7 @@
   <target name="compile" depends="classpath"
           description="Compile Java sources to ${work.home}">
     <kotlinc src="${src.home}" output="${work.jar}"
+             noStdlib="false" includeRuntime="true"
              classpathref="compile.classpath">
       <compilerarg line="-jvm-target 1.8"/>
     </kotlinc>