Author: nextgens
Date: 2006-11-01 10:00:25 +0000 (Wed, 01 Nov 2006)
New Revision: 10774
Modified:
trunk/apps/new_installer/Win_shortcutSpec.xml
trunk/apps/new_installer/res/windows/bin/1run.cmd
Log:
new_installer: some not finished work towards fixing w32 specific issues
Modified: trunk/apps/new_installer/Win_shortcutSpec.xml
===================================================================
--- trunk/apps/new_installer/Win_shortcutSpec.xml 2006-10-31 22:01:47 UTC
(rev 10773)
+++ trunk/apps/new_installer/Win_shortcutSpec.xml 2006-11-01 10:00:25 UTC
(rev 10774)
@@ -13,40 +13,26 @@
applications="no"
startMenu="no"
startup="no"
- target="$INSTALL_PATH\bin\start.cmd"
+ target=""$INSTALL_PATH\bin\start.cmd""
commandLine=""
description="This starts the freenet node"
- workingDirectory="$INSTALL_PATH"
+ workingDirectory=""$INSTALL_PATH""
>
<createForPack name="Base" />
</shortcut>
<shortcut
- name="Stop the node"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="$INSTALL_PATH\bin\stop.cmd"
- commandLine=""
- workingDirectory="$INSTALL_PATH"
- description="This stops the freenet node">
-
- <createForPack name="Base" />
- </shortcut>
-
- <shortcut
name="Freenet Uninstaller"
programGroup="yes"
desktop="no"
applications="no"
startMenu="no"
startup="no"
- target="javaw -jar $INSTALL_PATH\Uninstaller\uninstaller.jar"
+ target=""javaw -jar
$INSTALL_PATH\Uninstaller\uninstaller.jar""
commandLine=""
iconFile="%SystemRoot%\system32\SHELL32.dll"
iconIndex="31"
+ workingDirectory=""$INSTALL_PATH""
description="This uninstalls Freenet">
<createForPack name="UninstallStuff" />
@@ -59,8 +45,8 @@
applications="no"
startMenu="no"
startup="no"
- iconFile="$INSTALL_PATH\freenet.ico"
- iconIndex="0"
+ iconFile="%SystemRoot%\system32\SHELL32.dll"
+ iconIndex="13"
target="http://localhost:8888/";
description="It opens a browser pointing to Fproxy">
@@ -74,56 +60,71 @@
applications="no"
startMenu="yes"
startup="no"
- iconFile="$INSTALL_PATH\freenet.ico"
- iconIndex="0"
target="http://freenetproject.org";
+ iconFile="%SystemRoot%\system32\SHELL32.dll"
+ iconIndex="13"
description="It opens a browser pointing to our website">
<createForPack name="Base" />
</shortcut>
<shortcut
- name="Frost"
+ name="jSite"
programGroup="yes"
desktop="no"
applications="no"
startMenu="no"
startup="no"
- target="$INSTALL_PATH\frost\frost.bat"
- commandLine=""
- description="This starts Frost"
- workingDirectory="$INSTALL_PATH\frost"
+ target="start"
+ commandLine=""javaw -jar jSite.jar""
+ description="This starts jSite"
+ workingDirectory=""$INSTALL_PATH""
>
- <createForPack name="frost" />
+ <createForPack name="jSite" />
</shortcut>
<shortcut
- name="jSite"
+ name="Thaw"
programGroup="yes"
desktop="no"
applications="no"
startMenu="no"
startup="no"
target="start"
- commandLine="javaw -jar jSite.jar"
- description="This starts jSite"
- workingDirectory="$INSTALL_PATH\"
+ commandLine=""javaw -jar Thaw.jar""
+ description="This starts Thaw"
+ workingDirectory=""$INSTALL_PATH""
>
- <createForPack name="jSite" />
+ <createForPack name="thaw" />
</shortcut>
<shortcut
- name="Thaw"
+ name="Frost"
programGroup="yes"
desktop="no"
applications="no"
startMenu="no"
startup="no"
- target="start"
- commandLine="javaw -jar Thaw.jar"
- description="This starts Thaw"
- workingDirectory="$INSTALL_PATH\"
+ target=""$INSTALL_PATH\frost\frost.bat""
+ commandLine=""
+ description="This starts Frost"
+ workingDirectory=""$INSTALL_PATH\frost""
>
- <createForPack name="thaw" />
+ <createForPack name="frost" />
</shortcut>
+
+ <shortcut
+ name="Stop the node"
+ programGroup="yes"
+ desktop="no"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target=""$INSTALL_PATH\bin\stop.cmd""
+ commandLine=""
+ workingDirectory=""$INSTALL_PATH""
+ description="This stops the freenet node">
+
+ <createForPack name="Base" />
+ </shortcut>
</shortcuts>
Modified: trunk/apps/new_installer/res/windows/bin/1run.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-10-31 22:01:47 UTC
(rev 10773)
+++ trunk/apps/new_installer/res/windows/bin/1run.cmd 2006-11-01 10:00:25 UTC
(rev 10774)
@@ -26,6 +26,7 @@
@echo "Setting up plugins"
:: Tweak freenet.ini
@if not exist stun goto nostun
+ at echo -JSTUN
@set PLUGINS=plugins.JSTUN.JSTUN at
file:///%INSTALL_PATH%\plugins\JSTUN.jar;%PLUGINS%
@mkdir plugins 2> NUL
@java -jar bin\sha1test.jar plugins/JSTUN.jar.url plugins > NUL
@@ -34,6 +35,7 @@
:nostun
@if not exist librarian goto nolibrarian
+ at echo -Librarian
@mkdir plugins 2> NUL
@set PLUGINS=plugins.Librarian.Librarian at
file:///%INSTALL_PATH%\plugins\Librarian.jar;%PLUGINS%
@java -jar bin\sha1test.jar plugins/Librarian.jar.url plugins > NUL
