From 37b4baf8ba0ad75f6fa189083b2199320731bcea Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Wed, 30 May 2012 10:13:52 +0000
Subject: [PATCH] [releng] build against Juno RC2 : use an 1.6 bootclasspath

---
 releng/org.eclipse.rse.build/setup.sh         | 27 ++++++++++---------
 .../template/buildNotes.php                   |  4 +--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
index 94d9da90809..9c37f82e452 100755
--- a/releng/org.eclipse.rse.build/setup.sh
+++ b/releng/org.eclipse.rse.build/setup.sh
@@ -48,14 +48,15 @@ esac
 
 #http://download.eclipse.org/eclipse/downloads/drops/S-3.8RC1-201205182345/
 #http://download.eclipse.org/eclipse/downloads/drops4/S-4.2RC1-201205182145/
+#http://download.eclipse.org/eclipse/downloads/drops/S-3.8RC2-201205251400/
 
 # prepare the base Eclipse installation in folder "eclipse"
 #ep_rel="drops4/S-"
 #ep_ver=4.2RC1
 #ep_date="-201205182145"
 ep_rel="drops/S-"
-ep_ver=3.8RC1
-ep_date="-201205182345"
+ep_ver=3.8RC2
+ep_date="-201205251400"
 #ep_rel="drops/R-"
 #ep_ver=3.7.2
 #ep_date="-201202080800"
@@ -63,7 +64,7 @@ P2_disabled=false
 P2_no_dropins=false
 #if [ ! -f eclipse/plugins/org.eclipse.swt_3.7.2.v3740f.jar ]; then
 #if [ ! -f eclipse/plugins/org.eclipse.swt_3.100.0.v4232.jar ]; then
-if [ ! -f eclipse/plugins/org.eclipse.swt_3.8.0.v3832.jar ]; then
+if [ ! -f eclipse/plugins/org.eclipse.swt_3.8.0.v3832b.jar ]; then
   curdir2=`pwd`
   if [ ! -d eclipse -o -h eclipse ]; then
     if [ -d eclipse-${ep_ver}-${ep_arch} ]; then
@@ -145,18 +146,18 @@ if [ ! -f ${DROPIN}/org.sonatype.tycho.p2.updatesite_0.9.0.201005191712.jar ]; t
 fi
 
 # CDT Runtime
-#CDTREL=8.1.0
-#CDTFEAT=8.1.0
-#CDTVER=201205221655
-CDTREL=8.0.1
-CDTFEAT=8.0.0
-CDTVER=201109151620
+CDTREL=8.1.0
+CDTFEAT=8.1.0
+CDTVER=201205261005
+#CDTREL=8.0.1
+#CDTFEAT=8.0.0
+#CDTVER=201109151620
 #CDTNAME=cdt-master-${CDTREL}-I${CDTVER}.zip
 #CDTLOC=builds/${CDTREL}/I.I${CDTVER}/${CDTNAME}
-CDTNAME=cdt-master-${CDTREL}.zip
-CDTLOC=releases/indigo/dist/${CDTNAME}
-#CDTNAME=org.eclipse.cdt.repo.zip
-#CDTLOC=builds/juno/milestones/RC1/${CDTNAME}
+#CDTNAME=cdt-master-${CDTREL}.zip
+#CDTLOC=releases/indigo/dist/${CDTNAME}
+CDTNAME=org.eclipse.cdt.repo.zip
+CDTLOC=builds/juno/milestones/RC2/${CDTNAME}
 if [ ! -f eclipse/plugins/org.eclipse.cdt_${CDTFEAT}.${CDTVER}.jar ]; then
   echo "Getting CDT Runtime..."
   wget "http://download.eclipse.org/tools/cdt/${CDTLOC}"
diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index 5df1f66c025..eb21d35e813 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -41,8 +41,8 @@
 </ul>
 </li>
 <li>At least 65 bugs were resolved: Use 
-  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-4=regexp;negate0=1;field0-0-0=target_milestone;type0-0-1=regexp;field0-0-1=target_milestone;resolution=FIXED;resolution=WONTFIX;resolution=WORKSFORME;field0-0-4=target_milestone;value0-0-2=backport;chfieldfrom=2011-09-27;chfieldto=2012-05-23;chfield=resolution;query_format=advanced;type0-0-3=regexp;field0-0-3=target_milestone;value0-0-3=3\.4%20M[1];value0-0-4=3\.4%20RC[234];field0-0-2=short_desc;value0-0-1=3\.2\.[12];type0-0-0=regexp;value0-0-0=[23]\.[0123]\..*;component=Core;component=RSE;component=Terminal;product=Target%20Management;type0-0-2=substring"> -->
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;component=Core;component=RSE;component=Terminal;resolution=FIXED;resolution=WONTFIX;resolution=WORKSFORME;target_milestone=3.4%20M3;target_milestone=3.4%20M4;target_milestone=3.4%20M5;target_milestone=3.4%20M6;target_milestone=3.4%20M7;target_milestone=3.4%20RC1;product=Target%20Management">
+  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?type0-0-4=regexp;negate0=1;field0-0-0=target_milestone;type0-0-1=regexp;field0-0-1=target_milestone;resolution=FIXED;resolution=WONTFIX;resolution=WORKSFORME;field0-0-4=target_milestone;value0-0-2=backport;chfieldfrom=2011-09-27;chfieldto=2012-05-30;chfield=resolution;query_format=advanced;type0-0-3=regexp;field0-0-3=target_milestone;value0-0-3=3\.4%20M[1];value0-0-4=3\.4%20RC[34];field0-0-2=short_desc;value0-0-1=3\.2\.[12];type0-0-0=regexp;value0-0-0=[23]\.[0123]\..*;component=Core;component=RSE;component=Terminal;product=Target%20Management;type0-0-2=substring"> -->
+  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;component=Core;component=RSE;component=Terminal;resolution=FIXED;resolution=WONTFIX;resolution=WORKSFORME;target_milestone=3.4%20M3;target_milestone=3.4%20M4;target_milestone=3.4%20M5;target_milestone=3.4%20M6;target_milestone=3.4%20M7;target_milestone=3.4%20RC1;target_milestone=3.4%20RC2;product=Target%20Management">
   this query</a> to show the list of bugs fixed since
   <a href="http://archive.eclipse.org/tm/downloads/drops/R-3.3.1-201109141310/">
   TM 3.3.1</a>