From e09e27b1ac4cd8c5bab8044c4f673b0c5829c08d Mon Sep 17 00:00:00 2001 From: lotus Date: Sun, 23 Oct 2011 19:53:51 +0000 Subject: [PATCH] Win installer: remove Berlios redirect to updated JRE, link is now hardcoded again, JRE update git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@8003 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- addon/download.php | 8 ++++---- build.nsi | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/addon/download.php b/addon/download.php index ee266e9e3..49329537a 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-6u25-windows-i586.exe - header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=48344'); + // jre-6u29-windows-i586.exe + header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=57241'); if($_GET['version'] == 64) - // jre-6u25-windows-x64.exe - header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=48346'); + // jre-6u29-windows-x64.exe + header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=56699'); } diff --git a/build.nsi b/build.nsi index 04fe943d9..436bd95dd 100755 --- a/build.nsi +++ b/build.nsi @@ -60,8 +60,13 @@ SetCompressor /SOLID LZMA ; http://www.java.com/de/download/manual.jsp BundleId +1 / +2 !define JRE_VERSION6 "1.6" -!define JRE_32 "http://yacy.berlios.de/download.php?what=jre&version=32&yacyrevnr=@REPL_REVISION_NR@" -!define JRE_64 "http://yacy.berlios.de/download.php?what=jre&version=64&yacyrevnr=@REPL_REVISION_NR@" +; jre-6u29-windows-i586.exe +!define JRE_32 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=57241" +; jre-6u29-windows-x64.exe +!define JRE_64 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=56699" + +;!define JRE_32 "http://yacy.berlios.de/download.php?what=jre&version=32&yacyrevnr=@REPL_REVISION_NR@" +;!define JRE_64 "http://yacy.berlios.de/download.php?what=jre&version=64&yacyrevnr=@REPL_REVISION_NR@" ; ---------------------------------------- ; GENERAL APPEARANCE