Author: nextgens
Date: 2006-02-12 21:24:33 +0000 (Sun, 12 Feb 2006)
New Revision: 8033
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build-installer.xml
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/bin/run.cmd
trunk/apps/installer/installclasspath/bin/run.sh
trunk/apps/installer/installclasspath/resources/LICENSE
Log:
Now the antinstaller verifies sha1 sums
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-02-12 20:23:49 UTC (rev
8032)
+++ trunk/apps/installer/antinstall-config.xml 2006-02-12 21:24:33 UTC (rev
8033)
@@ -78,7 +78,7 @@
force="true"/>
<target
displayText="Extended components (-ext)"
- target="rgext"
+ target="tgext"
defaultValue="true"
force="true"/>
<target
Modified: trunk/apps/installer/build-installer.xml
===================================================================
--- trunk/apps/installer/build-installer.xml 2006-02-12 20:23:49 UTC (rev
8032)
+++ trunk/apps/installer/build-installer.xml 2006-02-12 21:24:33 UTC (rev
8033)
@@ -27,7 +27,7 @@
<fileset dir="installclasspath"
includes="resources/*"/>
<fileset dir="installclasspath"
includes="bin/*"/>
<fileset dir="installclasspath"
includes="config/*"/>
- <fileset dir="build" includes="**/*"/>
+ <fileset dir="installclasspath"
includes="sha1test.jar"/>
</installer>
</target>
@@ -41,6 +41,20 @@
<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>
</target>
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-02-12 20:23:49 UTC (rev 8032)
+++ trunk/apps/installer/build.xml 2006-02-12 21:24:33 UTC (rev 8033)
@@ -17,19 +17,11 @@
<property name="enableFproxy" value="true"/>
</target>
- <target name="default" depends="env">
- <mkdir dir="${installDir}"/>
+ <target name="default" depends="env,tgmain,tgext,tgvrfy">
<copy file="${basedir}/bin/run.sh"
tofile="${installDir}/run.sh"/>
<copy file="${basedir}/bin/run.cmd"
tofile="${installDir}/run.cmd"/>
<chmod file="${installDir}/run.sh" perm="775"/>
- <echo message="Downloading Components"/>
- <get
src="http://downloads.freenetproject.org/alpha/freenet-cvs-snapshot.jar";
- dest="${installDir}/freenet-cvs-snapshot.jar"
- verbose="true"
- usetimestamp="true"
- />
- <!-- TODO: verify the sha1 -->
<echo message="Setting up the node"/>
<copy todir="${installDir}/config">
@@ -48,14 +40,44 @@
</replace>
</target>
+ <target name="tgmain" depends="">
+ <echo message="Downloading Components"/>
+ <get
src="http://downloads.freenetproject.org/alpha/freenet-cvs-snapshot.jar";
+ 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"
+ />
+ </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"
/>
+ <get
src="http://downloads.freenetproject.org/alpha/freenet-ext.jar.sha1";
+ dest="${installDir}/freenet-ext.jar.sha1"
+ verbose="true"
+ usetimestamp="true"
+ />
</target>
+
+ <target name="tgvrfy" depends="tgmain,tgext">
+ <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>
+ </target>
<target name="tgdoc" depends="">
<echo message="Installing documentation files"/>
@@ -65,7 +87,7 @@
<echo message="Installing Source files"/>
</target>
- <target name="cleanuptarget" depends="default,tgext">
+ <target name="cleanuptarget" depends="default">
<delete dir="${basedir}/temp">
</delete>
</target>
Modified: trunk/apps/installer/installclasspath/bin/run.cmd
===================================================================
--- trunk/apps/installer/installclasspath/bin/run.cmd 2006-02-12 20:23:49 UTC
(rev 8032)
+++ trunk/apps/installer/installclasspath/bin/run.cmd 2006-02-12 21:24:33 UTC
(rev 8033)
@@ -7,7 +7,7 @@
echo CLASSPATH:%CLASSPATH%
echo JAVA_HOME:%JAVA_HOME%
-%JAVA_HOME%\bin\java -cp %CLASSPATH% org.tp23.demo.Demonstration
+%JAVA_HOME%\bin\java -cp %CLASSPATH% -Xmx256m freenet.node.Node
goto end
@@ -16,4 +16,4 @@
goto end
-:end
\ No newline at end of file
+:end
Modified: trunk/apps/installer/installclasspath/bin/run.sh
===================================================================
--- trunk/apps/installer/installclasspath/bin/run.sh 2006-02-12 20:23:49 UTC
(rev 8032)
+++ trunk/apps/installer/installclasspath/bin/run.sh 2006-02-12 21:24:33 UTC
(rev 8033)
@@ -21,6 +21,6 @@
echo $CLASSPATH
echo $JAVA_HOME
-$JAVA_HOME/bin/java -cp $CLASSPATH org.tp23.demo.Demonstration
+$JAVA_HOME/bin/java -cp $CLASSPATH -Xmx256m freenet.node.Node
Modified: trunk/apps/installer/installclasspath/resources/LICENSE
===================================================================
--- trunk/apps/installer/installclasspath/resources/LICENSE 2006-02-12
20:23:49 UTC (rev 8032)
+++ trunk/apps/installer/installclasspath/resources/LICENSE 2006-02-12
21:24:33 UTC (rev 8033)
@@ -4,12 +4,6 @@
###########################################################################
-As a special exception, the author(s) permit linking of the Freenet
-binaries with the Jakarta Compress library, which is licensed under the
-terms of the Apache Software License, version 2. Authors of derivative
-works may [not] choose to remove this exception (and corresponding
-source code) [at their discretion].
-
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
