Author: nextgens
Date: 2006-02-21 19:42:38 +0000 (Tue, 21 Feb 2006)
New Revision: 8093
Removed:
trunk/apps/installer/src/freenet/crypt/
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
Log:
updated installer; We use the ant task <checksum> insteed of external code
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-02-21 19:32:16 UTC (rev
8092)
+++ trunk/apps/installer/antinstall-config.xml 2006-02-21 19:42:38 UTC (rev
8093)
@@ -124,7 +124,7 @@
name="config"
displayText="Initial node configuration (2)">
<comment
- displayText="How much bandwidth may be used by FED?"/>
+ displayText="How much bandwidth may be used by FRED?"/>
<select
property="bandwidth"
displayText="Bandwidth value"
@@ -143,7 +143,7 @@
displayText="Datastore Size"/>
<select
property="dsSize"
- displayText="How much hard-drive space may use FED?"
+ displayText="How much hard-drive space may use FRED?"
defaultValue="1"
>
<option text="1G" value="1" />
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-02-21 19:32:16 UTC (rev 8092)
+++ trunk/apps/installer/build.xml 2006-02-21 19:42:38 UTC (rev 8093)
@@ -7,7 +7,10 @@
<target name="env" unless="${l33t}==1">
<echo message="Using default configuration"/>
- <property name="freenet-ext.present" value="true"/>
+ <property name="freenet-ext.present" value="false"/>
+ <property name="freenet-cvs-snapshot.present" value="false"/>
+ <property name="freenet-ext.verified" value="false"/>
+ <property name="freenet-cvs-snapshot.verified" value="false"/>
<property name="enableTestnet" value="true"/>
<property name="enableSNMP" value="true"/>
<property name="enableFCP" value="true"/>
@@ -41,41 +44,54 @@
<target name="tgmain" depends="">
<echo message="Downloading Components"/>
+ <mkdir dir="${installDir}"/>
+
<get
src="http://downloads.freenetproject.org/alpha/freenet-cvs-snapshot.jar";
- dest="${installDir}/freenet-cvs-snapshot.jar"
- verbose="true"
- usetimestamp="true"
+ dest="${installDir}/freenet-cvs-snapshot.jar"
+ verbose="true"
+ usetimestamp="true"
/>
<get
src="http://downloads.freenetproject.org/alpha/freenet-cvs-snapshot.jar.sha1";
- dest="${installDir}/freenet-cvs-snapshot.jar.sha1"
- verbose="true"
- usetimestamp="true"
+ dest="${installDir}/freenet-cvs-snapshot.jar.SHA"
+ verbose="true"
+ usetimestamp="true"
/>
+
+ <available file="${lib}/freenet-cvs-snapshot.jar"
property="freenet-cvs-snapshot.present"/>
</target>
<target name="tgext" depends="">
<echo message="Downloading Extended components"/>
+
<mkdir dir="${installDir}"/>
+
<get
src="http://downloads.freenetproject.org/alpha/freenet-ext.jar";
- dest="${installDir}/freenet-ext.jar"
- verbose="true"
- usetimestamp="true"
+ dest="${installDir}/freenet-ext.jar"
+ verbose="true"
+ usetimestamp="true"
/>
<get
src="http://downloads.freenetproject.org/alpha/freenet-ext.jar.sha1";
- dest="${installDir}/freenet-ext.jar.sha1"
- verbose="true"
- usetimestamp="true"
+ dest="${installDir}/freenet-ext.jar.SHA"
+ verbose="true"
+ usetimestamp="true"
/>
+ <available file="${lib}/freenet-ext.jar"
property="freenet-ext.present"/>
</target>
- <target name="tgvrfy" depends="tgmain,tgext">
+ <target name="tgmain-reget" unless="freenet-cvs-snapshot.verified">
+ <antcall target="tgmain"/>
+ <checksum file="freenet-cvs-snapshot.jar" algorithm="SHA"
verifyproperty="freenet-cvs-snapshot.verified"/>
+ </target>
+
+ <target name="tgext-reget" unless="freenet-ext.verified">
+ <antcall target="tgext"/>
+ <checksum file="freenet-ext.jar" algorithm="SHA"
verifyproperty="freenet-ext.verified"/>
+ </target>
+
+ <target name="tgvrfy" depends="tgmain-reget,tgext-reget">
<echo message="Verifying components"/>
- <java jar="${basedir}/sha1test.jar" failonerror="true"
fork="true">
- <arg value="${installDir}/freenet-cvs-snapshot.jar"/>
- </java>
- <java jar="${basedir}/sha1test.jar" failonerror="true"
fork="true">
- <arg value="${installDir}/freenet-ext.jar"/>
- </java>
+ <fail unless="freenet-cvs-snapshot.verified"/>
+ <fail unless="freenet-ext.verified"/>
</target>
<target name="tgdoc" depends="">
