Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

build.nsi

@@ -226,7 +226,9 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\classes"
 	RMDir /r "$INSTDIR\defaults"
 	RMDir /r "$INSTDIR\htroot"
+	RMDir /r "$INSTDIR\langstats"
 	RMDir /r "$INSTDIR\lib"
+	RMDir /r "$INSTDIR\libbuild"
 	RMDir /r "$INSTDIR\libx"
 	RMDir /r "$INSTDIR\locales"
 	RMDir /r "$INSTDIR\ranking"

htroot/ConfigUpdate_p.html

@@ -118,6 +118,8 @@
       <p>manual update:<br/>apt-get update &amp;&amp; apt-get install yacy</p>
       <p>automatic update: add the following line to /etc/crontab<br/>0 6 * * * root apt-get update &amp;&amp; apt-get -y --force-yes install yacy</p>
       ::
+      <p>YaCy has been installed to the Program Files directory. Automatic update is not possible.<br/>Download and install the latest version from the web page <a href="http://www.yacy.net/">http://www.yacy.net/</a></p>
+      ::
     #(/candeploy)#
     
     #%env/templates/footer.template%#

htroot/ConfigUpdate_p.java

@@ -55,6 +55,9 @@ public class ConfigUpdate_p {
         if (yacyBuildProperties.isPkgManager()) {
             prop.put("candeploy", "2");
             return prop;
+        } else if (OS.isWindows && sb.appPath.toString().indexOf("Program Files") > -1) {
+            prop.put("candeploy", "3");
+            return prop;
         } else if (OS.canExecUnix || OS.isWindows) {
             // we can deploy a new system with (i.e.)
             // cd DATA/RELEASE;tar xfz $1;cp -Rf yacy/* ../../;rm -Rf yacy

startYACY.bat

@@ -18,7 +18,7 @@ if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
 if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
 
 :STARTJAVA
-set javacmd=%javacmd% -Xss256k -XX:MaxPermSize=256m -XX:-UseGCOverheadLimit -XX:+UseAdaptiveSizePolicy -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8
+set javacmd=%javacmd% -Xss256k -XX:MaxPermSize=256m -XX:ReservedCodeCacheSize=1024m -XX:-UseGCOverheadLimit -XX:+UseAdaptiveSizePolicy -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8
 Rem Starting YaCy
 Echo Generated classpath:%CLASSPATH%
 Echo JRE Parameters:%javacmd%
@@ -30,7 +30,7 @@ Echo.
 Echo You can download Java at http://java.com/
 Echo.
 Echo ***************************************************************************
-start %priority% javaw %javacmd% -classpath %CLASSPATH% net.yacy.yacy
+start %priority% javaw %javacmd% -classpath %CLASSPATH% net.yacy.yacy -start YaCy
 Echo You can close the console safely now.
 
 GoTo :END

startYACY_debug.bat

@@ -20,7 +20,7 @@ if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
 if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
 
 :STARTJAVA
-set javacmd=%javacmd% -XX:-UseGCOverheadLimit -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8
+set javacmd=%javacmd% -Xss256k -XX:MaxPermSize=256m -XX:ReservedCodeCacheSize=1024m -XX:-UseGCOverheadLimit -XX:+UseAdaptiveSizePolicy -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8
 Rem Starting YaCy
 Echo Generated classpath:%CLASSPATH%
 Echo JRE Parameters:%javacmd%
@@ -37,7 +37,7 @@ Echo  ^>^> YaCy started as daemon process. Administration at http://localhost:%p
 
 title YaCy - http://localhost:%port%
 
-start "YaCy" %priority% /B /WAIT java %javacmd% -classpath %CLASSPATH% net.yacy.yacy
+start "YaCy" %priority% /B /WAIT java %javacmd% -classpath %CLASSPATH% net.yacy.yacy -start YaCy
 
 if not exist DATA\yacy.restart GoTo :END
 del DATA\yacy.restart