Author: nextgens
Date: 2006-03-30 14:57:30 +0000 (Thu, 30 Mar 2006)
New Revision: 8368
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/run.cmd
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
Log:
installer: many bugfixes
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-03-30 14:37:49 UTC (rev
8367)
+++ trunk/apps/installer/antinstall-config.xml 2006-03-30 14:57:30 UTC (rev
8368)
@@ -208,7 +208,7 @@
force="false"/>
<checkbox
property="enableConsole"
- displayText="Enable Fproxy daemon?"
+ displayText="Enable the Console daemon?"
defaultValue="true"
force="false"/>
</page>
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-30 14:37:49 UTC (rev 8367)
+++ trunk/apps/installer/build.xml 2006-03-30 14:57:30 UTC (rev 8368)
@@ -93,18 +93,10 @@
<replacefilter token="@enableconsole@"
value="${Console}"/>
<replacefilter token="@fcpport@" value="${fcpport}"/>
<replacefilter token="@fproxyport@"
value="${fproxyport}"/>
- <replacefilter token="@consoleport@"
value="${consoleport}"/>
</replace>
</target>
- <target name="default"
depends="pre,config_default,tgmain,tgext,darknet,testnet,windows,unix,frost">
- <echo message="Port Settings :"/>
- <echo message=" FCP : ${fcpport}"/>
- <echo message=" Fproxy : ${fproxyport}"/>
- <echo message=" Console : ${consoleport}"/>
- <echo message="Misc :"/>
- <echo message="Bandwidth : ${bandwidth}K"/>
-
+ <target name="default"
depends="pre,config_default,darknet,testnet,windows,unix">
<mkdir dir="${installDir}/lib"/>
<mkdir dir="${installDir}/bin"/>
<copy todir="${installDir}/bin/">
@@ -128,8 +120,8 @@
<target name="windows" if="is_windows">
<copy file="${basedir}/run.cmd"
tofile="${installDir}/run.cmd"/>
<replace file="${installDir}/run.cmd">
- <replacefilter token="@serviceName@"
value="freenedarknett-${freenetWorkingMode}"/>
- <replacefilter token="@fproxyport@"
value="${fproxyport}"/>
+ <replacefilter token="@Name@"
value="freenedarknett-${freenetWorkingMode}"/>
+ <replacefilter token="@fproxyport@" value="${Port}"/>
</replace>
<copy file="${basedir}/windows/start.cmd"
tofile="${installDir}/start.cmd"/>
<replace file="${installDir}/start.cmd">
@@ -157,7 +149,7 @@
<copy file="${basedir}/run.sh" tofile="${installDir}/run.sh"/>
<chmod file="${installDir}/run.sh" perm="775"/>
<replace file="${installDir}/run.sh">
- <replacefilter token="@fproxyport@"
value="${fproxyport}"/>
+ <replacefilter token="@fproxyport@" value="${Port}"/>
</replace>
<echo message="Creating shortcuts"/>
@@ -165,7 +157,7 @@
<exec executable="sh" dir="${basedir}/linux/">
<arg value="CreateDesktopShortcut.sh"/>
<arg value=""${installDir}""/>
- <arg value="${fproxyport}"/>
+ <arg value="${Port}"/>
</exec>
<echo message="Registering as a system service if possible"/>
Modified: trunk/apps/installer/installclasspath/run.cmd
===================================================================
--- trunk/apps/installer/installclasspath/run.cmd 2006-03-30 14:37:49 UTC
(rev 8367)
+++ trunk/apps/installer/installclasspath/run.cmd 2006-03-30 14:57:30 UTC
(rev 8368)
@@ -1,8 +1,8 @@
-echo "Cleaning up"
-bin\wrapper -r ../wrapper.conf
-net stop @serviceName@
-echo "Registering Freenet as a system service"
-bin\wrapper -i ../wrapper.conf
-net start @serviceName@
+ at echo "Cleaning up"
+ at bin\wrapper -r ../wrapper.conf
+ at net stop @serviceName@
+ at echo "Registering Freenet as a system service"
+ at bin\wrapper -i ../wrapper.conf
+ at net start @serviceName@
@ping 127.0.0.1 -n 10 > NUL
start http://localhost:@fproxyport@
Modified:
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
===================================================================
--- trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-30 14:37:49 UTC (rev 8367)
+++ trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-30 14:57:30 UTC (rev 8368)
@@ -30,7 +30,7 @@
link.Description = "FROST"
link.HotKey = ""
link.IconLocation = INSTALL_PATH & "\frost\jtc.ico"
-link.TargetPath = "frost.sh"
+link.TargetPath = "frost.bat"
link.WindowStyle = 1
link.WorkingDirectory = INSTALL_PATH & "\frost"
link.Save
