From b38409595346e3caabe63aca51c3ff7dadd9d092 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>
Date: Wed, 10 Apr 2013 19:39:32 +0000
Subject: Use launch4j instead of winrun4j

Executables are generated on build by maven
Should fix 64bit Java problems

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@436 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
---
 pdf-over-gui/pom.xml                               | 137 ++++++++++++++++++++-
 pdf-over-gui/src/main/resources/PDF-Over-Un.ini    |   4 -
 pdf-over-gui/src/main/resources/PDF-Over.exe       | Bin 67072 -> 0 bytes
 pdf-over-gui/src/main/resources/PDF-Over.ini       |   4 -
 pdf-over-gui/src/main/resources/izpack/install.xml |   5 +-
 .../src/main/resources/izpack/win_shortcutSpec.xml |   4 +-
 .../main/resources/izpack/win_shortcutSpec_deu.xml |   4 +-
 7 files changed, 137 insertions(+), 21 deletions(-)
 delete mode 100644 pdf-over-gui/src/main/resources/PDF-Over-Un.ini
 delete mode 100644 pdf-over-gui/src/main/resources/PDF-Over.exe
 delete mode 100644 pdf-over-gui/src/main/resources/PDF-Over.ini

diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 812a39c5..ba789bbb 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -164,9 +164,6 @@
 										<include>lib-swt/swt-${target.name}-*</include>
 										<include>scripts/*</include>
 										<include>ReadMe.txt</include>
-										<include>PDF-Over.exe</include>
-										<include>PDF-Over.ini</include>
-										<include>PDF-Over-Un.ini</include>
 									</includes>
 								</resource>
 								<resource>
@@ -177,6 +174,137 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.groovy.maven</groupId>
+				<artifactId>gmaven-plugin</artifactId>
+				<version>1.0</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>execute</goal>
+						</goals>
+						<configuration>
+							<source>
+								project.properties["version.exe"] = project.version.split("-")[0] + ".0";
+							</source>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>com.akathist.maven.plugins.launch4j</groupId>
+				<artifactId>launch4j-maven-plugin</artifactId>
+				<version>1.5.2</version>
+				<executions>
+					<execution>
+						<id>l4j-gui</id>
+						<phase>package</phase>
+						<goals>
+							<goal>launch4j</goal>
+						</goals>
+						<configuration>
+							<headerType>gui</headerType>
+							<dontWrapJar>true</dontWrapJar>
+							<jar>lib/${artifactId}-${version}.jar</jar>
+							<outfile>${staging.dir}/PDF-Over.exe</outfile>
+							<errTitle>Error</errTitle>
+							<classPath>
+								<mainClass>at.asit.pdfover.gui.Main</mainClass>
+								<jarLocation>lib/</jarLocation>
+							</classPath>
+							<chdir>.</chdir>
+							<icon>src/main/resources/icons/icon.ico</icon>
+							<jre>
+								<minVersion>1.6.0</minVersion>
+							</jre>
+							<versionInfo>
+								<fileVersion>${version.exe}</fileVersion>
+								<txtFileVersion>${version}</txtFileVersion>
+								<fileDescription>PDF-Over PDF signer</fileDescription>
+								<copyright>(C) 2012 A-SIT</copyright>
+								<productVersion>${version.exe}</productVersion>
+								<txtProductVersion>${version}</txtProductVersion>
+								<productName>PDF-Over</productName>
+								<internalName>PDF-Over</internalName>
+								<originalFilename>PDF-Over.exe</originalFilename>
+							</versionInfo>
+						</configuration>
+					</execution>
+					<execution>
+						<id>l4j-cli</id>
+						<phase>package</phase>
+						<goals>
+							<goal>launch4j</goal>
+						</goals>
+						<configuration>
+							<headerType>console</headerType>
+							<dontWrapJar>true</dontWrapJar>
+							<jar>lib/${artifactId}-${version}.jar</jar>
+							<outfile>${staging.dir}/PDF-Over-cli.exe</outfile>
+							<errTitle>Error</errTitle>
+							<classPath>
+								<mainClass>at.asit.pdfover.gui.Main</mainClass>
+								<jarLocation>lib/</jarLocation>
+							</classPath>
+							<chdir>.</chdir>
+							<icon>src/main/resources/icons/icon.ico</icon>
+							<jre>
+								<minVersion>1.6.0</minVersion>
+							</jre>
+							<versionInfo>
+								<fileVersion>${version.exe}</fileVersion>
+								<txtFileVersion>${version}</txtFileVersion>
+								<fileDescription>PDF-Over PDF signer CLI</fileDescription>
+								<copyright>(C) 2012 A-SIT</copyright>
+								<productVersion>${version.exe}</productVersion>
+								<txtProductVersion>${version}</txtProductVersion>
+								<productName>PDF-Over</productName>
+								<internalName>PDF-Over-cli</internalName>
+								<originalFilename>PDF-Over-cli.exe</originalFilename>
+							</versionInfo>
+						</configuration>
+					</execution>
+					<execution>
+						<id>l4j-uninst</id>
+						<phase>package</phase>
+						<goals>
+							<goal>launch4j</goal>
+						</goals>
+						<configuration>
+							<headerType>gui</headerType>
+							<dontWrapJar>true</dontWrapJar>
+							<jar>uninstaller.jar</jar>
+							<outfile>${staging.dir}/Uninstaller.exe</outfile>
+							<errTitle>Error</errTitle>
+							<classPath>
+								<mainClass>com.izforge.izpack.uninstaller.Uninstaller</mainClass>
+								<addDependencies>false</addDependencies>
+								<preCp>uninstaller.jar</preCp>
+							</classPath>
+							<chdir>.</chdir>
+							<icon>src/main/resources/icons/icon.ico</icon>
+							<jre>
+								<minVersion>1.6.0</minVersion>
+							</jre>
+							<versionInfo>
+								<fileVersion>${version.exe}</fileVersion>
+								<txtFileVersion>${version}</txtFileVersion>
+								<fileDescription>PDF-Over Uninstaller</fileDescription>
+								<copyright>A-SIT (Secure Information Technology Center - Austria)</copyright>
+								<productVersion>${version.exe}</productVersion>
+								<txtProductVersion>${version}</txtProductVersion>
+								<productName>PDF-Over</productName>
+								<internalName>Uninstaller</internalName>
+								<originalFilename>Uninstaller.exe</originalFilename>
+							</versionInfo>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				<groupId>org.codehaus.izpack</groupId>
 				<artifactId>izpack-maven-plugin</artifactId>
@@ -213,9 +341,6 @@
 					<exclude>scripts/*</exclude>
 					<exclude>ReadMe.txt</exclude>
 					<exclude>keystore.jks</exclude>
-					<exclude>PDF-Over.exe</exclude>
-					<exclude>PDF-Over.ini</exclude>
-					<exclude>PDF-Over-Un.ini</exclude>
 				</excludes>
 			</resource>
 		</resources>
diff --git a/pdf-over-gui/src/main/resources/PDF-Over-Un.ini b/pdf-over-gui/src/main/resources/PDF-Over-Un.ini
deleted file mode 100644
index 043ee125..00000000
--- a/pdf-over-gui/src/main/resources/PDF-Over-Un.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-working.directory=.
-classpath.1=*.jar
-main.class=com.izforge.izpack.uninstaller.Uninstaller
-vm.version.min=1.6
diff --git a/pdf-over-gui/src/main/resources/PDF-Over.exe b/pdf-over-gui/src/main/resources/PDF-Over.exe
deleted file mode 100644
index 3e2fe0e5..00000000
Binary files a/pdf-over-gui/src/main/resources/PDF-Over.exe and /dev/null differ
diff --git a/pdf-over-gui/src/main/resources/PDF-Over.ini b/pdf-over-gui/src/main/resources/PDF-Over.ini
deleted file mode 100644
index 729318e8..00000000
--- a/pdf-over-gui/src/main/resources/PDF-Over.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-working.directory=.
-classpath.1=lib/*.jar
-main.class=at.asit.pdfover.gui.Main
-vm.version.min=1.6
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index f5e5d9ba..e4c6cb68 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -60,9 +60,8 @@
 			<file src="icons" targetdir="$INSTALL_PATH" />
 			<file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
 			<file src="PDF-Over.exe" targetdir="$INSTALL_PATH" os="windows"/>
-			<file src="PDF-Over.ini" targetdir="$INSTALL_PATH" os="windows"/>
-			<file src="PDF-Over-Un.ini" targetdir="$INSTALL_PATH/Uninstaller" os="windows"/>
-			<singlefile src="PDF-Over.exe" target="$INSTALL_PATH/Uninstaller/PDF-Over-Un.exe" os="windows"/>
+			<file src="PDF-Over-cli.exe" targetdir="$INSTALL_PATH" os="windows"/>
+			<file src="Uninstaller.exe" targetdir="$INSTALL_PATH/Uninstaller" os="windows"/>
 			<executable targetfile="$INSTALL_PATH/scripts/pdf-over_linux.sh"
 				os="unix" stage="never"></executable>
 			<executable targetfile="$INSTALL_PATH/scripts/uninstall_linux.sh"
diff --git a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
index 8baeb6f4..03c2359b 100644
--- a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
+++ b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
@@ -30,10 +30,10 @@
      applications="no"
      startMenu="no"
      startup="no"
-     target="$INSTALL_PATH/Uninstaller/PDF-Over-Un.exe"
+     target="$INSTALL_PATH/Uninstaller/Uninstaller.exe"
      commandLine=""
      workingDirectory="$INSTALL_PATH/Uninstaller"
-     description="PDF-Over 4.0 Uninstall"
+     description="PDF-Over 4.0 Uninstaller"
      type="Application"
      encoding="UTF-8"
      initialState="minimized">
diff --git a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml
index 83c4c046..aed600bb 100644
--- a/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml
+++ b/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec_deu.xml
@@ -30,10 +30,10 @@
      applications="no"
      startMenu="no"
      startup="no"
-     target="$INSTALL_PATH/Uninstaller/PDF-Over-Un.exe"
+     target="$INSTALL_PATH/Uninstaller/Uninstaller.exe"
      commandLine=""
      workingDirectory="$INSTALL_PATH/Uninstaller"
-     description="PDF-Over 4.0 Uninstall"
+     description="PDF-Over 4.0 Uninstaller"
      type="Application"
      encoding="UTF-8"
      initialState="minimized">
-- 
cgit v1.2.3