From ed402a0a8bd1e8283958381618c93e6b20ed237b Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Tue, 28 Jun 2011 10:54:47 +0000
Subject: [PATCH] [releng] TM 3.3 initial Relnotes and N&N

---
 .../downloads/dlconfig.txt                    |  2 +-
 .../org.eclipse.rse.build/downloads/index.php |  2 +-
 releng/org.eclipse.rse.build/setup.sh         | 19 ++++++++-----------
 .../org.eclipse.rse.build/template/index.php  | 12 ++++++------
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/releng/org.eclipse.rse.build/downloads/dlconfig.txt b/releng/org.eclipse.rse.build/downloads/dlconfig.txt
index e2b3760459d..092967a2661 100644
--- a/releng/org.eclipse.rse.build/downloads/dlconfig.txt
+++ b/releng/org.eclipse.rse.build/downloads/dlconfig.txt
@@ -1,2 +1,2 @@
 dropPrefix[]=R&dropPrefix[]=S&dropPrefix[]=I&dropPrefix[]=N&dropPrefix[]=M&dropPrefix[]=J&dropPrefix[]=L&
-dropType[]=Latest Release&dropType[]=3.3 Stream Stable Build&dropType[]=3.3 Stream Integration Build&dropType[]=3.3 Stream Nightly Build&dropType[]=3.2.x Stream Maintenance Build&dropType[]=3.1.x Stream Maintenance Build&dropType[]=3.0.x Stream Legacy Build&
+dropType[]=Latest Release&dropType[]=3.3.1 Stream Stable Build&dropType[]=3.3.1 Stream Integration Build&dropType[]=3.3.1 Stream Nightly Build&dropType[]=3.2.x Stream Maintenance Build&dropType[]=3.1.x Stream Maintenance Build&dropType[]=3.0.x Stream Legacy Build&
diff --git a/releng/org.eclipse.rse.build/downloads/index.php b/releng/org.eclipse.rse.build/downloads/index.php
index a034c1ff3af..90f49da017d 100644
--- a/releng/org.eclipse.rse.build/downloads/index.php
+++ b/releng/org.eclipse.rse.build/downloads/index.php
@@ -49,7 +49,7 @@ Software User Agreement</a> unless otherwise specified. </p>
 <b>Other eclipse.org project</b> downloads are available
 <a href="http://www.eclipse.org/downloads/index.php">here</a>.<br/>
 If you just want the latest drops (no dstore server), you can also get them from the 
-<a href="http://download.eclipse.org/tm/updates/3.2">TM 3.2 update site</a> (latest release), or the
+<a href="http://download.eclipse.org/tm/updates/3.3">TM 3.3 update site</a> (latest release), or the
 <a href="http://download.eclipse.org/tm/updates/3.3milestones">TM 3.3.x milestone site</a> (stable milestones).</p>
 
 <p>
diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
index 4810103c4a0..50c612c6434 100755
--- a/releng/org.eclipse.rse.build/setup.sh
+++ b/releng/org.eclipse.rse.build/setup.sh
@@ -47,12 +47,12 @@ case ${uname_s}${uname_m} in
 esac
 
 # prepare the base Eclipse installation in folder "eclipse"
-ep_rel="S-"
-ep_ver=3.7M7
-ep_date="-201104280848"
+ep_rel="R-"
+ep_ver=3.7
+ep_date="-201106131736"
 P2_disabled=false
 P2_no_dropins=false
-if [ ! -f eclipse/plugins/org.eclipse.swt_3.7.0.v3730b.jar ]; then
+if [ ! -f eclipse/plugins/org.eclipse.swt_3.7.0.v3735b.jar ]; then
   curdir2=`pwd`
   if [ ! -d eclipse -o -h eclipse ]; then
     if [ -d eclipse-${ep_ver}-${ep_arch} ]; then
@@ -133,12 +133,9 @@ if [ ! -f ${DROPIN}/org.sonatype.tycho.p2.updatesite_0.9.0.201005191712.jar ]; t
 fi
 
 # CDT Runtime
-#CDTREL=7.0.0
-#CDTFEAT=7.0.0
-#CDTVER=201006141710
 CDTREL=8.0.0
 CDTFEAT=8.0.0
-CDTVER=201105021546
+CDTVER=201106081058
 CDTNAME=cdt-master-${CDTREL}-I${CDTVER}.zip
 CDTLOC=builds/${CDTREL}/I.I${CDTVER}/${CDTNAME}
 if [ ! -f eclipse/plugins/org.eclipse.cdt_${CDTFEAT}.${CDTVER}.jar ]; then
@@ -170,9 +167,9 @@ fi
 # checkout the basebuilder - 
 # http://wiki.eclipse.org/Platform-releng-basebuilder#Current_build_tag_for_3.7_stream_builds_.28Indigo.29
 #baseBuilderTag=R36_RC4
-baseBuilderTag=R37_M6
-if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.7.0.v20110304.jar \
-  -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.6.100.v20110310/pdebuild.jar ]; then
+baseBuilderTag=R37_M7
+if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.7.0.v20110421.jar \
+  -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.7.0.v20110418/pdebuild.jar ]; then
   if [ -d org.eclipse.releng.basebuilder ]; then
     echo "Re-getting basebuilder from CVS..."
     rm -rf org.eclipse.releng.basebuilder
diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php
index 3f4e7e58bc2..f536589c4b7 100755
--- a/releng/org.eclipse.rse.build/template/index.php
+++ b/releng/org.eclipse.rse.build/template/index.php
@@ -18,14 +18,14 @@
 		User Agreement</a>.</p>
 		
 		<p><font size="+1"><strong>
-<!-- -->
-		  <a href="buildNotes.php">New and Noteworthy / Build Notes</a>
-<!-- -->
 <!--
-		  <p><a href="http://www.eclipse.org/tm/development/relnotes/3.2/tm-news-3.2.html">New and Noteworthy</a></p>
-		  <p><a href="http://www.eclipse.org/tm/development/relnotes/3.2/readme_tm_3.2.html">TM 3.2 Readme / Release Notes</a></p>
+		  <a href="buildNotes.php">New and Noteworthy / Build Notes</a>
+ -->
+<!-- -->
+		  <p><a href="http://www.eclipse.org/tm/development/relnotes/3.3/tm-news-3.3.html">New and Noteworthy</a></p>
+		  <p><a href="http://www.eclipse.org/tm/development/relnotes/3.3/readme_tm_3.3.html">TM 3.3 Readme / Release Notes</a></p>
 		  <p><a href="buildNotes.php">Build Notes</a></p>
--->
+<!-- -->
 		</strong></font></p>
 		
 		To view the map file entries for this build, click