IZPACK-1458: Minor flaws in distributed installer

izpack · Nov 1, 2016 · d680814 · d680814
1 parent f67bf8b
commit d680814
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 244 deletions.
diff --git a/izpack-dist/src/main/izpack/RegistrySpec.xml b/izpack-dist/src/main/izpack/RegistrySpec.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <!-- 
-	ATTENTION!!! do not edit with an editor which do not handle UTF-8 in a right manner!!
-	Storing with a wrong editor can crash this file!
+	ATTENTION!!! do not edit with an editor which does not handle UTF-8 in a right manner!!
+	Storing with a wrong editor can break this file!
     Registry definition file for IzPack Installation.
-    $Id$
 -->
 
 <izpack:registry version="5.0"
@@ -35,9 +34,11 @@
                string="$APP_URL"/>
     </pack>
     <pack name="Core">
+        <!--
         <key
                 keypath="SOFTWARE\IzForge\IzPack\$UNINSTALL_NAME\ЮникодТестКлюч"
                 root="HKLM"/>
+                -->
         <value name="Path"
                keypath="SOFTWARE\IzForge\IzPack\$UNINSTALL_NAME"
                root="HKLM"
@@ -46,6 +47,7 @@
                keypath="SOFTWARE\IzForge\IzPack\$UNINSTALL_NAME"
                root="HKLM"
                dword="42"/>
+        <!--
         <value name="BIN"
                keypath="SOFTWARE\IzForge\IzPack\$UNINSTALL_NAME"
                root="HKLM">
@@ -59,6 +61,8 @@
             <multi data="Element two"/>
             <multi data="Element three"/>
         </value>
+        -->
+        <!--
         <value name="ЮникодМногострочныйТест"
                keypath="SOFTWARE\IzForge\IzPack\$UNINSTALL_NAME"
                root="HKLM">
@@ -69,7 +73,9 @@
                keypath="SOFTWARE\IzForge\IzPack\$UNINSTALL_NAME"
                root="HKLM"
                string="это тестовая строка для поддержки юникода"/>
+               -->
     </pack>
+    <!--
     <pack name="Documentation-HTML">
         <key keypath="SOFTWARE\IzForge\IzPack\$UNINSTALL_NAME\Documentation\HTML" root="HKLM"/>
     </pack>
@@ -82,6 +88,7 @@
     <pack name="Documentation-NanoXML">
         <key keypath="SOFTWARE\IzForge\IzPack\$UNINSTALL_NAME\Documentation\NanoXML" root="HKLM"/>
     </pack>
+    -->
     <pack name="Sample">
         <key keypath="SOFTWARE\IzForge\IzPack\$UNINSTALL_NAME\Sample" root="HKLM"/>
     </pack>

diff --git a/izpack-dist/src/main/izpack/Unix_shortcutSpec.xml b/izpack-dist/src/main/izpack/Unix_shortcutSpec.xml
@@ -1,141 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
-<!-- 
-	Notes: 
-	- Each Shortcut has now a optional attribute
-
-	createForAll="yes|no"
-	
-	new at 2006-09-06:
-	TryExec="aTryExecCommand" will passes raw thru
-	Categories="Where to put in [K]-Menu"
-	 
-	As root you can create Shortcuts for all users or even only for yourself.
-	This can be the case i.e. for the uninstaller.
-	If you whant to do so, set createForAll to true otherwise to false, which is the default.
-	
-	! If not explicite set or present the default is false.	
-	
-	New Attibute for Root Installation on Linux:	
-		 
-	Categories="Development;IDE;" 
-	   
-	TryExec="java -jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
-	   
-  Here are some Sample Categories and their apps
-	examine *.desktop files in /usr/share/applications ...
-  Categories="Application;Network;WebDevelopment;"    Nvu
-	Categories="Qt;Development;GUIDesigner;"    QtDesigner3
-	Categories="Application;System;"   VMwareServer-console  
-	Categories="Network;WebBrowser;"    Opera
-	Categories="Development;Debugger;"    DDD debugger
-  Categories="Development;IDE;"    Eclipse IDE
-	Categories="SystemSetup;X-SuSE-Core-System;" Yast2
-	Categories="System;Archiving;" Sesam archiving
-	Categories="System;Database;" MySQL Administrator 
-    
--->
-
 <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">
 
     <programGroup defaultName="IzPack ${project.version}" location="applications"/>
 
-
-    <!-- Disabled since there is no Frontend
-  shortcut
-     name="IzPack"
-     programGroup="yes"
-     desktop="yes"
-     applications="no"
-     startMenu="yes"
-     startup="no"
-     target="$INSTALL_PATH/bin/izpack-fe.sh"
-     commandLine=""
-     workingDirectory="$INSTALL_PATH/bin"
-     description="Front-End for IzPack installation tool"
-     iconFile="$INSTALL_PATH/bin/icons/izpack.png"
-     iconIndex="0"
-     type="Application"
-     encoding="UTF-8"
-     terminal="true"
-     KdeSubstUID="false"
-     initialState="normal">   
-     <createForPack name="Core"/>     
-   </shortcut -->
-
     <shortcut
-            name="IzPack Html Documentation"
+            terminal="false"
+            name="IzPack Online Documentation"
             programGroup="yes"
             desktop="yes"
             applications="no"
             startMenu="yes"
             startup="no"
-            target="$INSTALL_PATH/bin/start.sh"
-            workingDirectory=""
-            commandLine="$INSTALL_PATH/doc/izpack/html/index.html"
             initialState="noShow"
-            iconFile="help"
-            iconIndex="0"
-            url="$INSTALL_PATH/doc/izpack/html/index.html"
-            type="Application"
-            encoding="UTF-8"
-            createForAll="true"
-            categories="Application;Development;"
-            description="This opens a WebBrowser to look into the IzPack ${project.version} (HTML) user documentation">
-
-        <createForPack name="HTML Documentation"/>
-    </shortcut>
-
-    <shortcut
-            name="IzPack Java Documentation"
-            programGroup="yes"
-            desktop="yes"
-            applications="no"
-            startMenu="yes"
-            startup="no"
-            target="$INSTALL_PATH/bin/start.sh"
-            workingDirectory=""
-            commandLine="$INSTALL_PATH/doc/izpack/javadoc/index.html"
-            initialState="noShow"
-            iconFile="help"
-            iconIndex="0"
-            url="$INSTALL_PATH/doc/izpack/javadoc/index.html"
-            type="Application"
-            encoding="UTF-8"
-            createForAll="true"
-            categories="Application;Development;"
-            description="This opens a WebBrowser to look into the IzPack ${project.version} (HTML) Java documentation">
-
-        <createForPack name="Javadocs Documentation"/>
-    </shortcut>
-
-    <shortcut
-            name="IzPack PDF Documentation"
-            programGroup="yes"
-            desktop="yes"
-            applications="no"
-            startMenu="yes"
-            startup="no"
-            target="acroread"
-            workingDirectory=""
-            commandLine="$INSTALL_PATH/doc/izpack/pdf/manual.pdf"
-            initialState="noShow"
-            iconFile="acroread"
-            iconIndex="0"
-            type="Application"
-            encoding="UTF-8"
-            createForAll="true"
+            iconFile="$INSTALL_PATH/icons/izpack_wiki_32.png"
+            url="https://izpack.atlassian.net/wiki/display/IZPACK/IzPack+Home"
+            type="Link"
+            createForAll="false"
             categories="Application;Development;"
-            description="This opens Adobe (Acrobat) Reader (if available) to look into or print the IzPack ${project.version} (PDF) user documentation">
+            description="Browse the IzPack Wiki site online">
 
-        <createForPack name="PDF Documentation"/>
+        <createForPack name="Core"/>
     </shortcut>
 
-
     <shortcut
+            terminal="false"
             name="Izpack Uninstaller"
             programGroup="yes"
             desktop="yes"
@@ -144,15 +35,12 @@
             startup="no"
             target="java"
             commandLine="-jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
-
             initialState="noShow"
-            iconFile="trashcan_full"
-            iconIndex="0"
+            iconFile="$INSTALL_PATH/icons/izpack_uninstall_32.png"
             workingDirectory=""
             type="Application"
             encoding="UTF-8"
-            KdeSubstUID="true"
-            KdeUsername="root"
+            KdeSubstUID="false"
             createForAll="false"
             categories="Application;Development;"
             tryexec="java -jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
@@ -161,5 +49,4 @@
         <createForPack name="Core"/>
     </shortcut>
 
-
 </izpack:shortcuts>
diff --git a/izpack-dist/src/main/izpack/i18n/packsLang.xml_cze b/izpack-dist/src/main/izpack/i18n/packsLang.xml_cze
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<izpack:langpack version="5.0" xmlns:izpack="http://izpack.org/schema/langpack" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://izpack.org/schema/langpack http://izpack.org/schema/5.0/izpack-langpack-5.0.xsd">
+	<str id="pack.core" txt="Hlavní soubory" />
+	<str id="pack.core.description" txt="Tento balíček obsahuje minimálně potřebné soubory." />
+	<str id="pack.experimental" txt="Experimentální nástroje" />
+	<str id="pack.experimental.description" txt="Tento balíček obsahuje nějaké experimentální nástroje (izpack2exe, izpack2app, izpack2jnlp)." />
+</izpack:langpack>
diff --git a/izpack-dist/src/main/izpack/i18n/packsLang.xml_deu b/izpack-dist/src/main/izpack/i18n/packsLang.xml_deu
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<izpack:langpack version="5.0" xmlns:izpack="http://izpack.org/schema/langpack" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://izpack.org/schema/langpack http://izpack.org/schema/5.0/izpack-langpack-5.0.xsd">
+	<str id="pack.core" txt="Standardinstallation" />
+	<str id="pack.core.description" txt="Dieses Paket enthält die minimal erforderlichen Dateien." />
+	<str id="pack.experimental" txt="Experimentelle Tools" />
+	<str id="pack.experimental.description" txt="Dieses Paket enthält einige experimentelle Werkzeuge (izpack2exe, izpack2app, izpack2jnlp)." />
+</izpack:langpack>
diff --git a/izpack-dist/src/main/izpack/i18n/packsLang.xml_eng b/izpack-dist/src/main/izpack/i18n/packsLang.xml_eng
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<izpack:langpack version="5.0" xmlns:izpack="http://izpack.org/schema/langpack" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://izpack.org/schema/langpack http://izpack.org/schema/5.0/izpack-langpack-5.0.xsd">
+	<str id="pack.core" txt="Required files" />
+	<str id="pack.core.description" txt="This pack contains the minimal set of files necessary." />
+	<str id="pack.experimental" txt="Experimental tools" />
+	<str id="pack.experimental.description" txt="This pack contains several experimental utilities (izpack2exe, izpack2app, izpack2jnlp)." />
+</izpack:langpack>
diff --git a/izpack-dist/src/main/izpack/install.xml b/izpack-dist/src/main/izpack/install.xml
@@ -8,13 +8,13 @@
     <info>
         <appname>IzPack</appname>
         <appversion>@izpack.version</appversion>
-        <authors><!-- We now get them from the POM :-) --></authors>
         <url>http://izpack.org/</url>
         <javaversion>1.6</javaversion>
         <requiresjdk>no</requiresjdk>
-        <!--><pack200/>-->
-        <run-privileged condition="izpack.windowsinstall.vista|izpack.windowsinstall.7"/>
-        <summarylogfilepath>$INSTALL_PATH/installinfo/Summary.htm</summarylogfilepath>
+        <run-privileged condition="izpack.windowsinstall.vista|izpack.windowsinstall.7|izpack.windowsinstall.8|izpack.windowsinstall.10"/>
+        <summarylogfilepath>$INSTALL_PATH/setup/Summary.htm</summarylogfilepath>
+        <readinstallationinformation>false</readinstallationinformation>
+        <writeinstallationinformation>false</writeinstallationinformation>
     </info>
 
     <variables>
@@ -24,7 +24,6 @@
 
     <!-- Flexible and in the screen proportions -->
     <guiprefs height="700" resizable="yes" width="870">
-        <!-- GUI adaption for more information see "Modifying the GUI" in the documentation -->
         <modifier key="langDisplayType" value="default"/>
         <modifier key="layoutAnchor" value="CENTER"/>
         <modifier key="headingPanelCounter" value="progressbar"/>
@@ -62,11 +61,13 @@
         <langpack iso3="srp"/>
         <langpack iso3="ces"/>
         <langpack iso3="kor"/>
-        <langpack iso3="glg"/>
     </locale>
 
     <!-- The resources needed by the various panels -->
     <resources>
+        <res id="packsLang.xml_cze" src="i18n/packsLang.xml_cze" />
+        <res id="packsLang.xml_deu" src="i18n/packsLang.xml_deu" />
+        <res id="packsLang.xml_eng" src="i18n/packsLang.xml_eng" />
         <res src="install-readme.html" id="HTMLInfoPanel.info"/>
         <res src="license.html" id="HTMLLicencePanel.licence"/>
         <res src="splash-3.10.png" id="installer.langsel.img"/>
@@ -113,45 +114,29 @@
     <packs>
 
         <!-- The core files -->
-        <pack name="Core" required="yes">
+        <pack id="pack.core" name="Core" required="yes">
             <description>The IzPack core files.</description>
             <fileset dir="" override="true">
                 <include name="README.md"/>
                 <include name="LICENSE"/>
                 <include name="KEYS"/>
                 <include name="NOTICE"/>
                 <include name="bin/**"/>
+                <include name="icons/**"/>
                 <include name="lib/**"/>
                 <include name="legal/**"/>
                 <include name="schema/**"/>
             </fileset>
             <executable targetfile="$INSTALL_PATH/bin/compile" stage="never"/>
             <executable targetfile="$INSTALL_PATH/bin/start.sh" stage="never"/>
+            <updatecheck>
+                <exclude name="setup/**"/>
+            </updatecheck>
         </pack>
 
-        <!-- The documentation -->
-        <!-- <pack name="HTML Documentation" required="no">
-            <description>The IzPack documentation (HTML version).</description>
-            <fileset dir="" targetdir="$INSTALL_PATH">
-                <include name="doc/izpack/html/**/*"/>
-            </fileset>
-        </pack>
-        <pack name="PDF Documentation" required="no">
-            <description>The IzPack documentation (PDF version).</description>
-            <fileset dir="" targetdir="$INSTALL_PATH">
-                <include name="doc/izpack/pdf/**/*"/>
-            </fileset>
-        </pack>
-        <pack name="Javadocs Documentation" required="no">
-            <description>The IzPack Java documentation (Javadocs for IzPack developers).</description>
-            <fileset dir="" targetdir="$INSTALL_PATH">
-                <include name="doc/izpack/javadoc/**/*"/>
-            </fileset>
-        </pack> -->
-
         <!-- Utilities pack -->
-        <pack name="Utilities" required="no">
-            <description>IzPack utilities (izpack2exe, izpack2app, izpack2jnlp)</description>
+        <pack id="pack.experimental" name="Experimental tools" required="no">
+            <description>This pack contains several experimental utilities (izpack2exe, izpack2app, izpack2jnlp).</description>
             <fileset dir="" override="true">
                 <include name="utils/**/*"/>
             </fileset>
@@ -160,22 +145,16 @@
                     stage="never"/>
         </pack>
 
-        <!-- A trivial sample to get started -->
-        <!-- <pack name="Sample" required="no">
-            <description>A sample installation.</description>
-            <fileset dir="" targetdir="$INSTALL_PATH">
-                <include name="sample/**/*"/>
-            </fileset>
-        </pack> -->
-
     </packs>
 
     <!-- The native libraries to add -->
     <natives>
-        <native type="izpack" name="ShellLink.dll"/>
-        <native type="izpack" name="ShellLink_x64.dll"/>
-        <native type="izpack" name="WinSetupAPI.dll"/>
-        <native type="izpack" name="WinSetupAPI_x64.dll"/>
+        <native type="izpack" name="ShellLink.dll">
+            <os family="windows"/>
+        </native>
+        <native type="izpack" name="ShellLink_x64.dll">
+            <os family="windows"/>
+        </native>
         <native type="3rdparty" name="COIOSHelper.dll" uninstaller="true">
             <os family="windows"/>
         </native>