Author: nextgens
Date: 2006-04-05 20:38:01 +0000 (Wed, 05 Apr 2006)
New Revision: 8472
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
Log:
installer: now we support offline install mode
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-04-05 19:55:47 UTC (rev
8471)
+++ trunk/apps/installer/antinstall-config.xml 2006-04-05 20:38:01 UTC (rev
8472)
@@ -22,15 +22,27 @@
<comment
displayText="although it pulls in a load of
code from Dijjer."/>
<comment
- displayText="This installer support either
non-anonymous testnet or anonymous darknet operation. You can run it twice to
install both."/>
+ displayText="This installer support either
non-anonymous testnet or anonymous darknet"/>
+ <comment
+ displayText="operation. You can
run it twice to install both."/>
<select
property="l33t"
- displayText="Which kind of user are you?"
+ displayText="What kind of user are you?"
defaultValue="0"
>
<option value="0" text="beginner"/>
<option value="1" text="power user"/>
</select>
+ <comment
+ displayText="You can use offline mode if the installer
hasn't access to internet."/>
+ <select
+ property="online"
+ displayText="Installation mode?"
+ defaultValue="0"
+ >
+ <option value="0" text="online"/>
+ <option value="1" text="offline"/>
+ </select>
</page>
<!-- type="license" shows a license page to click through -->
<page
@@ -83,6 +95,28 @@
force="false"/>
</page>
<page
+ ifProperty="${online}+=1"
+ type="input"
+ name="Directories"
+ displayText="Path to freenet">
+ <comment
+ displayText="Select the location of freenet core
files"/>
+ <comment
+ displayText="BE CAREFULL : we can't ensure they are
valid nor up to date"/>
+ <file
+ property="freenet-cvs-snapshot.location"
+ defaultValue="/path/to/freenet-cvs-snapshot.jar"
+ displayText="Freenet core file :"
+ checkExists="true"
+ create="false"/>
+ <file
+ property="freenet-ext.location"
+ defaultValue="/path/to/freenet-ext.jar"
+ displayText="Freenet additionnal :"
+ checkExists="true"
+ create="false"/>
+ </page>
+ <page
ifProperty="${l33t}+=1"
type="input"
name="selector"
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-04-05 19:55:47 UTC (rev 8471)
+++ trunk/apps/installer/build.xml 2006-04-05 20:38:01 UTC (rev 8472)
@@ -27,6 +27,9 @@
<condition property="is_testnet" value="true">
<istrue value="${enableTestnet}" />
</condition>
+ <condition property="offline" value="true">
+ <equals arg1="${online}" arg2="1"/>
+ </condition>
</target>
<target name="darknet" if="is_darknet">
@@ -118,7 +121,7 @@
</replace>
</target>
- <target name="default"
depends="pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,mac,final_config,windows-start,unix-start,mac-start,frost,jSite,start_browser">
+ <target name="default"
depends="pre,config_default,tgmain,tgext,darknet,testnet,copy,windows,unix,mac,final_config,windows-start,unix-start,mac-start,offline,frost,jSite,start_browser">
</target>
<target name="copy">
@@ -135,9 +138,10 @@
<replacefilter token="@serviceName@"
value="freenet-${freenetWorkingMode}"/>
<replacefilter token="@testnet@"
value="${freenetWorkingMode}"/>
</replace>
- <copy file="${basedir}/freenet-cvs-snapshot.jar"
tofile="${installDir}/freenet-cvs-snapshot.jar"/>
- <copy file="${basedir}/freenet-ext.jar"
tofile="${installDir}/freenet-ext.jar"/>
-
+ <copy file="${basedir}/freenet-cvs-snapshot.jar"
tofile="${installDir}/freenet-cvs-snapshot.jar" failonerror="false"/>
+ <copy file="${basedir}/freenet-ext.jar"
tofile="${installDir}/freenet-ext.jar" failonerror="false"/>
+ <copy file="${freenet-cvs-snapshot.location}"
tofile="${installDir}/freenet-cvs-snapshot.jar" failonerror="false"/>
+ <copy file="${freenet-ext.location}"
tofile="${installDir}/freenet-ext.jar" failonerror="false"/>
</target>
<target name="windows" if="is_windows">
@@ -254,6 +258,12 @@
</java>
</target>
+ <target name="offline" if="offline">
+ <echo message="Disabling jSite and Frost"/>
+ <property name="skip_frost" value="true"/>
+ <property name="skip_jSite" value="true"/>
+ </target>
+
<target name="frost" unless="skip_frost">
<echo message="Downloading Frost"/>
@@ -273,14 +283,14 @@
<copy file="${basedir}/jSite.jar"
tofile="${installDir}/jSite.jar"/>
</target>
- <target name="tgmain" >
+ <target name="tgmain" unless="offline">
<echo message="Downloading core components"/>
<java classpath="${basedir}/sha1test.jar" classname="Sha1Test"
failonerror="true" fork="true" resultproperty="freenet-cvs-snapshot.verified"
logError="true">
<arg value="freenet-cvs-snapshot.jar"/>
</java>
</target>
- <target name="tgext" >
+ <target name="tgext" unless="offline">
<echo message="Downloading additional components"/>
<java classpath="${basedir}/sha1test.jar" classname="Sha1Test"
failonerror="true" fork="true" resultproperty="freenet-ext.verified"
logError="true">
<arg value="freenet-ext.jar"/>
