From 31bcedfe5140d754c6e49f2a9b2c04ad52d9f3c2 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 24 May 2012 13:27:21 +0000
Subject: [PATCH] [releng] build against Juno RC1

---
 releng/org.eclipse.rse.build/setup.sh                  | 6 +++---
 releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
index 4ac6fbc605c..8a4a359f689 100755
--- a/releng/org.eclipse.rse.build/setup.sh
+++ b/releng/org.eclipse.rse.build/setup.sh
@@ -50,7 +50,7 @@ esac
 #http://download.eclipse.org/eclipse/downloads/drops4/S-4.2RC1-201205182145/
 
 # prepare the base Eclipse installation in folder "eclipse"
-ep_rel="S-"
+ep_rel="drops4/S-"
 ep_ver=4.2RC1
 ep_date="-201205182145"
 P2_disabled=false
@@ -68,7 +68,7 @@ if [ ! -f eclipse/plugins/org.eclipse.swt_3.100.0.v4232.jar ]; then
   fi
   # Eclipse SDK: Need the SDK so we can link into docs
   echo "Getting Eclipse SDK..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}${ep_ver}${ep_date}/eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz"
+  wget "http://download.eclipse.org/eclipse/downloads/${ep_rel}${ep_ver}${ep_date}/eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz"
   tar xfvz eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz
   rm eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz
   cd "${curdir2}"
@@ -108,7 +108,7 @@ fi
 if [ ! -f eclipse/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar ]; then
   # Eclipse Test Framework
   echo "Getting Eclipse Test Framework..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}${ep_ver}${ep_date}/eclipse-test-framework-${ep_ver}.zip"
+  wget "http://download.eclipse.org/eclipse/downloads/${ep_rel}${ep_ver}${ep_date}/eclipse-test-framework-${ep_ver}.zip"
   unzip -o eclipse-test-framework-${ep_ver}.zip
   rm eclipse-test-framework-${ep_ver}.zip
 fi
diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index c26e97d011f..6412018c6fc 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -24,7 +24,7 @@ umask 022
 #Use Java5 on build.eclipse.org - need JRE for pack200
 export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
 basebuilder=${HOME}/ws2/org.eclipse.releng.basebuilder
-tgtlauncher=`ls ${HOME}/ws2/eclipse/plugins/org.eclipse.equinox.launcher_* | sort | tail -1`
+tgtlauncher=`ls ${HOME}/ws2/eclipse4/plugins/org.eclipse.equinox.launcher_* | sort | tail -1`
 
 # patch site.xml
 cd ..