Author: nextgens
Date: 2006-03-25 19:54:32 +0000 (Sat, 25 Mar 2006)
New Revision: 8318
Modified:
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/config/freenet-default.ini
trunk/apps/installer/installclasspath/config/freenet.ini
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
Log:
Installer: I think it's ready for alpha1 now. Known issue : Frost will be
installed even if you untick the box :|
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-25 19:05:35 UTC (rev 8317)
+++ trunk/apps/installer/build.xml 2006-03-25 19:54:32 UTC (rev 8318)
@@ -62,33 +62,36 @@
<antcall target="${target}"/>
<echo message="Creating shortcuts"/>
- <exec os="Windows 2003" executable="cscript"
dir="${installDir}/" spawn="true">
+ <exec os="Windows 2003" executable="cscript"
dir="${basedir}/windows" >
<arg value="CreateDesktopShortcut.vbs"/>
- <arg value="${installDir}"/>
+ <arg value=""${installDir}""/>
</exec>
- <exec os="Windows 2000" executable="cscript"
dir="${installDir}/" spawn="true">
+ <exec os="Windows 2000" executable="cscript"
dir="${basedir}/windows" >
<arg value="CreateDesktopShortcut.vbs"/>
- <arg value="${installDir}"/>
+ <arg value=""${installDir}""/>
</exec>
- <exec os="Windows XP" executable="cscript" dir="${installDir}/"
spawn="true">
+ <exec os="Windows XP" executable="cscript"
dir="${basedir}/windows" >
<arg value="CreateDesktopShortcut.vbs"/>
- <arg value="${installDir}"/>
+ <arg value=""${installDir}""/>
</exec>
<chmod file="${basedir}/linux/CreateDesktopShortcut.sh"
perm="775"/>
<exec os="Linux" executable="sh" dir="${basedir}/linux/">
<arg value="CreateDesktopShortcut.sh"/>
- <arg value="${installDir}"/>
+ <arg value=""${installDir}""/>
</exec>
<echo message="Registering as a system service if possible"/>
- <exec os="Windows 2003" executable="call" dir="${installDir}/"
spawn="true">
+ <exec os="Windows 2003" executable="cmd" dir="${installDir}/" >
+ <arg value="/c"/>
<arg value="run.cmd"/>
</exec>
- <exec os="Windows 2000" executable="call" dir="${installDir}/"
spawn="true">
+ <exec os="Windows 2000" executable="cmd" dir="${installDir}/">
+ <arg value="/c"/>
<arg value="run.cmd"/>
</exec>
- <exec os="Windows XP" executable="call" dir="${installDir}/"
spawn="true">
+ <exec os="Windows XP" executable="cmd" dir="${installDir}/" >
+ <arg value="/c"/>
<arg value="run.cmd"/>
</exec>
</target>
Modified: trunk/apps/installer/installclasspath/config/freenet-default.ini
===================================================================
--- trunk/apps/installer/installclasspath/config/freenet-default.ini
2006-03-25 19:05:35 UTC (rev 8317)
+++ trunk/apps/installer/installclasspath/config/freenet-default.ini
2006-03-25 19:54:32 UTC (rev 8318)
@@ -1,24 +1,13 @@
node.ipAddressOverride=
node.outputBandwidthLimit=15K
-node.swapRequestSendInterval=2000
-node.tempDir=./temp-32788
node.storeSize=1G
-node.storeDir=.
node.listenPort=@portnumber@
node.name=@nodename@
-node.nodeDir=.
node.downloadsDir=downloads
node.testnet.enabled=true
-node.testnet.port=33788
fcp.enabled=true
fcp.port=9481
-logger.maxCachedLines=100k
-logger.enabled=false
-logger.dirname=logs
-logger.maxCachedBytes=10M
-logger.priority=MINOR
logger.maxZippedLogsSize=1G
-logger.interval=5MINUTE
fproxy.enabled=true
fproxy.port=8888
snmp.enabled=true
Modified: trunk/apps/installer/installclasspath/config/freenet.ini
===================================================================
--- trunk/apps/installer/installclasspath/config/freenet.ini 2006-03-25
19:05:35 UTC (rev 8317)
+++ trunk/apps/installer/installclasspath/config/freenet.ini 2006-03-25
19:54:32 UTC (rev 8318)
@@ -1,25 +1,11 @@
node.ipAddressOverride=@hostname@
node.outputBandwidthLimit=@bandwidth at K
-node.swapRequestSendInterval=2000
-node.tempDir=./temp-32788
node.storeSize=@dsSize at G
-node.storeDir=.
node.listenPort=@portnumber@
node.name=@nodename@
-node.nodeDir=.
-node.downloadsDir=downloads
node.testnet.enabled=@enabletestnet@
-node.testnet.port=33788
fcp.enabled=@enablefcp@
-fcp.port=9481
-logger.maxCachedLines=100k
-logger.enabled=false
-logger.dirname=logs
-logger.maxCachedBytes=10M
-logger.priority=MINOR
logger.maxZippedLogsSize=1G
-logger.interval=5MINUTE
fproxy.enabled=@enablefproxy@
-fproxy.port=8888
snmp.enabled=@enablesnmp@
End
Modified:
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
===================================================================
--- trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-25 19:05:35 UTC (rev 8317)
+++ trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-25 19:54:32 UTC (rev 8318)
@@ -1,6 +1,6 @@
set args = WScript.Arguments
-INSTALL_PATH = args.Item(1)
+INSTALL_PATH = args.Item(0)
Set Shell = CreateObject("WScript.Shell")
DesktopPath = Shell.SpecialFolders("Desktop")
