Author: nextgens
Date: 2007-12-12 18:16:09 +0000 (Wed, 12 Dec 2007)
New Revision: 16507
Added:
trunk/apps/new_installer/l4j/
trunk/apps/new_installer/l4j/installer.xml
trunk/apps/new_installer/l4j/splash.bmp
Removed:
trunk/apps/new_installer/launcher/
trunk/apps/new_installer/sfx/
Modified:
trunk/apps/new_installer/TODO
trunk/apps/new_installer/build.xml
Log:
new_installer: switch from izPack's launcher to launch4j
Modified: trunk/apps/new_installer/TODO
===================================================================
--- trunk/apps/new_installer/TODO 2007-12-12 14:12:02 UTC (rev 16506)
+++ trunk/apps/new_installer/TODO 2007-12-12 18:16:09 UTC (rev 16507)
@@ -1,5 +1,4 @@
TODO:
- * Fix uninstallation hooks
* New packs:
-Freemail
-Plugins
Modified: trunk/apps/new_installer/build.xml
===================================================================
--- trunk/apps/new_installer/build.xml 2007-12-12 14:12:02 UTC (rev 16506)
+++ trunk/apps/new_installer/build.xml 2007-12-12 18:16:09 UTC (rev 16507)
@@ -9,13 +9,23 @@
<property name="config" value="install.xml"/>
<property name="dest" value="install.jar"/>
<property name="build" value="build"/>
+
<property name="izPack.lib" value="lib/standalone-compiler.jar"/>
- <property name="jre.lib" value="lib/jre-6u3-windows-i586-p.exe"/>
- <property name="temp" value="temp"/>
+ <property name="launch4j.dir" location="lib/launch4j/" />
- <taskdef name="izpack"
classpath="${basedir}/lib/standalone-compiler.jar"
classname="com.izforge.izpack.ant.IzPackTask"/>
+ <available file="${izPack.lib}" property="izPack_available" />
+ <fail unless="izPack_available" status="1"
+ message="You need to download izPack and to put
standalone-compiler.jar into lib/" />
- <target name="dist" description="generate the distribution"
depends="clean,compile_sha1test, compile_browser, compile_uncompress,
compile_bindtest">
+ <available file="${launch4j.dir}" property="launch4j_available" />
+ <fail unless="launch4j_available" status="1"
+ message="You need to download launch4j and to put it into lib/"
/>
+
+ <taskdef name="izpack" classpath="${izPack.lib}"
classname="com.izforge.izpack.ant.IzPackTask"/>
+
+ <!-- ================================================== -->
+
+ <target name="dist" description="generate the distribution"
depends="compile_sha1test, compile_browser, compile_uncompress,
compile_bindtest">
<echo message="Build the installer"/>
<izpack input="${config}" output="${dest}"
baseDir="${basedir}"/>
</target>
@@ -28,10 +38,6 @@
<delete dir="${build}_browser"/>
<delete dir="${build}_uncompress"/>
<delete dir="${build}_bindtest"/>
- <delete dir="${temp}"/>
- <delete file="freenet-win32.exe"/>
- <delete file="freenet-win32-with_jre.exe"/>
- <delete file="jre.exe"/>
</target>
<target name="compile_sha1test">
@@ -104,24 +110,11 @@
</jar>
</target>
- <target name="win32" depends="dist">
- <mkdir dir="${temp}"/>
- <copy todir="${temp}">
- <fileset dir=".">
- <include name="install.jar"/>
- </fileset>
- <fileset dir="launcher">
- <include name="*"/>
- </fileset>
- </copy>
+ <!-- ================================================== -->
- <exec executable="7z" dir="${temp}">
- <arg line="a -x!*7z freenet-win32.7z *"/>
- </exec>
-
- <copy file="${jre.lib}" tofile="${temp}/jre.exe"/>
- <exec executable="7z" dir="${temp}">
- <arg line="a -x!*7z freenet-win32-with_jre.7z *"/>
- </exec>
+ <target name="win32" depends="dist">
+ <taskdef name="launch4j"
classname="net.sf.launch4j.ant.Launch4jTask"
classpath="${launch4j.dir}/launch4j.jar
+ :${launch4j.dir}/lib/xstream.jar" />
+ <launch4j configFile="./l4j/installer.xml" />
</target>
</project>
Added: trunk/apps/new_installer/l4j/installer.xml
===================================================================
--- trunk/apps/new_installer/l4j/installer.xml (rev 0)
+++ trunk/apps/new_installer/l4j/installer.xml 2007-12-12 18:16:09 UTC (rev
16507)
@@ -0,0 +1,31 @@
+<launch4jConfig>
+ <headerType>gui</headerType>
+ <jar>../install.jar</jar>
+ <outfile>../setup.exe</outfile>
+ <errTitle>Freenet 0.7</errTitle>
+ <chdir>.</chdir>
+ <downloadUrl>http://www.java.com/getjava/</downloadUrl>
+ <customProcName>true</customProcName>
+ <icon>../res/windows/freenet.ico</icon>
+ <jre>
+ <minVersion>1.4.2</minVersion>
+ </jre>
+ <splash>
+ <file>splash.bmp</file>
+ <waitForWindow>true</waitForWindow>
+ <timeout>60</timeout>
+ <timeoutErr>true</timeoutErr>
+ </splash>
+ <versionInfo>
+ <fileVersion>0.7.0.0</fileVersion>
+ <txtFileVersion> </txtFileVersion>
+ <fileDescription>Freenet 0.7 installer</fileDescription>
+ <copyright>Freenet Project Inc.</copyright>
+ <productVersion>0.7.0.0</productVersion>
+ <txtProductVersion> </txtProductVersion>
+ <productName>Freenet</productName>
+ <companyName>Freenet Project Inc.</companyName>
+ <originalFilename>setup.exe</originalFilename>
+ <internalName> </internalName>
+ </versionInfo>
+</launch4jConfig>
Added: trunk/apps/new_installer/l4j/splash.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/apps/new_installer/l4j/splash.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
