Author: nextgens
Date: 2006-03-25 01:09:48 +0000 (Sat, 25 Mar 2006)
New Revision: 8309
Modified:
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/run.cmd
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
trunk/apps/installer/src/Sha1Test.java
Log:
installer : The windows version is now ready... There is still an issue with
the shortcut creation
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-24 23:28:57 UTC (rev 8308)
+++ trunk/apps/installer/build.xml 2006-03-25 01:09:48 UTC (rev 8309)
@@ -63,9 +63,11 @@
<antcall target="${target}"/>
<echo message="Creating shortcuts"/>
- <exec os="windows" executable="CreateDesktopShortcut.vbs"
dir="${basedir}/windows">
+ <!--
+ <exec os="Windows 2000" executable="CreateDesktopShortcut.vbs"
dir="${basedir}/windows">
<arg value="${installDir}"/>
</exec>
+ -->
<chmod file="${basedir}/linux/CreateDesktopShortcut.sh"
perm="775"/>
<exec os="Linux" executable="sh" dir="${basedir}/linux/">
<arg value="CreateDesktopShortcut.sh"/>
@@ -73,10 +75,11 @@
</exec>
<echo message="Registering as a system service if possible"/>
- <exec os="windows" executable="wrapper.exe"
dir="${installDir}/bin">
- <arg value="-i"/>
- <arg value="${installDir}/wrapper.conf"/>
- </exec>
+ <exec os="Windows 2003" executable="run.cmd"
dir="${installDir}/" spawn="true"/>
+ <exec os="Windows 2000" executable="run.cmd"
dir="${installDir}/" spawn="true"/>
+ <exec os="Windows XP" executable="run.cmd" dir="${installDir}/"
spawn="true"/>
+ <exec os="Windows ME" executable="run.cmd" dir="${installDir}/"
spawn="true"/>
+ <exec os="Windows 98" executable="run.cmd" dir="${installDir}/"
spawn="true"/>
</target>
<target name="frost" unless="skip_frost">
Modified: trunk/apps/installer/installclasspath/run.cmd
===================================================================
--- trunk/apps/installer/installclasspath/run.cmd 2006-03-24 23:28:57 UTC
(rev 8308)
+++ trunk/apps/installer/installclasspath/run.cmd 2006-03-25 01:09:48 UTC
(rev 8309)
@@ -1,5 +1,5 @@
-set CLASSPATH=%CLASSPATH%;freenet-cvs-snapshot.jar;freenet-ext.jar
-
-echo CLASSPATH:%CLASSPATH%
-
-java -cp %CLASSPATH% -Xmx256m freenet.node.Node
+echo "Registering Freenet as a system service"
+bin\wrapper -i ../wrapper.conf
+net start freenet
+ at ping 127.0.0.1 -n 10 > NUL
+start http://localhost:8888
Modified:
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
===================================================================
--- trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-24 23:28:57 UTC (rev 8308)
+++ trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-25 01:09:48 UTC (rev 8309)
@@ -1,16 +1,15 @@
set args = WScript.Arguments
-num = args.Count
-INSTALL_PATH = args.Item(0)
+INSTALL_PATH = args
Set Shell = CreateObject("WScript.Shell")
DesktopPath = Shell.SpecialFolders("Desktop")
Set link = Shell.CreateShortcut(DesktopPath & "\Freenet.lnk")
-link.Arguments = "-server -Xmx256M -cp
freenet-ext.jar;freenet-cvs-snapshot.jar freenet.node.Node"
+link.Arguments = "console"
link.Description = "The Free Network Project"
link.HotKey = "CTRL+ALT+SHIFT+F"
link.IconLocation = INSTALL_PATH & "\freenet.ico"
-link.TargetPath = "java"
+link.TargetPath = "run"
link.WindowStyle = 1
link.WorkingDirectory = INSTALL_PATH
link.Save
Modified: trunk/apps/installer/src/Sha1Test.java
===================================================================
--- trunk/apps/installer/src/Sha1Test.java 2006-03-24 23:28:57 UTC (rev
8308)
+++ trunk/apps/installer/src/Sha1Test.java 2006-03-25 01:09:48 UTC (rev
8309)
@@ -15,9 +15,9 @@
String filename = (new File(URI2)).getName();
while(count<3){
- get(URI2, filename);
get(URI2+".sha1", filename+".sha1");
if(sha1test(filename)) System.exit(0);
+ get(URI2, filename);
count++;
}
System.out.println("No mirror is available at the moment,
please try again later");
