# HG changeset patch
# User davidb
# Date 1587067130 25200
# Node ID 5cac95c17feff1463b9a95c8d2648f19f70b5162
# Parent  cd2ca4727b7f50ea20e3ad3d87df8cc039082bd9
More Windows stuff. Attempts to get Windows packages working.

diff -r cd2ca4727b7f -r 5cac95c17fef ExifWasher.ico
Binary file ExifWasher.ico has changed
diff -r cd2ca4727b7f -r 5cac95c17fef build.xml
--- a/build.xml	Thu Apr 16 11:10:39 2020 -0700
+++ b/build.xml	Thu Apr 16 12:58:50 2020 -0700
@@ -39,6 +39,7 @@
 
   <!-- Define the properties used by the build -->
   <property name="app.name"      value="${ant.project.name}"/>
+  <property name="app.version"   value="1.03"/>
   <property name="app.entry"     value="name.blackcap.exifwasher.MainKt"/>
   <toLowerCase target="lc.app.name" value="${app.name}"/>
   <property name="jar.name"      value="${basedir}/${lc.app.name}.jar"/>
@@ -113,7 +114,7 @@
       <fx:deploy nativeBundles="@{type}" outdir="${basedir}" outfile="${app.name}"
         signBundle="false">
         <fx:application mainClass="${app.entry}" name="${app.name}" toolkit="swing"
-          version="1.02"/>
+          version="${app.version}"/>
         <fx:info description="ExifWasher" title="${app.name}"
           vendor="David Barts &lt;n5jrn@me.com&gt;"
           copyright="© MMXX, David W. Barts">
@@ -139,8 +140,25 @@
     </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="winapp" depends="jar,dummywork" description="Create app bundle.">
+    <exec executable="${env.JRE_HOME}/bin/javapackager">
+      <arg value="-deploy"/>
+      <arg value="-Bicon=${app.name}.ico"/>
+      <arg value="-BappVersion=${app.version}"/>
+      <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.">
diff -r cd2ca4727b7f -r 5cac95c17fef src/name/blackcap/exifwasher/Menus.kt
--- a/src/name/blackcap/exifwasher/Menus.kt	Thu Apr 16 11:10:39 2020 -0700
+++ b/src/name/blackcap/exifwasher/Menus.kt	Thu Apr 16 12:58:50 2020 -0700
@@ -39,7 +39,7 @@
         })
         if (OS.type != OS.MAC) {
             add(JMenu("Help").apply {
-                add(JMenuItem("About ClipMan…").apply {
+                add(JMenuItem("About ${Application.MYNAME}…").apply {
                     addActionListener(ActionListener { showAboutDialog() })
                 })
             })