[izpack-changes] r1558 - in izpack-src/trunk: . src src/dist-files
noreply at berlios.de
noreply at berlios.de
Mon Sep 4 03:16:11 CEST 2006
Author: jponge
Date: 2006-09-04 03:15:41 +0200 (Mon, 04 Sep 2006)
New Revision: 1558
Removed:
izpack-src/trunk/src/dist-files/IzPack-install-reg.xml
Modified:
izpack-src/trunk/IzPack-head.ipr
izpack-src/trunk/Versions.txt
izpack-src/trunk/src/build.xml
izpack-src/trunk/src/dist-files/IzPack-install.xml
Log:
Merged the normal and registry-enabled installers.
Modified: izpack-src/trunk/IzPack-head.ipr
===================================================================
--- izpack-src/trunk/IzPack-head.ipr 2006-09-01 19:08:26 UTC (rev 1557)
+++ izpack-src/trunk/IzPack-head.ipr 2006-09-04 01:15:41 UTC (rev 1558)
@@ -188,7 +188,7 @@
<module fileurl="file://$PROJECT_DIR$/IzPack-head.iml" filepath="$PROJECT_DIR$/IzPack-head.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" />
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="IDEA 4267" />
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
<option name="DEBUGGING_INFO" value="true" />
@@ -196,6 +196,7 @@
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
+ <component name="XSLT-Support.FileAssociationsManager" />
<component name="libraryTable" />
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt 2006-09-01 19:08:26 UTC (rev 1557)
+++ izpack-src/trunk/Versions.txt 2006-09-04 01:15:41 UTC (rev 1558)
@@ -41,8 +41,10 @@
name differs in case from the founded class name (Klaus Bartz).
- Re-Activated Shortcut Support for the Automated Installation (Marc Eppelmann).
- Expanded Debug.log()'s possibility to log with Timestamp and or new Date()
- Default is now: with both. (Marc Eppelmann)
-- Suppress a NullPointerException in the RuleInputField (Dennis Reil, via Marc Eppelmann)
+ Default is now: with both. (Marc Eppelmann).
+- Suppress a NullPointerException in the RuleInputField (Dennis Reil, via Marc
+ Eppelmann).
+- Merged normal installer and registry-enabled installers (julien Ponge).
> 3.8.1 (build 2006.01.06)
- Added Greek language support (Fabrice Mirabile, thanks to Panayotis
Modified: izpack-src/trunk/src/build.xml
===================================================================
--- izpack-src/trunk/src/build.xml 2006-09-01 19:08:26 UTC (rev 1557)
+++ izpack-src/trunk/src/build.xml 2006-09-04 01:15:41 UTC (rev 1558)
@@ -994,14 +994,7 @@
</target>
- <!-- - - - - - - - - - - - - - - - - -
- target: generate.simple.and.reg.installer
- - - - - - - - - - - - - - - - - - -->
- <target name="generate.simple.and.reg.installer" depends="generate.installer, generate.installer-reg">
-
- </target>
-
- <!-- =================================
+ <!-- =================================
Creates a normal installer for IzPack
================================= -->
<target name="generate.installer" depends="prepare.install.dist">
@@ -1011,14 +1004,6 @@
</antcall>
</target>
- <!-- Creates an installer for IzPack with registry support -->
- <target name="generate.installer-reg" depends="prepare.install.dist">
- <antcall target="exec.izpack.compiler">
- <param name="installer.xmlfile" value="IzPack-install-reg.xml" />
- <param name="installer.name" value="IzPack-install-reg-" />
- </antcall>
- </target>
-
<!--
Fixes CR/LF by applying the Unix convention (\n for endlines).
It also fixes the encoding problems by moving it to UTF-8.
@@ -1059,12 +1044,12 @@
<!-- Makes everything, from compilation, customer and javadoc to generating an installer. -->
<target name="dist"
- depends="all, create.docu, generate.simple.and.reg.installer"
+ depends="all, create.docu, generate.installer"
description="makes a complete installer" />
<!-- Makes everything, from Cleaning to generating both installers: normal and reg support. -->
<target name="cleandistreg"
- depends="clean, splashscreen, dist, generate.installer-reg"
+ depends="clean, splashscreen, dist, generate.installer"
description="creates a full dist with Win32 uninstall registry support" />
<!-- convenient :) makes a quick dist (w/o docu), an installer and run them. -->
Deleted: izpack-src/trunk/src/dist-files/IzPack-install-reg.xml
===================================================================
--- izpack-src/trunk/src/dist-files/IzPack-install-reg.xml 2006-09-01 19:08:26 UTC (rev 1557)
+++ izpack-src/trunk/src/dist-files/IzPack-install-reg.xml 2006-09-04 01:15:41 UTC (rev 1558)
@@ -1,213 +0,0 @@
-<!--
- $Id$
-
- IzPack installer XML file with registry custom actions.
-
- By Julien PONGE
-
- In order to build an installer for IzPack, let's create a directory
- named '_dist' in the IzPack root directory. Then copy the files from
- 'src/dist-files' into '_dist'. Copy your IzPack image, that is all
- the files present at the IzPack root directory. To make it clear,
- you'll get bin/, lib/, ... and text files like Versions.txt and so
- on. Now you can invoke the IzPack compiler and it will generate the
- installer.
-
- Alternatively, you can use the IzPack Ant makefile and run 'ant dist'. It's
- much simpler :-)
--->
-
-<!-- The installation -->
-<installation version="1.0">
-
- <!-- The info section -->
- <info>
- <appname>IzPack</appname>
- <appversion>3.9.0-preview1 (build 2006.06.23)</appversion>
- <authors>
- <author email="" name="Julien Ponge (maintainer and original developer)"/>
-
- <author email="" name="Klaus Bartz (developer)"/>
- <author email="" name="Fabrice Mirabile (developer)"/>
- <author email="" name="Marc Eppelmann (developer)" />
-
- <author email="" name="Oliver Kiddle (contributor)"/>
- <author email="" name="Cesar Martinez Izquierdo (contributor)"/>
- <author email="" name="Ryan Shillington (contributor)" />
- <author email="" name="Eric Rose (contributor)" />
- <author email="" name="Amit Bhayani @JBoss/RedHat (contributors)" />
-
- <author email=""
- name="... the many other developers and contributors to the previous releases (see Thanks.txt)" />
- </authors>
- <url>http://www.izforge.com/izpack/</url>
- <javaversion>1.4</javaversion>
- <summarylogfilepath>$INSTALL_PATH/installinfo/Summary.htm</summarylogfilepath>
- </info>
-
- <!-- Flexible and in the screen proportions -->
- <guiprefs height="600" resizable="yes" width="800">
- <laf name="looks">
- <os family="unix" />
- </laf>
- </guiprefs>
-
- <variables>
- <variable name="DesktopShortcutCheckboxEnabled" value="true" />
- </variables>
-
- <!-- We include every langpack -->
- <locale>
- <langpack iso3="eng"/>
- <langpack iso3="fra"/>
- <langpack iso3="deu"/>
- <langpack iso3="ita"/>
- <langpack iso3="jpn"/>
- <langpack iso3="spa"/>
- <langpack iso3="dan"/>
- <langpack iso3="ell" />
- <langpack iso3="cat"/>
- <langpack iso3="ned"/>
- <langpack iso3="fin"/>
- <langpack iso3="swe"/>
- <langpack iso3="por"/>
- <langpack iso3="pol"/>
- <langpack iso3="rus"/>
- <langpack iso3="ukr"/>
- <langpack iso3="hun"/>
- <langpack iso3="svk"/>
- <langpack iso3="rom"/>
- <langpack iso3="mys"/>
- <langpack iso3="nor"/>
- <langpack iso3="chn"/>
- <langpack iso3="scg"/>
- <langpack iso3="cze"/>
- <langpack iso3="kor"/>
- </locale>
-
- <!-- The resources needed by the various panels -->
- <resources>
- <res src="install-readme.html" id="HTMLInfoPanel.info"/>
- <res src="Licence.txt" id="LicencePanel.licence"/>
- <res src="splash-sydney.png" id="installer.langsel.img"/>
- <res src="shortcutSpec.xml" id="shortcutSpec.xml"/>
- <res src="Unix_shortcutSpec.xml" id="Unix_shortcutSpec.xml"/>
- <res src="core.png" id="ImgPacksPanel.img.0" />
- <res src="doc-html.png" id="ImgPacksPanel.img.1" />
- <res src="javadocs.png" id="ImgPacksPanel.img.2" />
- <res src="doc-nanoxml.png" id="ImgPacksPanel.img.3" />
-<!--
- <res src="doc-pdf.png" id="ImgPacksPanel.img.2" />
--->
- <res src="sample.png" id="ImgPacksPanel.img.4" />
- <res src="src.png" id="ImgPacksPanel.img.5" />
- <res src="border1.png" id="Installer.image.0"/>
- <res src="border2.png" id="Installer.image.1"/>
- <res src="border3.png" id="Installer.image.2"/>
- <res src="border4.png" id="Installer.image.3"/>
- <res src="border5.png" id="Installer.image.4"/>
- <res src="border5.png" id="Installer.image.5"/>
- <res src="border6.png" id="Installer.image.6"/>
- <res src="border7.png" id="Installer.image.7"/>
- <res src="border8.png" id="Installer.image.8"/>
- <res src="RegistrySpec.xml" id="RegistrySpec.xml"/>
- </resources>
-
- <!-- The panels in a classic order -->
- <panels>
- <panel classname="CheckedHelloPanel"/>
- <panel classname="HTMLInfoPanel"/>
- <panel classname="LicencePanel"/>
- <panel classname="TargetPanel"/>
- <panel classname="ImgPacksPanel"/>
- <panel classname="SummaryPanel"/>
- <panel classname="InstallPanel"/>
- <panel classname="ShortcutPanel"/>
- <!-- We use temporary the FinishPanel in the 3.9 Release
- to get Access to the [Generate an automatic installation script]-Button
- to get feedback so quick as possible from all of users,
- who wants to get back this feature ;-) -->
- <panel classname="FinishPanel"/>
- </panels>
-
- <!-- The listeners section for CustomActions -->
- <listeners>
- <listener installer="SummaryLoggerInstallerListener"/>
- <listener installer="RegistryInstallerListener" uninstaller="RegistryUninstallerListener">
- <os family="windows"/>
- </listener>
- </listeners>
-
- <!-- The packs section -->
- <packs>
-
- <!-- The core files -->
- <pack name="Core" required="yes">
- <description>The IzPack core files.</description>
- <fileset dir="" targetdir="$INSTALL_PATH">
- <include name="*.txt" />
- <include name="bin/**/*" />
- <include name="lib/**/*" />
- <include name="legal/**/*" />
- </fileset>
- <executable targetfile="$INSTALL_PATH/bin/compile" stage="never"/>
- <executable targetfile="$INSTALL_PATH/bin/start.sh" stage="never"/>
- </pack>
-
- <!-- The documentation -->
- <pack name="XHTML Documentation" required="no">
- <description>The IzPack documentation (XHTML version).</description>
- <fileset dir="" targetdir="$INSTALL_PATH">
- <include name="doc/izpack/xhtml/**/*" />
- </fileset>
- </pack>
- <pack name="Java 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>
-<!--
- Disabled while doc-ng not provides a pdf ...
-
- <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="NanoXML Documentation" required="no">
- <description>NanoXML documentation (for IzPack developers).</description>
- <fileset dir="" targetdir="$INSTALL_PATH">
- <include name="doc/nanoxml/**/*" />
- </fileset>
- </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>
-
- <!-- The source code of this version -->
- <pack name="Sources" required="no">
- <description>The full IzPack source code.</description>
- <fileset dir="" targetdir="$INSTALL_PATH">
- <include name="src/**/*" />
- <exclude name="src/*.manifest" />
- </fileset>
- </pack>
-
- </packs>
-
- <!-- The native libraries to add -->
- <native type="3rdparty" name="COIOSHelper.dll" stage="both">
- <os family="windows"/>
- </native>
- <native type="izpack" name="ShellLink.dll"/>
-
-
-</installation>
Modified: izpack-src/trunk/src/dist-files/IzPack-install.xml
===================================================================
--- izpack-src/trunk/src/dist-files/IzPack-install.xml 2006-09-01 19:08:26 UTC (rev 1557)
+++ izpack-src/trunk/src/dist-files/IzPack-install.xml 2006-09-04 01:15:41 UTC (rev 1558)
@@ -204,6 +204,9 @@
<!-- The native libraries to add -->
<native type="izpack" name="ShellLink.dll"/>
+ <native type="3rdparty" name="COIOSHelper.dll" stage="both">
+ <os family="windows"/>
+ </native>
</installation>
More information about the izpack-changes
mailing list