--- a/build.xml	Sun Apr 12 18:45:23 2020 -0700
+++ b/build.xml	Tue Apr 14 14:35:04 2020 -0700
@@ -18,7 +18,7 @@
   <env-require name="KOTLIN_HOME"/>
 
   <!-- define the kotlin task -->
-  <property name="kotlin.lib" value="${env.KOTLIN_HOME}/libexec/lib"/>
+  <property name="kotlin.lib" value="${env.KOTLIN_HOME}/lib"/>
   <typedef resource="org/jetbrains/kotlin/ant/antlib.xml"
            classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
@@ -45,6 +45,7 @@
   <property name="work.jar"      value="${basedir}/work.jar"/>
   <property name="lib.home"      value="${basedir}/lib"/>
   <property name="src.home"      value="${basedir}/src"/>
+  <property name="work.home"      value="${basedir}/work"/>
 
   <!-- help message -->
   <target name="help">
@@ -105,7 +106,7 @@
   <!-- for making bundled apps -->
   <macrodef name="bundle">
     <attribute name="type"/>
-    <element name="args"/>
+    <element name="args" optional="true"/>
     <sequential>
       <fx:deploy nativeBundles="@{type}" outdir="${basedir}" outfile="${app.name}"
         signBundle="false">
@@ -131,8 +132,23 @@
     </bundle>
   </target>
 
-  <target name="app" depends="jar" description="Create app bundle.">
-    <bundle type="image"/>
+  <target name="dummywork" description="dummy dir to make javapackager happy">
+    <mkdir dir="${work.home}"/>
+    <copy file="${jar.name}" tofile="${work.home}/${app.name}.jar"/>
+  </target>
+
+  <!-- fx:deploy is broken on Windoze, must run javapackager command -->
+  <target name="app" depends="jar,dummywork" description="Create app bundle.">
+    <exec executable="${env.JRE_HOME}/bin/javapackager">
+      <arg value="-deploy"/>
+      <arg value="-title"/> <arg value="${app.name}"/>
+      <arg value="-appclass"/> <arg value="${app.entry}"/>
+      <arg value="-native"/> <arg value="image"/>
+      <arg value="-name"/> <arg value="${app.name}"/>
+      <arg value="-outdir"/> <arg value="."/>
+      <arg value="-outfile"/> <arg value="${app.name}"/>
+      <arg value="-srcdir"/> <arg value="${work.home}"/>
+    </exec>
   </target>
 
   <target name="rpm" depends="jar" description="Create RPM package.">