Author: nextgens
Date: 2006-02-22 13:59:36 +0000 (Wed, 22 Feb 2006)
New Revision: 8107
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build-installer.xml
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/config/freenet.ini
trunk/apps/installer/src/Sha1Test.java
Log:
New version of the installer
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-02-22 13:06:45 UTC (rev
8106)
+++ trunk/apps/installer/antinstall-config.xml 2006-02-22 13:59:36 UTC (rev
8107)
@@ -31,6 +31,7 @@
>
<option value="0" text="beginner"/>
<option value="1" text="power user"/>
+ <option value="2" text="expert"/>
</select>
</page>
<!-- type="license" shows a license page to click through -->
@@ -94,6 +95,7 @@
force="true"/>
</page>
<page
+ ifProperty="${l33t}!=2"
type="input"
name="config"
displayText="Initial node configuration (1)">
@@ -120,13 +122,13 @@
force="false"/>
</page>
<page
- ifProperty="${l33t}+=1"
+ ifProperty="${l33t}==1"
type="input"
name="config"
displayText="Initial node configuration (2)">
<comment
displayText="How much bandwidth may be used by FRED?"/>
- <select
+ <large-select
property="bandwidth"
displayText="Bandwidth value"
defaultValue="15"
@@ -138,11 +140,11 @@
<option text="60Kb/s" value="60"/>
<option text="100Kb/s" value="100"/>
<option text="150Kb/s" value="150"/>
- </select>
+ </large-select>
<comment
displayText="Datastore Size"/>
- <select
+ <large-select
property="dsSize"
displayText="How much hard-drive space may use FRED?"
defaultValue="1"
@@ -152,19 +154,20 @@
<option text="5G" value="5" />
<option text="10G" value="10" />
<option text="30G" value="30" />
- </select>
+ <option text="50G" value="50" />
+ </large-select>
</page>
<page
- ifProperty="${l33t}+=1"
+ ifProperty="${l33t}==1"
type="input"
name="config"
- displayText="Initial node configuration (3)">
+ displayText="Initial node configuration (4)">
<comment
displayText="Which features should be enabled
?"/>
<checkbox
property="enableFRED"
- displayText="Enable FREenet routing Daemon?"
+ displayText="Enable Freenet REference Daemon?"
defaultValue="true"
force="true"/>
<comment
@@ -184,16 +187,30 @@
property="enableFCP"
displayText="Enable FCP daemon?"
defaultValue="true"
- force="true"/>
+ force="false"/>
<checkbox
property="enableFproxy"
displayText="Enable Fproxy?"
defaultValue="true"
force="false"/>
</page>
+<!--
+ TODO: do it :p
+ <page
+ ifProperty="${l33t}==2"
+ type="input"
+ name="config"
+ displayText="Node configuration">
+ <commen
+ displayText="Here is the config file:"/>
+ <loadfile property="conf.file"
srcFile="${basedir}/config/freenet.ini"/>
+ <text property="conf.content" defaultValue="${conf.file}"/>
+
+ </page>
+-->
+
<!-- page type="progress" shows a progress page with the install
button
Its target is set to cleanuptarget since it is
the last page this target will be run last-->
-
<page
type="progress"
name="progress"
Modified: trunk/apps/installer/build-installer.xml
===================================================================
--- trunk/apps/installer/build-installer.xml 2006-02-22 13:06:45 UTC (rev
8106)
+++ trunk/apps/installer/build-installer.xml 2006-02-22 13:59:36 UTC (rev
8107)
@@ -42,20 +42,7 @@
<include name="freenet/support/HexUtil"/>
<include name="Sha1Test.java"/>
</javac>
- <jar jarfile="./installclasspath/sha1test.jar" basedir="./build">
- <manifest>
- <attribute name="Main-Class" value="Sha1Test"/>
- <attribute name="Built-By" value="${user.name}"/>
- <section name="common">
- <attribute name="Specification-Title"
value="Example"/>
- <attribute name="Specification-Version"
value="0.7pre"/>
- <attribute name="Specification-Vendor"
value="freenetproject.org"/>
- <attribute name="Implementation-Title"
value="Freenet"/>
- <attribute name="Implementation-Version"
value="0.7pre ${TODAY}"/>
- <attribute name="Implementation-Vendor"
value="Freenetproject.org"/>
- </section>
- </manifest>
- </jar>
+ <jar jarfile="./installclasspath/sha1test.jar" basedir="./build"/>
</target>
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-02-22 13:06:45 UTC (rev 8106)
+++ trunk/apps/installer/build.xml 2006-02-22 13:59:36 UTC (rev 8107)
@@ -6,13 +6,10 @@
<property file="${basedir}/ant.install.properties"/>
<target name="pre">
- <touch file="${basedir}/freenet-cvs-snapshot.jar"/>
- <touch file="${basedir}/freenet-ext.jar"/>
- <copy file="${basedir}/bin/run.sh"
tofile="freenet-cvs-snapshot.jar.sha1"/>
- <copy file="${basedir}/bin/run.sh"
tofile="freenet-ext.jar.sha1"/>
+ <mkdir dir="${installDir}"/>
</target>
- <target name="env" unless="${l33t}">
+ <target name="env" unless="${l33t}==1">
<echo message="Using default configuration"/>
<property name="enableTestnet" value="true"/>
<property name="enableSNMP" value="true"/>
@@ -50,7 +47,6 @@
<target name="tgmain" depends="">
<echo message="Downloading Components"/>
- <mkdir dir="${installDir}"/>
<get
src="http://downloads.freenetproject.org/alpha/freenet-cvs-snapshot.jar";
dest="${basedir}/freenet-cvs-snapshot.jar"
@@ -70,8 +66,6 @@
<target name="tgext" depends="">
<echo message="Downloading Extended components"/>
- <mkdir dir="${installDir}"/>
-
<get
src="http://downloads.freenetproject.org/alpha/freenet-ext.jar";
dest="${basedir}/freenet-ext.jar"
verbose="true"
@@ -89,31 +83,33 @@
<target name="tgmain-reget">
<echo message="Verifying freenet-cvs-snapshot.jar"/>
- <java jar="${basedir}/sha1test.jar" failonerror="false"
fork="true" resultproperty="freenet-cvs-snapshot.verified" logError="true">
+ <java classpath="${basedir}/sha1test.jar" classname="Sha1Test"
failonerror="false" fork="true" resultproperty="freenet-cvs-snapshot.verified"
logError="true">
<arg value="${basedir}/freenet-cvs-snapshot.jar"/>
</java>
- <condition property="target" value="void" else="tgmain">
- <equals arg1="${freenet-cvs-snapshot.verified}"
arg2="0"/>
+ <!-- FIXME: do the check insteed -->
+ <condition property="target_main" value="void" else="tgmain">
+ <equals arg1="${freenet-cvs-snapshot.verified}"
arg2="3"/>
</condition>
- <echo
message="freenet-cvs-snapshot.verified=${freenet-cvs-snapshot.verified} ;
target=${target}"/>
+ <echo
message="freenet-cvs-snapshot.verified=${freenet-cvs-snapshot.verified} ;
target=${target_main}"/>
<sleep seconds="2"/>
- <antcall target="${target}"/>
+ <antcall target="${target_main}"/>
</target>
<target name="tgext-reget">
<echo message="Verifying freenet-ext.jar"/>
- <java jar="${basedir}/sha1test.jar" failonerror="false"
fork="true" resultproperty="freenet-ext.verified" logError="true">
+ <java classpath="${basedir}/sha1test.jar" classname="Sha1Test"
failonerror="false" fork="true" resultproperty="freenet-ext.verified"
logError="true">
<arg value="${basedir}/freenet-ext.jar"/>
</java>
- <condition property="target" value="void" else="tgext">
- <equals arg1="${freenet-ext.verified}" arg2="0"/>
+ <!-- FIXME: do the check insteed -->
+ <condition property="target_ext" value="void" else="tgext">
+ <equals arg1="${freenet-ext.verified}" arg2="3"/>
</condition>
- <echo message="freenet-ext.verified=${freenet-ext.verified} ;
target=${target} "/>
+ <echo message="freenet-ext.verified=${freenet-ext.verified} ;
target=${target_ext} "/>
<sleep seconds="2"/>
- <antcall target="${target}"/>
+ <antcall target="${target_main}"/>
</target>
<target name="void"/>
Modified: trunk/apps/installer/installclasspath/config/freenet.ini
===================================================================
--- trunk/apps/installer/installclasspath/config/freenet.ini 2006-02-22
13:06:45 UTC (rev 8106)
+++ trunk/apps/installer/installclasspath/config/freenet.ini 2006-02-22
13:59:36 UTC (rev 8107)
@@ -5,6 +5,7 @@
node.storeSize=@dsSize at G
node.storeDir=.
node.listenPort=@portnumber@
+node.name=@nodename@
node.nodeDir=.
node.downloadsDir=downloads
node.testnet.enabled=@enabletestnet@
Modified: trunk/apps/installer/src/Sha1Test.java
===================================================================
--- trunk/apps/installer/src/Sha1Test.java 2006-02-22 13:06:45 UTC (rev
8106)
+++ trunk/apps/installer/src/Sha1Test.java 2006-02-22 13:59:36 UTC (rev
8107)
@@ -13,7 +13,7 @@
*
* @return 0 if it matches
* @return 1 if it doesn't
- * @return 2 if an error occured
+ * @return >1 if an error has occured
*/
public static void main(String[] args) {
Sha160 hash=new Sha160();
