Author: nextgens
Date: 2006-03-29 20:07:38 +0000 (Wed, 29 Mar 2006)
New Revision: 8355
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/config/freenet-default.ini
Log:
installer: everyone should be able to choice whatever he wants to be in testnet
mode or not
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-03-29 19:29:02 UTC (rev
8354)
+++ trunk/apps/installer/antinstall-config.xml 2006-03-29 20:07:38 UTC (rev
8355)
@@ -62,6 +62,16 @@
regex="^[a-zA-Z_0-9]*[a-zA-Z_0-9]{8}[a-zA-Z_0-9]*$"
force="false"/>
-->
+ <comment
+ displayText="WARNING, with testnet mode
enabled, you have no anonymity!"
+ bold="true"/>
+ <comment
+ displayText="Testnet mode is very useful to the
devs." />
+ <checkbox
+ property="enableTestnet"
+ displayText="Testnet"
+ defaultValue="true"
+ force="false"/>
</page>
<page
ifProperty="${l33t}+=1"
@@ -181,15 +191,7 @@
displayText="Enable Freenet REference Daemon?"
defaultValue="true"
force="true"/>
- <comment
- displayText="WARNING, with testnet mode
enabled, you have no anonymity!"
- bold="true"/>
<checkbox
- property="enableTestnet"
- displayText="Testnet"
- defaultValue="true"
- force="false"/>
- <checkbox
property="enableSNMP"
displayText="Enable SNMP agent?"
defaultValue="true"
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-29 19:29:02 UTC (rev 8354)
+++ trunk/apps/installer/build.xml 2006-03-29 20:07:38 UTC (rev 8355)
@@ -27,6 +27,7 @@
<replace file="${installDir}/freenet.ini">
<replacefilter token="@portnumber@"
value="${portNumber}"/>
<replacefilter token="@nodename@" value="${nodeName}"/>
+ <replacefilter token="@enabletestnet@"
value="${enableTestnet}"/>
</replace>
</target>
@@ -52,6 +53,7 @@
<copy todir="${installDir}/bin/">
<fileset dir="${basedir}/bin/"/>
</copy>
+ <chmod file="${installDir}/bin/wrapper" perm="775"/>
<copy todir="${installDir}/lib/">
<fileset dir="${basedir}/lib/"/>
</copy>
@@ -85,7 +87,6 @@
<target name="unix" if="is_unix">
<copy file="${basedir}/run.sh" tofile="${installDir}/run.sh"/>
<chmod file="${installDir}/run.sh" perm="775"/>
- <chmod file="${installDir}/bin/wrapper" perm="775"/>
<echo message="Creating shortcuts"/>
<chmod file="${basedir}/linux/CreateDesktopShortcut.sh"
perm="775"/>
Modified: trunk/apps/installer/installclasspath/config/freenet-default.ini
===================================================================
--- trunk/apps/installer/installclasspath/config/freenet-default.ini
2006-03-29 19:29:02 UTC (rev 8354)
+++ trunk/apps/installer/installclasspath/config/freenet-default.ini
2006-03-29 20:07:38 UTC (rev 8355)
@@ -4,7 +4,7 @@
node.listenPort=@portnumber@
node.name=@nodename@
node.downloadsDir=downloads
-node.testnet.enabled=true
+node.testnet.enabled=@enabletestnet@
fcp.enabled=true
fcp.port=9481
logger.maxZippedLogsSize=1G
