[izpack-changes] r1798 - in izpack-src/trunk: . src src/dist-files src/lib/com/izforge/izpack/compiler
noreply at berlios.de
noreply at berlios.de
Thu Mar 29 15:26:59 CEST 2007
Author: jponge
Date: 2007-03-29 15:26:56 +0200 (Thu, 29 Mar 2007)
New Revision: 1798
Modified:
izpack-src/trunk/Versions.txt
izpack-src/trunk/src/build.xml
izpack-src/trunk/src/dist-files/IzPack-install.xml
izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Compiler.java
Log:
Merged -r1796:1797 from branches/3.10
Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt 2007-03-29 13:24:02 UTC (rev 1797)
+++ izpack-src/trunk/Versions.txt 2007-03-29 13:26:56 UTC (rev 1798)
@@ -16,8 +16,8 @@
- New Farsi langpack (Parastou Kohvaei)
- Dynamic control validation on radio and checkbox selection events (Vladimir Ralev)
- > 3.10.1 (build 2007.xx.xx)
-
+ > 3.10.1 (build 2007.03.29)
+
- Fixed NPE for pack.id == null (Fabrice Mirabile)
- Packages that are not marked as preselected must also be removed from the selectedPacks
(Martina Angela Albrecht, via Fabrice Mirabile)
@@ -37,7 +37,7 @@
- Compile listeners are included in izevent.jar (Julien Ponge).
- PacksModel: the number of required bytes could be wrong when selecting and deselecting
packs. (Stefan Wachter via Julien Ponge)
-- Turkish langpack updated (Melih Cetin vie Julien Ponge)
+- Turkish langpack updated (Melih Cetin via Julien Ponge)
> 3.10.0 (build 2007.01.29)
@@ -77,7 +77,7 @@
(Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
- Finnish localization updates (Ari Voutilainen via Julien Ponge)
- Going back and forth between profile selection and packs selection made packs selection unavailable
- (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
+ (Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
- PathInputPanel: the close button had incorrect behavior for all path input question/notification messages
(Vladimir Ralev, JBoss/RedHat, via Julien Ponge)
- PathInputPanel: logged a stacktrace on Linux systems when no defaultInstallDir was specified and
@@ -94,12 +94,12 @@
- New splash-screen (Romain Guy)
> 3.9.0 (build 2006.09.25)
-- Fix NullPointerException in CompilerConfig, if you specify a
+- Fix NullPointerException in CompilerConfig, if you specify a
compiler listener and the compiler listener class can't be found (Dennis Reil)
- Fix Accents In French Langpack (Fabrice Mirabile)
- Update French Langpack (Julien Ponge)
- New Indonesian Langpack (Hans Aikema, thanks to Thomas Edwin Santosa)
-- Updated Dutch Langpack (Hans Aikema)
+- Updated Dutch Langpack (Hans Aikema)
- Fix for ComboBox in SearchField of UserInputPanel returning
java.lang.reflect.InvocationTargetException
if no options added.(Fabrice Mirabile, thanks to Oliver Kiddle)
@@ -108,7 +108,7 @@
- Added TroubleShooting for ShellLink.dll missing in help (DocBook and XHTML)
(Fabrice Mirabile).
- Swing threading fixes (Julien Ponge).
-- Some fixes adviced by IntelliJ IDEA 5.1 code inspector (Julien Ponge).
+- Some fixes adviced by IntelliJ IDEA 5.1 code inspector (Julien Ponge).
- Spanish langpack update (Cesar Martinez Izquierdo).
- New Polish langpack (Fabrice Mirabile, thanks to Radek)
- Fixed the createPWD.sh (Fabrice Mirabile, thanks to Radek)
@@ -118,7 +118,7 @@
- Fixed indent of ShortcutPanels Headline (Marc Eppelmann)
- Made available all IzPack Variable in the ShortCut Specs (Marc Eppelmann)
- Configurable heading panel added to InstallerFrame (Klaus Bartz).
-- Panels counter (text or progressbar) useable in the heading or
+- Panels counter (text or progressbar) useable in the heading or
navigation panel (Klaus Bartz).
- Fixed logfile for AntActions (Eric Rose).
- PacksPanels: fixed disk space requirements (Ryan Shillington, via Julien
@@ -131,9 +131,9 @@
- Added a variable for install log, InstallerFrame.logfilePath (Klaus Bartz).
- Added the docu for install log (Fabrice Mirabile).
- TwoColumnLayout fix (Amit Bhayani @JBoss/RedHat).
-- New compiler (packager) comandline argument -h for IZPACK_HOME; try to
+- New compiler (packager) comandline argument -h for IZPACK_HOME; try to
automatic resolving of IZPACK_HOME if not specified (Klaus Bartz).
-- New layout manager (IzPanelLayout) for simplify layouting of IzPanels.
+- New layout manager (IzPanelLayout) for simplify layouting of IzPanels.
Configurable anchor, gaps, stretch rules etc. (Klaus Bartz).
- Documentation figures refreshment (Julien Ponge).
- Throw an IllegalArgumentException in the compiler if the declared panel
@@ -151,7 +151,7 @@
- Write Desktop shortcuts to all known local and ypbinded users "desktop" folders.
(Marc Eppelmann)
- Write common shortcuts and their icons to the new freedesktop.org common
- "/usr/share/applications" and "/usr/share/pixmaps" folders to display
+ "/usr/share/applications" and "/usr/share/pixmaps" folders to display
these in the commons [start].menu (Marc Eppelmann)
- New InstallationGroupPanel for grouping packs together (Amit Bhayani, Scott Starks,
Alex Pinkin @JBoss/RedHat, via Julien Ponge).
@@ -174,11 +174,11 @@
- Subgrouping of shortcuts (Weiji Guo).
- Added Korean language support (Fabrice Mirabile, thanks to Dongsu Jang).
- Added new panel SelectedPrinterPanel which allows the user to chose any local
- printer installed and set it to the $SELECTED_PRINTER variable. (Hal Vaughan
+ printer installed and set it to the $SELECTED_PRINTER variable. (Hal Vaughan
and Fabrice Mirabile).
> 3.8.0 (build 2005.10.27)
-- Added 2 processor classes having the ability to fill a combobox
+- Added 2 processor classes having the ability to fill a combobox
with all available unix user and groups (Thorsten Kamann)
- All default values for the InputPanel (the values of the set attribute)
can conatins variables at now. All
@@ -186,7 +186,7 @@
- The resources of the target panel can contains variables at now. All
variables will be replaces by the VariableSubstitutor (Thorsten Kamann)
- Fixed chinese Flag.
-- Patch for InstallerFrame to support user confirmation after pressing
+- Patch for InstallerFrame to support user confirmation after pressing
windows "X" closing button.
- Update the IzPackTask to support an embedded xml installation document that
replaces @{x} property references with the corresponding ant property.
@@ -218,18 +218,18 @@
and Scott Stark).
- New Turkish langpack (Levent Bayindir).
- Mac OS X: better Swing integration.
-- Configurable notation of language names in the language selection dialog
+- Configurable notation of language names in the language selection dialog
(Christian Murphy | Klaus Bartz).
- Fail message in SimpleFinishPanel (Klaus Bartz).
- Interrupt handling changed (Klaus Bartz).
-- Fixed shortcuts for RedHat and Mandrake (Fabrice Mirabile, thanks to Vitor
+- Fixed shortcuts for RedHat and Mandrake (Fabrice Mirabile, thanks to Vitor
Rodrigues for the code).
- New ConditionalUserInputPanel (Andreas Breiter, patches #407, #408).
- ExecuteForPack, allow processing depending on the selected pack (Fabrice
Mirabile, thanks to Johannes Gutleber for the code).
- Ant file cleanup: requires ant 1.6. Incremental builds of jar files.
- Macrodefs instead of antcalls (Chad McHenry).
-- createForUnselectedPack, show a userinputapanel if a pack is not selected
+- createForUnselectedPack, show a userinputapanel if a pack is not selected
(Fabrice Mirabile, thanks to Stefano Gamma)
- Registry support on Windows (Klaus Bartz).
- New CheckedHelloPanel which checks already installed products (Klaus Bartz).
@@ -264,7 +264,7 @@
- The Danish langpack was empty by mistake in 3.7.0.
- Silent installations fix (Oscar Sierra).
- Free disk space bugfix on Solaris (Oscar Sierra).
-- Installation runable with VM versions < 1.4 again (Klaus Bartz)
+- Installation runable with VM versions < 1.4 again (Klaus Bartz)
(implementation for bug #2268 changed).
- Italian langpack fixes (Fabrice Mirabille).
- UserInputPanel: bug fixes by Per Abich (bugs #3233 and #3283).
@@ -317,7 +317,7 @@
(bug #2713).
- Installers: avoid showing an empty JFrame behind the languages selection
dialog (observed on X11).
-- UserInputPanel: the autodetect button is hidden if not needed
+- UserInputPanel: the autodetect button is hidden if not needed
(Michael Hagedorn).
- A tutorial is now available.
- New Czech langpack (Jan Pavlovic).
Modified: izpack-src/trunk/src/build.xml
===================================================================
--- izpack-src/trunk/src/build.xml 2007-03-29 13:24:02 UTC (rev 1797)
+++ izpack-src/trunk/src/build.xml 2007-03-29 13:26:56 UTC (rev 1798)
@@ -1,7 +1,7 @@
<project name="IzPack" default="all" basedir="..">
<!--
$Id$
-
+
build.xml first written by Pierre Dittgen (pierre.dittgen at criltelecom.com)
This file is intended to be used with ant (http://jakarta.apache.org/ant),
a java/xml makefile utility.
@@ -79,87 +79,87 @@
30.04.2003: (by Jonathan Halliday)
Change to panel compilation target, for panel automation
(silent install) support.
-
+
05.07.2003: (by Julien Ponge)
Added a target to fix the files encoding and cr/lf (fix.crlf).
-
+
10.09.2003: (by Julien Ponge)
Reformatting, 4 spaces tabs, got rid of residual hard tabs.
-
+
19.09.2003: (by Julien Ponge)
Added a run.installer target to test an installer.
-
+
06.12.2003: (by Julien Ponge)
Removed the frontend-related sections.
16.12.2003: (by Julien Ponge)
Added the SudoPanel building call.
-
+
18.02.2004: (by Julien Ponge)
New installer naming scheme (IzPack-install-{version}.jar).
-
+
29.05.2004: (by Julien Ponge)
New SimpleFinishPanel.
30.07.2004: (by Klaus Bartz)
Simple CustomAction stuff added.
-
+
09.09.2004: (by Klaus Bartz)
Clean up of CustomActions added.
New uninstaller-ext.jar with native helper stuff for native libs
in uninstaller.
-
+
14.10.2004: (by Klaus Bartz)
New izevent.jar with the base classes of the custom action stuff
to support creation of custom action jars without IzPack source tree
-
+
25.10.2004: (by Klaus Bartz)
"Standard" CustomActions AntActionInstallerListener and
AntActionUninstallerListener added
-
+
03.05.2005: (by Klaus Bartz)
Target generated.installer-reg added:
Creates an installer for IzPack with registry support
-
+
09.05.2005: (by Marc Eppelman)
Target dist+run added:
convenient :) makes a complete dist an installer and run them
-
+
11.05.2005: (by Fabrice Mirabile)
Target cleandistreg added:
Clean, Regenerate installer and installer with reg support. Avoid use of bad jars during installation.
-
+
18.07.2005: (by Julien Ponge)
Enforce source / target compatibility, now 1.4 / 1.4.
-
+
02.09.2005: (by Klaus Bartz)
Unicode support of ShellLink.
-
+
09.09.2005: (Marc.Eppelmann)
Added start.sh to the shipped files in bin-folder.
-
+
10.01.2006: (by Fabrice Mirabile)
Added the splashscreen to the cleandistreg target
-
+
06.04.2006: (Marc Eppelmann)
Inserted the fix.crlf target in the depends-list of target "all" to prevent encoding problems.
-
+
26.06.2006: (Marc Eppelmann)
Extracted / Reordered some dist related targets to prevent double copy actions.
Also fixed the fix.crlf basedir
-
+
27.08.2006: (Marc Eppelmann)
- Embedd ShortcutPanel*.java
-
- 14.09.2006: (Marc Eppelmann)
+ Embedd ShortcutPanel*.java
+
+ 14.09.2006: (Marc Eppelmann)
Added target src.tar.gz and clean.src.tar.gz
-
- 19.10.2006: (Fabrice Mirabile & Hal Vaughan)
+
+ 19.10.2006: (Fabrice Mirabile & Hal Vaughan)
Added DataCheckPanel
- 10.10.2006: (Fabrice Mirabile)
+ 10.10.2006: (Fabrice Mirabile)
Fixed target src.tar.gz and clean.src.tar.gz
-
+
11.02.2007: (Ari Voutilainen)
Added 'preservelastmodified="true"' to all 'copy todir' commands to keep original file date
and time. This will effect in directory _dist. This won't effect to compiled files and
@@ -204,7 +204,7 @@
<property file="src/ant.properties" />
<property name="ver" value="3.10" />
- <property name="rel" value="0" />
+ <property name="rel" value="1" />
<property name="build.number" value="${ver}.${rel}" />
<property name="src.dir" value="${basedir}/src/lib" />
@@ -375,7 +375,7 @@
<include name="com/izforge/izpack/panels/PathSelectionPanel.java" />
<include name="com/izforge/izpack/*.java" />
<include name="com/izforge/izpack/gui/*.java" />
- <include name="com/izforge/izpack/io/*.java" />
+ <include name="com/izforge/izpack/io/*.java" />
<include name="com/izforge/izpack/installer/*.java" />
<include name="com/izforge/izpack/panels/NextMedia*.java"/>
<include name="com/izforge/izpack/util/*.java" />
@@ -430,11 +430,11 @@
debuglevel="${debuglevel}">
<include name="com/izforge/izpack/LocaleDatabase.java" />
<include name="com/izforge/izpack/gui/*.java" />
-
+
<include name="com/izforge/izpack/util/*.java"/>
<include name="com/izforge/izpack/util/os/*.java"/>
<include name="com/izforge/izpack/util/os/unix/*.java"/>
-
+
<include name="com/izforge/izpack/uninstaller/*.java" />
<exclude name="com/izforge/izpack/gui/IzPackKMetalTheme.java" />
<include name="net/n3/nanoxml/*.java" />
@@ -453,7 +453,7 @@
<include name="com/izforge/izpack/LocaleDatabase.class" />
<include name="com/izforge/izpack/gui/*.class" />
<include name="com/izforge/izpack/uninstaller/*.class" />
- <include name="com/izforge/izpack/ExecutableFile.class" />
+ <include name="com/izforge/izpack/ExecutableFile.class" />
<exclude name="com/izforge/izpack/gui/IzPackKMetalTheme.class" />
<include name="net/n3/nanoxml/*.class" />
</fileset>
@@ -480,7 +480,7 @@
<include name="com/izforge/izpack/util/os/*.java"/>
<include name="com/izforge/izpack/util/os/unix/*.java"/>
<include name="com/izforge/izpack/util/xml/*.java"/>
-
+
<exclude name="com/izforge/izpack/gui/IzPackKMetalTheme.java" />
<include name="net/n3/nanoxml/*.java" />
</javac>
@@ -495,7 +495,7 @@
</jar>
</target>
- <!--
+ <!--
======================================================================
Create Panel Modules
======================================================================
@@ -531,8 +531,8 @@
</macrodef>
<!-- Compile all panels and put them at the right location -->
- <!--
- If you add a another, and the build fails because it can't find a class,
+ <!--
+ If you add a another, and the build fails because it can't find a class,
be sure to explicitly include the .java file in the nested fileset.
This also acts as a check to help limit dependancies.
-->
@@ -670,7 +670,7 @@
</build-panel>
</target>
- <!--
+ <!--
======================================================================
Create Listener Modules
======================================================================
@@ -692,7 +692,7 @@
<include name="com/izforge/izpack/event/Simple*nstallerListener.java" />
<include name="com/izforge/izpack/event/SimpleCompilerListener.java" />
<include name="com/izforge/izpack/event/InstallerListener.java" />
- <include name="com/izforge/izpack/event/CompilerListener.java" />
+ <include name="com/izforge/izpack/event/CompilerListener.java" />
<include name="com/izforge/izpack/event/UninstallerListener.java" />
<include name="com/izforge/izpack/util/IoHelper.java" />
</javac>
@@ -791,8 +791,8 @@
</macrodef>
<!-- Compile all custom actions (listener) and put them at the right location -->
- <!--
- If you add a another, and the build fails because it can't find a class,
+ <!--
+ If you add a another, and the build fails because it can't find a class,
be sure to explicitly include the .java file in the nested fileset.
This also acts as a check to help limit dependancies.
-->
@@ -914,10 +914,10 @@
description="Creates the javadoc-api and customer documentation">
</target>
-
-
- <!-- - - - - - - - - - - - - - - - - -
- target: taskdef
+
+
+ <!-- - - - - - - - - - - - - - - - - -
+ target: taskdef
- - - - - - - - - - - - - - - - - -->
<target name="taskdef.dist">
<!-- Allows us to use the IzPack Ant task -->
@@ -925,10 +925,10 @@
classpath="${basedir}/lib/compiler.jar"
classname="com.izforge.izpack.ant.IzPackTask" />
</target>
-
-
- <!-- - - - - - - - - - - - - - - - - -
- target: copy.natives
+
+
+ <!-- - - - - - - - - - - - - - - - - -
+ target: copy.natives
- - - - - - - - - - - - - - - - - -->
<target name="copy.dist.natives">
<echo message="Copies the recent changed native files to the ${basedir}/bin directory" />
@@ -951,9 +951,9 @@
preservelastmodified="true" />
</target>
-
- <!-- - - - - - - - - - - - - - - - - -
- target: copy.distfiles
+
+ <!-- - - - - - - - - - - - - - - - - -
+ target: copy.distfiles
- - - - - - - - - - - - - - - - - -->
<target name="copy.dist.files">
<echo message="Copies the general files to the dist directory" />
@@ -992,16 +992,16 @@
<echo message="Copies the bin files to the dist directory" />
<copy todir="${dist.dir}/bin" includeEmptyDirs="yes" overwrite="yes" preservelastmodified="true">
<fileset dir="${dist-files.dir}">
- <include name="compile*" />
+ <include name="compile*" />
<include name="lcp.bat" />
<include name="start.sh"/>
</fileset>
</copy>
</target>
-
- <!-- - - - - - - - - - - - - - - - - -
- target: replace.dist.buildnumber
+
+ <!-- - - - - - - - - - - - - - - - - -
+ target: replace.dist.buildnumber
- - - - - - - - - - - - - - - - - -->
<target name="replace.dist.buildnumber">
<replace file="${dist.dir}/shortcutSpec.xml"
@@ -1034,20 +1034,20 @@
compressionlevel="9" />
<echo>
sucessfully created:
-${dist.dir}/${installer.name}${ver}.${rel}.jar
+${dist.dir}/${installer.name}${ver}.${rel}.jar
</echo>
</target>
-
-
- <!-- - - - - - - - - - - - - - - - - -
- target: prepare.install.dist
+
+
+ <!-- - - - - - - - - - - - - - - - - -
+ target: prepare.install.dist
- - - - - - - - - - - - - - - - - -->
<target name="prepare.install.dist" depends="taskdef.dist, copy.dist.natives, copy.dist.files, replace.dist.buildnumber, fix.crlf">
-
+
</target>
-
+
<!-- =================================
- Creates a normal installer for IzPack
+ Creates a normal installer for IzPack
================================= -->
<target name="generate.installer" depends="prepare.install.dist">
<antcall target="exec.izpack.compiler">
@@ -1080,7 +1080,7 @@
</fixcrlf>
<fixcrlf srcdir="${dist.bin.dir}" eol="unix" eof="remove">
<include name="**/*.sh"/>
- <include name="compile"/>
+ <include name="compile"/>
</fixcrlf>
</target>
@@ -1103,16 +1103,16 @@
<target name="cleandistreg"
depends="clean, splashscreen, dist, generate.installer"
description="creates a full dist with Win32 uninstall registry support" />
-
- <!-- =================================
- target: clean.src.tar.gz
+
+ <!-- =================================
+ target: clean.src.tar.gz
================================= -->
<target name="clean.src.tar.gz" depends="clean, src.tar.gz" description="--> creates a src.tar.gz after clean up">
</target>
-
- <!-- =================================
- target: src.tar.gz
+
+ <!-- =================================
+ target: src.tar.gz
================================= -->
<target name="src.tar.gz" description="--> creates a src.tar.gz ">
<mkdir dir="${basedir}/_src${dist.subdir}"/>
@@ -1161,8 +1161,8 @@
</target>
- <!-- =================================
- target: ShellLink.Javah
+ <!-- =================================
+ target: ShellLink.Javah
================================= -->
<target name="ShellLink.Javah"
depends="compile.installer"
@@ -1174,16 +1174,16 @@
</target>
- <!-- =================================
- target: time - takes a timestamp
+ <!-- =================================
+ target: time - takes a timestamp
================================= -->
<target name="time">
<tstamp />
</target>
- <!-- =================================
- target: dump.properties - dumps the curent properties into the $os_$timestamp.properties file
+ <!-- =================================
+ target: dump.properties - dumps the curent properties into the $os_$timestamp.properties file
================================= -->
<target name="dump.properties" depends="time" description="dump.environment (for debug)">
<echoproperties destfile="${basedir}/ant_properties_at_${os.name}-${os.arch}-${os.version}_at_${DSTAMP}-${TSTAMP}.txt" />
Modified: izpack-src/trunk/src/dist-files/IzPack-install.xml
===================================================================
--- izpack-src/trunk/src/dist-files/IzPack-install.xml 2007-03-29 13:24:02 UTC (rev 1797)
+++ izpack-src/trunk/src/dist-files/IzPack-install.xml 2007-03-29 13:26:56 UTC (rev 1798)
@@ -1,10 +1,10 @@
<!--
$Id$
-
+
IzPack installer XML file
-
+
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
@@ -12,7 +12,7 @@
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 :-)
-->
@@ -23,22 +23,23 @@
<!-- The info section -->
<info>
<appname>IzPack</appname>
- <appversion>3.10.0</appversion>
+ <appversion>3.10.1</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="Dennis Reil (developer)" />
-
+ <author email="" name="JBoss/RedHat: Vladimir Ralev (developers)" />
+
<author email="" name="Francois Guillet (contributor)"/>
- <author email="" name="JBoss/RedHat: Vladimir Ralev (contributors)" />
<author email="" name="Nils Meier (contributor)" />
<author email="" name="Markus Schlegel (contributor)" />
<author email="" name="Hal Vaughan (contributor)" />
<author email="" name="Ari Voutilainen (contributor)" />
<author email="" name="Stefan Wachter (contributor)" />
<author email="" name="Romain Guy (contributor)" />
+ <author email="" name="Melih Cetin (contributor)" />
<author email=""
name="... the (many) other developers and contributors to the previous releases!"/>
@@ -58,7 +59,7 @@
<modifier key="headingPanelCounter" value="progressbar"/>
<modifier key="headingPanelCounterPos" value="inNavigationPanel"/>
<modifier key="allYGap" value="3"/>
- <modifier key="paragraphYGap" value="10"/>
+ <modifier key="paragraphYGap" value="10"/>
<modifier key="filler1YGap" value="5"/>
<modifier key="filler3XGap" value="10"/>
</guiprefs>
@@ -107,8 +108,8 @@
<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="doc-pdf.png" id="ImgPacksPanel.img.2" />
-->
<res src="sample.png" id="ImgPacksPanel.img.4"/>
<res src="src.png" id="ImgPacksPanel.img.5"/>
@@ -134,9 +135,9 @@
<panel classname="SummaryPanel" id="summarypanel"/>
<panel classname="InstallPanel" id="installpanel"/>
<panel classname="ShortcutPanel" id="shortcutpanel"/>
- <!-- We use temporary the FinishPanel in the 3.9 Release
+ <!-- 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,
+ to get feedback so quick as possible from all of users,
who wants to get back this feature ;-) -->
<panel classname="FinishPanel" id="finishpanel"/>
</panels>
@@ -144,7 +145,7 @@
<!-- The listeners section for CustomActions -->
<listeners>
<listener installer="SummaryLoggerInstallerListener"/>
- <listener installer="RegistryInstallerListener"
+ <listener installer="RegistryInstallerListener"
uninstaller="RegistryUninstallerListener">
<os family="windows"/>
</listener>
@@ -183,7 +184,7 @@
</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">
Modified: izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Compiler.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Compiler.java 2007-03-29 13:24:02 UTC (rev 1797)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Compiler.java 2007-03-29 13:26:56 UTC (rev 1798)
@@ -1,21 +1,21 @@
/*
* $Id$
* IzPack - Copyright 2001-2007 Julien Ponge, All Rights Reserved.
- *
+ *
* http://www.izforge.com/izpack/
* http://developer.berlios.de/projects/izpack/
- *
+ *
* Copyright 2001 Johannes Lehtinen
* Copyright 2002 Paul Wilkinson
* Copyright 2004 Gaganis Giorgos
*
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -54,9 +54,9 @@
* configured using the object representations of the install.xml
* configuration. The install.xml configuration is now handled by the
* CompilerConfig class.
- *
+ *
* @see CompilerConfig
- *
+ *
* @author Julien Ponge
* @author Tino Schwarze
* @author Chadwick McHenry
@@ -64,7 +64,7 @@
public class Compiler extends Thread
{
/** The IzPack version. */
- public final static String IZPACK_VERSION = "3.10.0";
+ public final static String IZPACK_VERSION = "3.10.1";
/** The IzPack home directory. */
public static String IZPACK_HOME = ".";
@@ -89,7 +89,7 @@
/** Replaces the properties in the install.xml file prior to compiling */
private VariableSubstitutor propertySubstitutor;
-
+
private String compr_format;
private int compr_level;
private PackagerListener packagerlistener;
@@ -105,7 +105,7 @@
/**
* The constructor.
- *
+ *
* @param basedir The base directory.
* @param kind The installer kind.
* @param output The installer filename.
@@ -118,7 +118,7 @@
/**
* The constructor.
- *
+ *
* @param basedir The base directory.
* @param kind The installer kind.
* @param output The installer filename.
@@ -132,7 +132,7 @@
/**
* The constructor.
- *
+ *
* @param basedir The base directory.
* @param kind The installer kind.
* @param output The installer filename.
@@ -140,7 +140,7 @@
* @param compr_level Compression level to be used if supported.
* @throws CompilerException
*/
- public Compiler(String basedir, String kind, String output,
+ public Compiler(String basedir, String kind, String output,
String compr_format, int compr_level) throws CompilerException
{
// Default initialisation
@@ -155,7 +155,7 @@
// add izpack built in property
setProperty("izpack.version", IZPACK_VERSION);
setProperty("basedir", basedir);
-
+
this.compr_format = compr_format;
this.compr_level = compr_level;
}
@@ -182,7 +182,7 @@
throw new CompilerException("Error loading packager class: " + classname);
}
}
-
+
/**
* Returns the packager listener.
* @return the packager listener
@@ -193,7 +193,7 @@
}
/**
* Sets the packager listener.
- *
+ *
* @param listener The listener.
*/
public void setPackagerListener(PackagerListener listener)
@@ -256,7 +256,7 @@
/**
* Compiles the installation.
- *
+ *
* @exception Exception Description of the Exception
*/
public void createInstaller() throws Exception
@@ -274,10 +274,10 @@
if( decoderClassNames[i] != null && decoderClassNames[i].length > 0)
addJarContent(compressorURL, Arrays.asList(decoderClassNames[i]));
}
-
-
+
+
}
-
+
// We ask the packager to create the installer
packager.createInstaller(new File(output));
this.compileFailed = false;
@@ -339,7 +339,7 @@
/**
* Get the value of a property currerntly known to izpack.
- *
+ *
* @param name the name of the property
* @return the value of the property, or null
*/
@@ -350,7 +350,7 @@
/**
* Add a name value pair to the project property set. Overwriting any existing value except system properties.
- *
+ *
* @param name the name of the property
* @param value the value to set
* @return an indicator if the name value pair was added.
@@ -367,7 +367,7 @@
/**
* Add a name value pair to the project property set. It is <i>not</i> replaced it is already
* in the set of properties.
- *
+ *
* @param name the name of the property
* @param value the value to set
* @return true if the property was not already set
@@ -385,7 +385,7 @@
/**
* Add jar content to the installation.
- * @param content
+ * @param content
*/
public void addJarContent(URL content)
{
@@ -396,7 +396,7 @@
* Adds a jar file content to the installer. Package structure is maintained. Need mechanism to
* copy over signed entry information. If the given file list is null the hole contents of the
* jar file will be copied else only the listed.
- *
+ *
* @param content The url of the jar to add to the installer. We use a URL so the jar may be
* nested within another.
* @param files to be copied
@@ -408,7 +408,7 @@
/**
* Add a custom jar to the installation.
- *
+ *
* @param ca
* @param url
*/
@@ -459,7 +459,7 @@
*/
public void addPanelJar(Panel panel, URL url)
{
- packager.addPanelJar(panel, url);
+ packager.addPanelJar(panel, url);
}
/**
* Add a resource to the installation.
@@ -475,13 +475,13 @@
* Checks whether the dependencies stated in the configuration file are correct. Specifically it
* checks that no pack point to a non existent pack and also that there are no circular
* dependencies in the packs.
- * @throws CompilerException
+ * @throws CompilerException
*/
public void checkDependencies() throws CompilerException
{
checkDependencies(packager.getPacksList());
}
-
+
/**
* Checks whether the excluded packs exist. (simply calles the other function)
* @throws CompilerException
@@ -490,11 +490,11 @@
{
checkExcludes(packager.getPacksList());
}
-
+
/**
* This checks if there are more than one preselected packs per excludeGroup.
* @param packs list of packs which should be checked
- * @throws CompilerException
+ * @throws CompilerException
*/
public void checkExcludes(List packs) throws CompilerException
{
@@ -520,7 +520,7 @@
}
}
}
-
+
}
}
/**
@@ -528,7 +528,7 @@
* checks that no pack point to a non existent pack and also that there are no circular
* dependencies in the packs.
* @param packs - List<Pack> representing the packs in the installation
- * @throws CompilerException
+ * @throws CompilerException
*/
public void checkDependencies(List packs) throws CompilerException
{
@@ -551,7 +551,7 @@
* We use the dfs graph search algorithm to check whether the graph is acyclic as described in:
* Thomas H. Cormen, Charles Leiserson, Ronald Rivest and Clifford Stein. Introduction to
* algorithms 2nd Edition 540-549,MIT Press, 2001
- *
+ *
* @param packs The graph
* @param names The name map
* @return -2 if back edges exist, else 0
@@ -641,11 +641,11 @@
* not be absolute. The path must use '/' as the fileSeparator (it's used to access the jar
* file). If the resource is not found, a CompilerException is thrown indicating fault in the
* parent element.
- *
+ *
* @param path the relative path (using '/' as separator) to the resource.
* @param desc the description of the resource used to report errors
* @return a URL to the resource.
- * @throws CompilerException
+ * @throws CompilerException
*/
public URL findIzPackResource(String path, String desc)
throws CompilerException
@@ -675,9 +675,9 @@
/**
* Create parse error with consistent messages. Includes file name. For use When parent is
* unknown.
- *
+ *
* @param message Brief message explaining error
- * @throws CompilerException
+ * @throws CompilerException
*/
public void parseError(String message) throws CompilerException
{
@@ -687,10 +687,10 @@
/**
* Create parse error with consistent messages. Includes file name. For use When parent is
* unknown.
- *
+ *
* @param message Brief message explaining error
* @param how throwable which was catched
- * @throws CompilerException
+ * @throws CompilerException
*/
public void parseError(String message, Throwable how) throws CompilerException
{
@@ -701,7 +701,7 @@
/**
* The main method if the compiler is invoked by a command-line call.
* This simply calls the CompilerConfig.main method.
- *
+ *
* @param args The arguments passed on the command-line.
*/
public static void main(String[] args)
@@ -717,7 +717,7 @@
* posible, the listeners will be validated. Listener declaration is a fragmention in
* install.xml like : <listeners> <listener compiler="PermissionCompilerListener"
* installer="PermissionInstallerListener"/1gt; </listeners>
- *
+ *
* @param type The listener type.
* @param className The class name.
* @param jarPath The jar path.
@@ -742,7 +742,7 @@
/**
* Returns a list which contains the pathes of all files which are included in the given url.
* This method expects as the url param a jar.
- *
+ *
* @param url url of the jar file
* @return full qualified paths of the contained files
* @throws Exception
@@ -765,7 +765,7 @@
/**
* Returns the qualified class name for the given class. This method expects as the url param a
* jar file which contains the given class. It scans the zip entries of the jar file.
- *
+ *
* @param url url of the jar file which contains the class
* @param className short name of the class for which the full name should be resolved
* @return full qualified class name
@@ -805,7 +805,7 @@
/**
* Used to handle the packager messages in the command-line mode.
- *
+ *
* @author julien created October 26, 2002
*/
static class CmdlinePackagerListener implements PackagerListener
@@ -813,7 +813,7 @@
/**
* Print a message to the console at default priority (MSG_INFO).
- *
+ *
* @param info The information.
*/
public void packagerMsg(String info)
@@ -823,7 +823,7 @@
/**
* Print a message to the console at the specified priority.
- *
+ *
* @param info The information.
* @param priority priority to be used for the message prefix
*/
More information about the izpack-changes
mailing list