summaryrefslogtreecommitdiff
path: root/pdf-over-gui
diff options
context:
space:
mode:
Diffstat (limited to 'pdf-over-gui')
-rw-r--r--pdf-over-gui/pom.xml28
-rw-r--r--pdf-over-gui/src/main/resources/izpack-linux/customicons.xml9
-rw-r--r--pdf-over-gui/src/main/resources/izpack-linux/install.xml25
-rw-r--r--pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml9
4 files changed, 39 insertions, 32 deletions
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index fb6f98b0..e615caec 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -9,7 +9,6 @@
<artifactId>pdf-over-gui</artifactId>
<name>PDF-Over GUI</name>
<properties>
- <pdfover-build.izpack-version>4.3.5</pdfover-build.izpack-version>
<pdfover-build.root-dir>${project.basedir}${file.separator}..</pdfover-build.root-dir>
<pdfover-build.output-dir>${pdfover-build.root-dir}/pdf-over-build</pdfover-build.output-dir>
<pdfover-build.staging-dir>${project.build.directory}/staging</pdfover-build.staging-dir>
@@ -23,12 +22,6 @@
<version>${pdfover-build.swt-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.izpack</groupId>
- <artifactId>izpack-standalone-compiler</artifactId>
- <version>${pdfover-build.izpack-version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.10</version>
@@ -494,7 +487,8 @@
<properties>
<pdfover-build.swt-artifact-id>org.eclipse.swt.gtk.linux.x86_64</pdfover-build.swt-artifact-id>
<pdfover-build.os-name>linux</pdfover-build.os-name>
- <pdfover-build.output-filename>pdf-over_linux-x86_64.jar</pdfover-build.output-filename>
+ <pdfover-build.output-filename-without-jar>pdf-over_linux-x86_64</pdfover-build.output-filename-without-jar>
+ <pdfover-build.output-filename>${pdfover-build.output-filename-without-jar}.jar</pdfover-build.output-filename>
</properties>
<build>
<plugins>
@@ -544,18 +538,14 @@
<plugin>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-maven-plugin</artifactId>
- <version>1.0-alpha-5</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.izpack</groupId>
- <artifactId>izpack-standalone-compiler</artifactId>
- <version>${pdfover-build.izpack-version}</version>
- </dependency>
- </dependencies>
+ <version>5.1.3</version>
<configuration>
- <izpackBasedir>${pdfover-build.staging-dir}</izpackBasedir>
- <installerFile>${pdfover-build.output-dir}/${pdfover-build.output-filename}</installerFile>
- <attach>false</attach>
+ <baseDir>${pdfover-build.staging-dir}</baseDir>
+ <installFile>${pdfover-build.staging-dir}/install.xml</installFile>
+ <mkdirs>true</mkdirs>
+ <outputDirectory>${pdfover-build.output-dir}</outputDirectory>
+ <finalName>${pdfover-build.output-filename-without-jar}</finalName>
+ <enableAttachArtifact>false</enableAttachArtifact>
</configuration>
<executions>
<execution>
diff --git a/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml b/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml
index 6222001d..f877006c 100644
--- a/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/customicons.xml
@@ -1 +1,8 @@
-<icon res="/resources/JFrameIcon.png" id="JFrameIcon"/> \ No newline at end of file
+<izpack:icons version="5.0"
+ xmlns:izpack="http://izpack.org/schema/icons"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://izpack.org/schema/icons http://izpack.org/schema/5.0/izpack-icons-5.0.xsd">
+
+ <icon res="/resources/JFrameIcon.png" id="JFrameIcon"/>
+
+</izpack:icons>
diff --git a/pdf-over-gui/src/main/resources/izpack-linux/install.xml b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
index ea22069d..1e95e93a 100644
--- a/pdf-over-gui/src/main/resources/izpack-linux/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/install.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<installation version="1.0">
+<izpack:installation version="5.0"
+ xmlns:izpack="http://izpack.org/schema/installation"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://izpack.org/schema/installation http://izpack.org/schema/5.0/izpack-installation-5.0.xsd">
<info>
<appname>PDF-Over</appname>
@@ -10,9 +13,10 @@
<author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
</authors>
<url>http://www.a-sit.at/</url>
+ <pack-compression-format>gz</pack-compression-format>
</info>
- <guiprefs resizable="yes" width="500" height="360">
+ <guiprefs resizable="yes" width="700" height="360">
<modifier key="useFlags" value="yes" />
<modifier key="langDisplayType" value="native" />
</guiprefs>
@@ -30,9 +34,6 @@
<res id="Installer.image.0" src="a-sit-icon.png" />
</resources>
- <native type="izpack" name="ShellLink.dll" />
- <native type="izpack" name="ShellLink_x64.dll" />
-
<variables>
<variable name="DesktopShortcutCheckboxEnabled" value="true" />
</variables>
@@ -41,22 +42,28 @@
<panel classname="HelloPanel" />
<panel classname="TargetPanel" />
<panel classname="InstallPanel" />
- <panel classname="ShortcutPanel" />
+ <panel classname="ShortcutPanel" allowClose="true" />
<panel classname="SimpleFinishPanel" />
- <panel classname="ProcessPanel"/>
</panels>
+ <natives> <!-- required to run installer on windows for debug -->
+ <native type="izpack" name="ShellLink.dll"/>
+ <native type="izpack" name="ShellLink_x64.dll"/>
+ </natives>
+
<packs>
<pack name="main" required="yes">
<description>Main Installation</description>
<updatecheck>
<include name="lib/**" />
</updatecheck>
- <file src="lib" targetdir="$INSTALL_PATH" />
+ <fileset dir="lib" targetdir="$INSTALL_PATH/lib" />
<file src="pdf-over_linux.sh" targetdir="$INSTALL_PATH" />
<file src="uninstall_linux.sh" targetdir="$INSTALL_PATH" />
<file src="icons" targetdir="$INSTALL_PATH" />
<file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
+
+ <!-- set executable bit, do not actually execute -->
<executable targetfile="$INSTALL_PATH/pdf-over_linux.sh" stage="never" />
<executable targetfile="$INSTALL_PATH/uninstall_linux.sh" stage="never" />
</pack>
@@ -64,4 +71,4 @@
-</installation>
+</izpack:installation>
diff --git a/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml
index 60e2666d..5117a03e 100644
--- a/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml
+++ b/pdf-over-gui/src/main/resources/izpack-linux/unix_shortcutSpec.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<shortcuts>
+<izpack:shortcuts version="5.0"
+ xmlns:izpack="http://izpack.org/schema/shortcuts"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://izpack.org/schema/shortcuts http://izpack.org/schema/5.0/izpack-shortcuts-5.0.xsd">
<!-- <skipIfNotSupported/> -->
<programGroup defaultName="PDF-Over"
location="applications"/>
@@ -12,7 +15,7 @@
applications="no"
startMenu="no"
startup="no"
- target="$INSTALL_PATH/scripts/pdf-over_linux.sh"
+ target="$INSTALL_PATH/pdf-over_linux.sh"
commandLine=""
workingDirectory="$INSTALL_PATH"
description="PDF-Over ${project.version}"
@@ -26,4 +29,4 @@
<createForPack name="main"/>
</shortcut>
-</shortcuts>
+</izpack:shortcuts>