summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459>2012-10-31 16:37:04 +0000
committertkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459>2012-10-31 16:37:04 +0000
commitbe435ee28459813ac0b3992db3818d57550351f3 (patch)
tree616dfc910b210067cc6b712debb1e127d16b8e61
parent0b90c2655871eb85d69e788a517e0e3687a713fa (diff)
downloadpdf-over-be435ee28459813ac0b3992db3818d57550351f3.tar.gz
pdf-over-be435ee28459813ac0b3992db3818d57550351f3.tar.bz2
pdf-over-be435ee28459813ac0b3992db3818d57550351f3.zip
+ fixed installer for windows xp
git-svn-id: https://svn.iaik.tugraz.at/svn/egiz/prj/current/12PDF-OVER-4.0@12770 3a0b52a2-8410-0410-bc02-ff6273a87459
-rw-r--r--trunk/pdf-over-gui/src/main/resources/izpack/customicons.xml1
-rw-r--r--trunk/pdf-over-gui/src/main/resources/izpack/icon16x16.pngbin0 -> 1267 bytes
-rw-r--r--trunk/pdf-over-gui/src/main/resources/izpack/install.xml38
-rw-r--r--trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml19
-rw-r--r--trunk/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat1
5 files changed, 41 insertions, 18 deletions
diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/customicons.xml b/trunk/pdf-over-gui/src/main/resources/izpack/customicons.xml
new file mode 100644
index 00000000..6222001d
--- /dev/null
+++ b/trunk/pdf-over-gui/src/main/resources/izpack/customicons.xml
@@ -0,0 +1 @@
+<icon res="/resources/JFrameIcon.png" id="JFrameIcon"/> \ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/icon16x16.png b/trunk/pdf-over-gui/src/main/resources/izpack/icon16x16.png
new file mode 100644
index 00000000..571c7885
--- /dev/null
+++ b/trunk/pdf-over-gui/src/main/resources/izpack/icon16x16.png
Binary files differ
diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/install.xml b/trunk/pdf-over-gui/src/main/resources/izpack/install.xml
index 3b40fa91..8fb14109 100644
--- a/trunk/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/trunk/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -5,21 +5,28 @@
<info>
<appname>PDFOver</appname>
<appversion>4.0</appversion>
- <uninstaller write="no" />
+ <uninstaller write="yes" />
<javaversion>1.6</javaversion>
<authors>
- <author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
+ <author name="A-SIT (Secure Information Technology Center - Austria)"
+ email="" />
</authors>
- <uninstaller/>
+ <uninstaller />
<url>http://www.a-sit.at/</url>
<pack200 />
- <run-privileged condition="izpack.windowsinstall.vista|izpack.macinstall|izpack.windowsinstall.7"/>
+ <run-privileged
+ condition="izpack.windowsinstall.vista|izpack.macinstall|izpack.windowsinstall.7" />
</info>
- <guiprefs resizable="no" width="480" height="360">
- <laf name="looks">
- <param name="variant" value="windows" />
+ <guiprefs resizable="yes" width="480" height="360">
+ <laf name="substance">
<os family="windows" />
+ <os family="unix" />
+ <param name="variant" value="mist-silver" />
+ </laf>
+ <laf name="substance">
+ <os family="mac" />
+ <param name="variant" value="mist-aqua" />
</laf>
</guiprefs>
@@ -29,16 +36,15 @@
<resources>
<res src="./unix_shortcutSpec.xml" id="Unix_shortcutSpec.xml" />
<res src="./win_shortcutSpec.xml" id="Win_shortcutSpec.xml" />
- <res id="TargetPanel.dir.windows" src="defaultInstallDir.txt" />
+ <res src="./win_shortcutSpec.xml" id="shortcutSpec.xml" />
+ <res src="defaultInstallDir.txt" id="TargetPanel.dir.windows" />
+ <res id="JFrameIcon.png" src="./icon16x16.png"/>
+ <res src="./customicons.xml" id="customicons.xml" />
</resources>
-
- <native type="izpack" name="ShellLink.dll">
- <os family="windows" />
- </native>
- <native type="izpack" name="ShellLink_x64.dll">
- <os family="windows" />
- </native>
-
+
+ <native type="izpack" name="ShellLink.dll" />
+ <native type="izpack" name="ShellLink_x64.dll" />
+
<variables>
<variable name="DesktopShortcutCheckboxEnabled" value="true" />
</variables>
diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml b/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
index 64f3fa9b..ee78dc48 100644
--- a/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
+++ b/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
@@ -20,8 +20,23 @@
iconIndex="0"
type="Application"
encoding="UTF-8"
- terminal="false"
- KdeSubstUID="false"
+ initialState="normal">
+ <createForPack name="main"/>
+ </shortcut>
+
+ <shortcut
+ name="Uninstall"
+ programGroup="yes"
+ desktop="no"
+ applications="no"
+ startMenu="yes"
+ startup="no"
+ target="$INSTALL_PATH/scripts/uninstall_win.bat"
+ commandLine=""
+ workingDirectory="$INSTALL_PATH/lib"
+ description="PDFOver 4.0 Uninstall"
+ type="Application"
+ encoding="UTF-8"
initialState="normal">
<createForPack name="main"/>
</shortcut>
diff --git a/trunk/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat b/trunk/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat
new file mode 100644
index 00000000..5bb91af2
--- /dev/null
+++ b/trunk/pdf-over-gui/src/main/resources/scripts/uninstall_win.bat
@@ -0,0 +1 @@
+..\Uninstaller\uninstaller.jar \ No newline at end of file