From a8eb8c664d56e465885775ce3362f9421e6cf4d6 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Mon, 3 Oct 2011 07:37:38 +0000
Subject: [PATCH] [releng] use Eclipse 3.7.1

---
 releng/org.eclipse.rse.build/customTargets.xml |  5 +++++
 releng/org.eclipse.rse.build/setup.sh          | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 1d9d273e852..e186a78edd1 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -217,6 +217,10 @@
 					<equals arg1="${buildType}" arg2="M"/>
 					<not><matches pattern="M[0-9-]*" string="${buildId}"/></not>
 				</and>
+				<and>
+					<equals arg1="${buildType}" arg2="H"/>
+					<not><matches pattern="H[0-9-]*" string="${buildId}"/></not>
+				</and>
 				<and>
 					<equals arg1="${buildType}" arg2="J"/>
 					<not><matches pattern="J[0-9-]*" string="${buildId}"/></not>
@@ -392,6 +396,7 @@
 		<condition property="buildTypeLong" value="Integration"><equals arg1="${buildType}" arg2="I"/></condition>
 		<condition property="buildTypeLong" value="Stable"><equals arg1="${buildType}" arg2="S"/></condition>
 		<condition property="buildTypeLong" value="Release"><equals arg1="${buildType}" arg2="R"/></condition>
+		<condition property="buildTypeLong" value="Maintenance"><equals arg1="${buildType}" arg2="H"/></condition>
 		<condition property="buildTypeLong" value="Maintenance"><equals arg1="${buildType}" arg2="J"/></condition>
 		<condition property="buildTypeLong" value="Maintenance"><equals arg1="${buildType}" arg2="M"/></condition>
 		<condition property="buildTypeLong" value="Legacy"><equals arg1="${buildType}" arg2="K"/></condition>
diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
index 50c612c6434..6808891a40d 100755
--- a/releng/org.eclipse.rse.build/setup.sh
+++ b/releng/org.eclipse.rse.build/setup.sh
@@ -48,11 +48,11 @@ esac
 
 # prepare the base Eclipse installation in folder "eclipse"
 ep_rel="R-"
-ep_ver=3.7
-ep_date="-201106131736"
+ep_ver=3.7.1
+ep_date="-201109091335"
 P2_disabled=false
 P2_no_dropins=false
-if [ ! -f eclipse/plugins/org.eclipse.swt_3.7.0.v3735b.jar ]; then
+if [ ! -f eclipse/plugins/org.eclipse.swt_3.7.1.v3738a.jar ]; then
   curdir2=`pwd`
   if [ ! -d eclipse -o -h eclipse ]; then
     if [ -d eclipse-${ep_ver}-${ep_arch} ]; then
@@ -133,11 +133,13 @@ if [ ! -f ${DROPIN}/org.sonatype.tycho.p2.updatesite_0.9.0.201005191712.jar ]; t
 fi
 
 # CDT Runtime
-CDTREL=8.0.0
+CDTREL=8.0.1
 CDTFEAT=8.0.0
-CDTVER=201106081058
-CDTNAME=cdt-master-${CDTREL}-I${CDTVER}.zip
-CDTLOC=builds/${CDTREL}/I.I${CDTVER}/${CDTNAME}
+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}
 if [ ! -f eclipse/plugins/org.eclipse.cdt_${CDTFEAT}.${CDTVER}.jar ]; then
   echo "Getting CDT Runtime..."
   wget "http://download.eclipse.org/tools/cdt/${CDTLOC}"