Author: nextgens
Date: 2007-12-11 00:03:48 +0000 (Tue, 11 Dec 2007)
New Revision: 16470
Added:
trunk/apps/new_installer/launcher/
trunk/apps/new_installer/launcher/launcher.exe
trunk/apps/new_installer/launcher/launcher.ini
trunk/apps/new_installer/launcher/launcher_fr.qm
trunk/apps/new_installer/sfx/
trunk/apps/new_installer/sfx/7zS.sfx
trunk/apps/new_installer/sfx/7zip.config
Removed:
trunk/apps/new_installer/res/installer.exe
Modified:
trunk/apps/new_installer/build.xml
Log:
new_installer: more work on the new sfx archive
Modified: trunk/apps/new_installer/build.xml
===================================================================
--- trunk/apps/new_installer/build.xml 2007-12-11 00:01:46 UTC (rev 16469)
+++ trunk/apps/new_installer/build.xml 2007-12-11 00:03:48 UTC (rev 16470)
@@ -11,10 +11,11 @@
<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"/>
<taskdef name="izpack"
classpath="${basedir}/lib/standalone-compiler.jar"
classname="com.izforge.izpack.ant.IzPackTask"/>
- <target name="dist" description="generate the distribution"
depends="compile_sha1test, compile_browser, compile_uncompress,
compile_bindtest">
+ <target name="dist" description="generate the distribution"
depends="clean,compile_sha1test, compile_browser, compile_uncompress,
compile_bindtest">
<echo message="Build the installer"/>
<izpack input="${config}" output="${dest}"
baseDir="${basedir}"/>
</target>
@@ -27,6 +28,7 @@
<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"/>
@@ -103,15 +105,23 @@
</target>
<target name="win32" depends="dist">
- <copy file="res/installer.exe" tofile="freenet-win32.exe"/>
- <exec executable="7z">
- <arg line="a -sfx freenet-win32.exe install.jar"/>
+ <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 freenet-win32.7z *"/>
</exec>
- <copy file="freenet-win32.exe"
tofile="freenet-win32-with_jre.exe"/>
- <copy file="${jre.lib}" tofile="jre.exe"/>
- <exec executable="7z">
- <arg line="a -sfx freenet-win32-with_jre.exe jre.exe"/>
+ <copy file="${jre.lib}" tofile="${temp}/jre.exe"/>
+ <exec executable="7z" dir="${temp}">
+ <arg line="a freenet-win32-with_jre.7z jre.exe"/>
</exec>
</target>
</project>
Added: trunk/apps/new_installer/launcher/launcher.exe
===================================================================
(Binary files differ)
Property changes on: trunk/apps/new_installer/launcher/launcher.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/apps/new_installer/launcher/launcher.ini
===================================================================
--- trunk/apps/new_installer/launcher/launcher.ini
(rev 0)
+++ trunk/apps/new_installer/launcher/launcher.ini 2007-12-11 00:03:48 UTC
(rev 16470)
@@ -0,0 +1,10 @@
+# Sample launcher.ini file.
+# Feel free to use it as a basis for your own ones.
+
+# Global entries, can be overriden by specific ones.
+jar = install.jar
+download = http://www.java.com/getjava/
+
+# Win32 specific entries
+[win32]
+jre = jre.exe
Added: trunk/apps/new_installer/launcher/launcher_fr.qm
===================================================================
(Binary files differ)
Property changes on: trunk/apps/new_installer/launcher/launcher_fr.qm
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/apps/new_installer/res/installer.exe
===================================================================
(Binary files differ)
Added: trunk/apps/new_installer/sfx/7zS.sfx
===================================================================
(Binary files differ)
Property changes on: trunk/apps/new_installer/sfx/7zS.sfx
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/apps/new_installer/sfx/7zip.config
===================================================================
--- trunk/apps/new_installer/sfx/7zip.config (rev 0)
+++ trunk/apps/new_installer/sfx/7zip.config 2007-12-11 00:03:48 UTC (rev
16470)
@@ -0,0 +1,4 @@
+;!@Install@!UTF-8!
+Title="Freenet 0.7"
+RunProgram="launcher.exe"
+;!@InstallEnd@!
