From ba7e286029308181d9fec76378cacea365902a16 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Tue, 8 May 2007 16:28:39 +0000
Subject: [PATCH] Update to Eclipse M7_33 and basebuilder M7_33

---
 releng/org.eclipse.rse.build/setup.sh | 38 +++++++++++++--------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
index d1556283afc..c3e669450eb 100755
--- a/releng/org.eclipse.rse.build/setup.sh
+++ b/releng/org.eclipse.rse.build/setup.sh
@@ -44,29 +44,29 @@ esac
 if [ ! -f eclipse/plugins/org.eclipse.core.resources_3.3.0.v20070316.jar ]; then
   curdir2=`pwd`
   if [ ! -d eclipse -o -h eclipse ]; then
-    if [ -d eclipse-3.3M6-${ep_arch} ]; then
-      rm -rf eclipse-3.3M6-${ep_arch}
+    if [ -d eclipse-3.3M7-${ep_arch} ]; then
+      rm -rf eclipse-3.3M7-${ep_arch}
     fi
-    mkdir eclipse-3.3M6-${ep_arch}
-    cd eclipse-3.3M6-${ep_arch}
+    mkdir eclipse-3.3M7-${ep_arch}
+    cd eclipse-3.3M7-${ep_arch}
   else
     rm -rf eclipse
   fi
-  ## Eclipse Platform 3.3M6
-  #wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M6-200703231616/eclipse-platform-3.3M6-${ep_arch}.tar.gz"
-  #tar xfvz eclipse-platform-3.3M6-${ep_arch}.tar.gz
-  #rm eclipse-platform-3.3M6-${ep_arch}.tar.gz
-  # Eclipse SDK 3.3M6: Need the SDK because EMF needs JDT (somehow)
+  ## Eclipse Platform 3.3M7
+  #wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M7-200705031400/eclipse-platform-3.3M7-${ep_arch}.tar.gz"
+  #tar xfvz eclipse-platform-3.3M7-${ep_arch}.tar.gz
+  #rm eclipse-platform-3.3M7-${ep_arch}.tar.gz
+  # Eclipse SDK 3.3: Need the SDK because EMF needs JDT (somehow)
   echo "Getting Eclipse SDK..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M6-200703231616/eclipse-SDK-3.3M6-${ep_arch}.tar.gz"
-  tar xfvz eclipse-SDK-3.3M6-${ep_arch}.tar.gz
-  rm eclipse-SDK-3.3M6-${ep_arch}.tar.gz
+  wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M7-200705031400/eclipse-SDK-3.3M7-${ep_arch}.tar.gz"
+  tar xfvz eclipse-SDK-3.3M7-${ep_arch}.tar.gz
+  rm eclipse-SDK-3.3M7-${ep_arch}.tar.gz
   cd "${curdir2}"
   if [ ! -d eclipse -o -h eclipse ]; then
     if [ -e eclipse ]; then 
       rm eclipse
     fi
-    ln -s eclipse-3.3M6-${ep_arch}/eclipse eclipse
+    ln -s eclipse-3.3M7-${ep_arch}/eclipse eclipse
   fi
 fi
 if [ ! -f eclipse/startup.jar ]; then
@@ -101,16 +101,14 @@ fi
 if [ ! -f eclipse/plugins/org.junit_3.8.2/junit.jar ]; then
   # Eclipse Test Framework
   echo "Getting Eclipse Test Framework..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M6-200703231616/eclipse-test-framework-3.3M6.zip"
-  unzip -o eclipse-test-framework-3.3M6.zip
-  rm eclipse-test-framework-3.3M6.zip
+  wget "http://download.eclipse.org/eclipse/downloads/drops/S-3.3M7-200705031400/eclipse-test-framework-3.3M7.zip"
+  unzip -o eclipse-test-framework-3.3M7.zip
+  rm eclipse-test-framework-3.3M7.zip
 fi
 
 # checkout the basebuilder
-#baseBuilderTag=v20070321
-#if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.jdt.core.contrib.converter_1.1.2.200703120901.jar ]; then
-baseBuilderTag=M6_33
-if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.3.0.v20070323-1600.jar ]; then
+baseBuilderTag=M7_33
+if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.3.0.v20070501-0010.jar ]; then
   if [ -d org.eclipse.releng.basebuilder ]; then
     echo "Re-getting basebuilder from CVS..."
     rm -rf org.eclipse.releng.basebuilder