diff options
| -rw-r--r-- | addon/download.php | 8 | ||||
| -rwxr-xr-x | build.nsi | 4 | ||||
| -rw-r--r-- | build.xml | 5 |
3 files changed, 6 insertions, 11 deletions
diff --git a/addon/download.php b/addon/download.php index 944b95d79..4798f7ac9 100644 --- a/addon/download.php +++ b/addon/download.php @@ -17,12 +17,12 @@ $_GET['yacyrevnr'] not used yet if ($_GET['what'] == 'jre') { if($_GET['version'] == 32) - // jre-6u21-windows-i586.exe - header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=41724'); + // jre-6u22-windows-i586.exe + header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=42733'); if($_GET['version'] == 64) - // jre-6u21-windows-x64.exe - header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=41293'); + // jre-6u22-windows-x64.exe + header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=42735'); } @@ -123,7 +123,7 @@ LangString finishPage 0 "Zeige die Windows Firewall Konfiguration fuer YaCy." Section "YaCy"
SectionIn 1 RO
- SetShellVarContext current
+ SetShellVarContext current ; use system variables (folders) for current user
RMDir /r "$SMPROGRAMS\YaCy" ;clear old shortcuts
Delete "$QUICKLAUNCH\YaCy-Search.lnk" ;old
Delete "$DESKTOP\YaCy-Search.lnk" ;old
@@ -142,7 +142,7 @@ Section "YaCy" SectionEnd
Section "Sun Java"
- SectionIn 1
+ SectionIn 1 RO
SetShellVarContext current
Call DetectJRE
SectionEnd
@@ -314,9 +314,6 @@ </fileset> </copy> - <!-- TODO: check what this file yacy.exe is/was and if it is still needed here ... --> - <copy todir="${release_main}" file="yacy.exe" failonerror="false"/> - <!-- copy locales --> <copy todir="${release_main}/locales"> <fileset dir="${locales}"> @@ -461,8 +458,6 @@ <delete dir="${release_main}" failonerror="false"/> <delete file="${build}/de/anomic/yacy/yacyBuildProperties.java" failonerror="false"/> <delete file="${build}/log4j.properties" failonerror="false"/> - <!-- TODO: check what this file yacy.exe is/was and if it is still needed here ... --> - <delete file="yacy.exe" failonerror="false"/> <delete file="${lib}/yacycore.jar" failonerror="false"/> <delete file="${lib}/svnRevNr.jar" failonerror="false"/> <delete file="${libbuild}/svnRevNr.jar" failonerror="false"/> |