Author: nextgens
Date: 2006-03-03 18:14:37 +0000 (Fri, 03 Mar 2006)
New Revision: 8145
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
Log:
Modified according to [Tech] Ant Installer | download/sha1check is still b0rked
atm
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-03-03 16:48:24 UTC (rev
8144)
+++ trunk/apps/installer/antinstall-config.xml 2006-03-03 18:14:37 UTC (rev
8145)
@@ -18,7 +18,7 @@
title="true"/>
<!-- there is a bug : we need to split the text :-S -->
<comment
- displayText="This is the 0.7 rewrite of
Freenet. This is largely rewritten from scratch,"/>
+ displayText="This is the 0.7 rewrite of
Freenet. It has been largely rewritten from scratch,"/>
<comment
displayText="although it pulls in a load of
code from Dijjer."/>
<comment
@@ -53,6 +53,7 @@
displayText="Select an installation directory"
checkExists="true"
create="true"/>
+<!-- FIXME: Not yet
<comment
displayText="Enter a password in the field
below"/>
<password
@@ -61,7 +62,7 @@
defaultValue="MyFavouritePasswordNumber1"
regex="^[a-zA-Z_0-9]*[a-zA-Z_0-9]{8}[a-zA-Z_0-9]*$"
force="false"/>
-
+-->
</page>
<page
ifProperty="${l33t}+=1"
@@ -100,12 +101,8 @@
name="config"
displayText="Initial node configuration (1)">
<comment
- displayText="Enter your hostname and portnumber
in the following fields"/>
- <text
- property="hostName"
- displayText="Hostname :"
- defaultValue="me.dyndns.org"
- force="false"/>
+ displayText="Enter your node portnumber in the
following field"/>
+ <!-- TODO: try to bind it to verify it's free -->
<validated
property="portNumber"
displayText="Port :"
@@ -127,6 +124,14 @@
name="config"
displayText="Initial node configuration (2)">
<comment
+ displayText="Enter your host name in the
following field if you want to override ip detection"/>
+
+ <text
+ property="hostName"
+ displayText="Hostname :"
+ defaultValue="me.dyndns.org"
+ force="false"/>
+ <comment
displayText="How much bandwidth may be used by FRED?"/>
<large-select
property="bandwidth"
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-03 16:48:24 UTC (rev 8144)
+++ trunk/apps/installer/build.xml 2006-03-03 18:14:37 UTC (rev 8145)
@@ -18,9 +18,10 @@
<property name="dsSize" value="1"/>
<property name="bandwidth" value="15"/>
<property name="portNumber" value="9999"/>
+ <property name="hostName" value=""/>
</target>
- <target name="default" depends="pre,env,tgvrfy">
+ <target name="default" depends="pre,env,tgmain,tgext,tgvrfy">
<copy file="${basedir}/bin/run.sh"
tofile="${installDir}/run.sh"/>
<copy file="${basedir}/bin/run.cmd"
tofile="${installDir}/run.cmd"/>
<copy file="${basedir}/freenet-cvs-snapshot.jar"
tofile="${installDir}/freenet-cvs-snapshot.jar"/>
