Author: nextgens
Date: 2006-02-22 00:30:30 +0000 (Wed, 22 Feb 2006)
New Revision: 8094
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build-installer.xml
trunk/apps/installer/build.xml
trunk/apps/installer/src/Sha1Test.java
Log:
updated installer ; some bugfixes and now it will keep on trying to get a valid
file
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-02-21 19:42:38 UTC (rev
8093)
+++ trunk/apps/installer/antinstall-config.xml 2006-02-22 00:30:30 UTC (rev
8094)
@@ -50,6 +50,7 @@
defaultValue="/usr/local/freenet"
defaultValueWin="${env.ProgramFiles}\freenet"
displayText="Select an installation directory"
+ checkExists="true"
create="true"/>
<comment
displayText="Enter a password in the field
below"/>
@@ -163,7 +164,7 @@
displayText="Which features should be enabled
?"/>
<checkbox
property="enableFRED"
- displayText="Enable FReenet routing Daemon?"
+ displayText="Enable FREenet routing Daemon?"
defaultValue="true"
force="true"/>
<comment
Modified: trunk/apps/installer/build-installer.xml
===================================================================
--- trunk/apps/installer/build-installer.xml 2006-02-21 19:42:38 UTC (rev
8093)
+++ trunk/apps/installer/build-installer.xml 2006-02-22 00:30:30 UTC (rev
8094)
@@ -36,6 +36,7 @@
<tstamp/>
<!-- Create the build directory structure used by compile -->
+ <mkdir dir="build"/>
<javac srcdir="./src" destdir="./build" optimize="on" source="1.4">
<include name="gnu/**/*.java"/>
<include name="freenet/support/HexUtil"/>
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-02-21 19:42:38 UTC (rev 8093)
+++ trunk/apps/installer/build.xml 2006-02-22 00:30:30 UTC (rev 8094)
@@ -5,23 +5,29 @@
<!-- this is required to pick up the properties generated during the
install pages -->
<property file="${basedir}/ant.install.properties"/>
- <target name="env" unless="${l33t}==1">
+ <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"/>
+ </target>
+
+ <target name="env" unless="${l33t}">
<echo message="Using default configuration"/>
- <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"/>
<property name="enableFproxy" value="true"/>
<property name="dsSize" value="1"/>
<property name="bandwidth" value="15"/>
+ <property name="portNumber" value="9999"/>
</target>
- <target name="default" depends="env,tgmain,tgext,tgvrfy">
+ <target name="default" depends="pre,env,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"/>
+ <copy file="${basedir}/freenet-ext.jar"
tofile="${installDir}/freenet-ext.jar"/>
<chmod file="${installDir}/run.sh" perm="775"/>
@@ -47,17 +53,18 @@
<mkdir dir="${installDir}"/>
<get
src="http://downloads.freenetproject.org/alpha/freenet-cvs-snapshot.jar";
- dest="${installDir}/freenet-cvs-snapshot.jar"
+ dest="${basedir}/freenet-cvs-snapshot.jar"
verbose="true"
- usetimestamp="true"
+ usetimestamp="false"
/>
<get
src="http://downloads.freenetproject.org/alpha/freenet-cvs-snapshot.jar.sha1";
- dest="${installDir}/freenet-cvs-snapshot.jar.SHA"
+ dest="${basedir}/freenet-cvs-snapshot.jar.sha1"
verbose="true"
- usetimestamp="true"
+ usetimestamp="false"
/>
- <available file="${lib}/freenet-cvs-snapshot.jar"
property="freenet-cvs-snapshot.present"/>
+ <available file="${basedir}/freenet-cvs-snapshot.jar"
property="freenet-cvs-snapshot.present"/>
+ <antcall target="tgmain-reget"/>
</target>
<target name="tgext" depends="">
@@ -66,30 +73,55 @@
<mkdir dir="${installDir}"/>
<get
src="http://downloads.freenetproject.org/alpha/freenet-ext.jar";
- dest="${installDir}/freenet-ext.jar"
+ dest="${basedir}/freenet-ext.jar"
verbose="true"
- usetimestamp="true"
+ usetimestamp="false"
/>
<get
src="http://downloads.freenetproject.org/alpha/freenet-ext.jar.sha1";
- dest="${installDir}/freenet-ext.jar.SHA"
+ dest="${basedir}/freenet-ext.jar.sha1"
verbose="true"
- usetimestamp="true"
+ usetimestamp="false"
/>
- <available file="${lib}/freenet-ext.jar"
property="freenet-ext.present"/>
+ <available file="${basedir}/freenet-ext.jar"
property="freenet-ext.present"/>
+ <antcall target="tgext-reget"/>
</target>
- <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 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">
+ <arg value="${basedir}/freenet-cvs-snapshot.jar"/>
+ </java>
+
+ <condition property="target" value="void" else="tgmain">
+ <equals arg1="${freenet-cvs-snapshot.verified}"
arg2="0"/>
+ </condition>
+ <echo
message="freenet-cvs-snapshot.verified=${freenet-cvs-snapshot.verified} ;
target=${target}"/>
+ <sleep seconds="2"/>
+ <antcall target="${target}"/>
</target>
- <target name="tgext-reget" unless="freenet-ext.verified">
- <antcall target="tgext"/>
- <checksum file="freenet-ext.jar" algorithm="SHA"
verifyproperty="freenet-ext.verified"/>
+ <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">
+ <arg value="${basedir}/freenet-ext.jar"/>
+ </java>
+
+ <condition property="target" value="void" else="tgext">
+ <equals arg1="${freenet-ext.verified}" arg2="0"/>
+ </condition>
+ <echo message="freenet-ext.verified=${freenet-ext.verified} ;
target=${target} "/>
+ <sleep seconds="2"/>
+ <antcall target="${target}"/>
</target>
+
+ <target name="void"/>
<target name="tgvrfy" depends="tgmain-reget,tgext-reget">
<echo message="Verifying components"/>
+ <echo
message="freenet-cvs-snapshot.verified=${freenet-cvs-snapshot.verified} ;
target=${target}"/>
+ <echo message="freenet-ext.verified=${freenet-ext.verified} ;
target=${target}"/>
<fail unless="freenet-cvs-snapshot.verified"/>
<fail unless="freenet-ext.verified"/>
</target>
Modified: trunk/apps/installer/src/Sha1Test.java
===================================================================
--- trunk/apps/installer/src/Sha1Test.java 2006-02-21 19:42:38 UTC (rev
8093)
+++ trunk/apps/installer/src/Sha1Test.java 2006-02-22 00:30:30 UTC (rev
8094)
@@ -68,7 +68,7 @@
}catch (Exception e){
System.out.println(e);
- System.exit(2);
+ System.exit(3);
}
}
