Mercurial > cgi-bin > hgweb.cgi > JpegWasher
changeset 23:5cac95c17fef
More Windows stuff. Attempts to get Windows packages working.
author | davidb |
---|---|
date | Thu, 16 Apr 2020 12:58:50 -0700 |
parents | cd2ca4727b7f |
children | 3d9c36307704 |
files | ExifWasher.ico build.xml src/name/blackcap/exifwasher/Menus.kt |
diffstat | 3 files changed, 22 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 <n5jrn@me.com>" 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.">
--- 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() }) }) })