Major overhaul of project structure, to be more maven compatible.

Added native packaging with fx:deploy
zaro · Jul 24, 2016 · f8e1cd6 · f8e1cd6
1 parent 6f18941
commit f8e1cd6
Show file tree

Hide file tree

Showing 74 changed files with 675 additions and 628 deletions.
diff --git a/.classpath b/.classpath
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/TODO.md b/TODO.md
@@ -1,3 +1,4 @@
 - create proper windows installer, either with javapackager from JDK or with WiX toolkit directly
 - Allow finer grained Explorer context menu, editing
-- Investigate moving the whole thing to javascript useing one of  :https://github.com/jashkenas/coffeescript/wiki/list-of-languages-that-compile-to-js#javajvm
+- Investigate moving the whole thing to javascript useing one of  :https://github.com/jashkenas/coffeescript/wiki/list-of-languages-that-compile-to-js#javajvm
+- DDE library http://jdde.pretty-tools.com/
diff --git a/build-install.xml b/build-install.xml
@@ -0,0 +1,55 @@
+<project name="auto-pay-rev" default="deploy-bundle" basedir="." xmlns:fx="javafx:com.sun.javafx.tools.ant">
+    <target name="deploy-bundle">
+        <taskdef resource="com/sun/javafx/tools/ant/antlib.xml" uri="javafx:com.sun.javafx.tools.ant" classpath="${java.home}\..\lib\ant-javafx.jar:${staging.dir}"/>
+
+        <fx:application id="pmedit" name="${app.name}" mainClass="${app.main.class}"  toolkit="swing" version="${app.version}" />
+
+    	<fx:resources id="pmeditDeploy" >
+    	    <fx:fileset dir="${dist.dir}/" includes="${app.main.jar} "/>
+    	    <fx:fileset os="windows" dir="${dist.dir}/win/app/" includes="*" />
+    	    <fx:fileset os="windows" dir="${dist.dir}/win/com/pretty_tools/dde" includes="*.dll" />
+    	</fx:resources> 
+
+
+    	<!--
+    	<fx:resources id="pmeditRes">
+    	    <fx:fileset dir="${dist.dir}/win/app/" includes="*" />
+    	    <fx:fileset type="native" dir="${dist.dir}/win/" includes="jdde-native.jar" />
+    	</fx:resources> 
+        	    	
+		<fx:jar destfile="${dist.dir}/aaa-${app.main.jar}">
+        	<fx:application refid="pmedit" />
+    	    <fx:fileset dir="${dist.dir}/" includes="${app.main.jar} "/>
+    		<fx:resources refid="pmeditRes"/>
+		</fx:jar>
+		-->
+
+
+        <fx:deploy verbose="true" nativeBundles="${native.bundle}" outdir="${dist.dir}" outfile="${app.bundle.name}">
+            <fx:application refId="pmedit" />
+
+        	<fx:info title="${app.title}">
+            	<fx:association extension="pdf" mimetype="application/pdf" description="PDF file" />
+        	</fx:info>
+
+
+        	<fx:preferences menu="true" shortcut="true"/>
+
+
+    		<fx:resources refid="pmeditDeploy"/>
+
+        	<fx:platform j2se="1.6">
+        	    <fx:jvmarg value="-Djava.library.path=$APPDIR\app"/>
+        	</fx:platform>
+
+        	<fx:bundleArgument arg="win.menuGroup" value="Pdf Metadata Editor"/>
+
+
+        	<fx:secondaryLauncher appDescription="Batch Pdf metadata editoring" title="Batch ${app.title}" name="Batch${app.name}" mainClass="${app.main.class}"  toolkit="swing" version="${app.version}" menu="true">
+        	    <fx:argument>batch-gui-cmdline</fx:argument>
+			</fx:secondaryLauncher>
+        </fx:deploy>
+
+
+    </target>
+</project>
diff --git a/izpack/7zsd-pmedit.exe b/izpack/7zsd-pmedit.exe
diff --git a/izpack/config.txt b/izpack/config.txt
diff --git a/izpack/installer.hta b/izpack/installer.hta
diff --git a/izpack/izpack-install.xml b/izpack/izpack-install.xml
@@ -40,8 +40,8 @@
 	</panels>
 
 	<resources>
-		<res src="windows_shortcuts.xml" id="shortcutSpec.xml" />
-		<res src="unix_shortcuts.xml" id="Unix_shortcutSpec.xml" />
+		<res src="izpack/windows_shortcuts.xml" id="shortcutSpec.xml" />
+		<res src="izpack/unix_shortcuts.xml" id="Unix_shortcutSpec.xml" />
 	</resources>
 
 	<packs>
@@ -50,27 +50,27 @@
 			<fileset dir="@{staging.dir}" override="true">
 				<include name="pdf-metadata-edit-@{version.izpack}.jar" />
 			</fileset>
-			<fileset dir="@{staging.dir}" override="true">
+			<fileset dir="@{staging.dir}/zip/" override="true">
 				<include name="PdfMetadataEditor.ini" />
 				<os family="windows" />
 			</fileset>
-			<fileset dir="@{staging.dir}" override="true">
+			<fileset dir="@{staging.dir}/zip/" override="true">
 				<include name="pmedit-cli.ini" />
 				<os family="windows" />
 			</fileset>
-			<singlefile src="PdfMetadataEditor.exe" target="$INSTALL_PATH/PdfMetadataEditor.exe" override="true" condition="!java_64bit">
+			<singlefile src="zip/PdfMetadataEditor.exe" target="$INSTALL_PATH/PdfMetadataEditor.exe" override="true" condition="!java_64bit">
 				<os family="windows" />
 			</singlefile>
-			<singlefile src="PdfMetadataEditor64.exe" target="$INSTALL_PATH/PdfMetadataEditor.exe" override="true" condition="java_64bit">
+			<singlefile src="zip/PdfMetadataEditor64.exe" target="$INSTALL_PATH/PdfMetadataEditor.exe" override="true" condition="java_64bit">
 				<os family="windows" />
 			</singlefile>
-			<singlefile src="pmedit-cli.exe" target="$INSTALL_PATH/pmedit-cli.exe" override="true" condition="!java_64bit">
+			<singlefile src="zip/pmedit-cli.exe" target="$INSTALL_PATH/pmedit-cli.exe" override="true" condition="!java_64bit">
 				<os family="windows" />
 			</singlefile>
-			<singlefile src="pmedit-cli64.exe" target="$INSTALL_PATH/pmedit-cli.exe" override="true" condition="java_64bit">
+			<singlefile src="zip/pmedit-cli64.exe" target="$INSTALL_PATH/pmedit-cli.exe" override="true" condition="java_64bit">
 				<os family="windows" />
 			</singlefile>
-			<fileset dir="@{staging.dir}" override="true">
+			<fileset dir="@{staging.dir}/zip/" override="true">
 				<include name="pdf-metadata-edit" />
 				<include name="pmedit-cli" />
 				<include name="pdf-metadata-edit.png" />

diff --git a/izpack/unix_shortcuts.xml b/izpack/unix_shortcuts.xml
@@ -11,8 +11,8 @@
 
 		<createForPack name="Core files" />
 	</shortcut>
-	<shortcut name="Pdf Metadata Editor (Batch Mode)" target="$INSTALL_PATH/pdf-metadata-edit"
-		commandLine="batch-gui-cmdline" workingDirectory="$INSTALL_PATH" description="Open Pdf Metadata Editor"
+	<shortcut name="Batch Pdf Metadata Editor" target="$INSTALL_PATH/pdf-metadata-edit"
+		commandLine="batch-gui-cmdline" workingDirectory="$INSTALL_PATH" description="Open Batch Pdf Metadata Editor"
 		iconFile="$INSTALL_PATH/pdf-metadata-edit.png" iconIndex="0"
 		programGroup="yes" desktop="no" applications="no" startMenu="no"
 		startup="no" terminal="false" type="Application" encoding="UTF-8">

diff --git a/izpack/windows_shortcuts.xml b/izpack/windows_shortcuts.xml
@@ -12,8 +12,8 @@
 		<createForPack name="Core files" />
 	</shortcut>
 
-	<shortcut name="Pdf Metadata Editor (Batch Mode)" target="$INSTALL_PATH\PdfMetadataEditor.exe"
-		commandLine="batch-gui-cmdline" workingDirectory="$INSTALL_PATH" description="Open Pdf Metadata Editor"
+	<shortcut name="Batch Pdf Metadata Editor" target="$INSTALL_PATH\PdfMetadataEditor.exe"
+		commandLine="batch-gui-cmdline" workingDirectory="$INSTALL_PATH" description="Open Batch Pdf Metadata Editor"
 		iconIndex="0" programGroup="yes"
 		desktop="no" applications="no" startMenu="no" startup="no">
 		<createForPack name="Core files" />

diff --git a/izpack/PdfMetadataEditor.exe → package/all/PdfMetadataEditor.exe b/izpack/PdfMetadataEditor.exe → package/all/PdfMetadataEditor.exe
diff --git a/izpack/PdfMetadataEditor.ini → package/all/PdfMetadataEditor.ini b/izpack/PdfMetadataEditor.ini → package/all/PdfMetadataEditor.ini
diff --git a/izpack/PdfMetadataEditor64.exe → package/all/PdfMetadataEditor64.exe b/izpack/PdfMetadataEditor64.exe → package/all/PdfMetadataEditor64.exe
diff --git a/izpack/README.md → package/all/README.md b/izpack/README.md → package/all/README.md
diff --git a/izpack/pdf-metadata-edit → package/all/pdf-metadata-edit b/izpack/pdf-metadata-edit → package/all/pdf-metadata-edit
diff --git a/izpack/pmedit-cli → package/all/pmedit-cli b/izpack/pmedit-cli → package/all/pmedit-cli
diff --git a/izpack/pmedit-cli.exe → package/all/pmedit-cli.exe b/izpack/pmedit-cli.exe → package/all/pmedit-cli.exe
diff --git a/izpack/pmedit-cli.ini → package/all/pmedit-cli.ini b/izpack/pmedit-cli.ini → package/all/pmedit-cli.ini
diff --git a/izpack/pmedit-cli64.exe → package/all/pmedit-cli64.exe b/izpack/pmedit-cli64.exe → package/all/pmedit-cli64.exe