From 9e366e40a88d213602a18da2dc0bd5e62a2d214b Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 19 Aug 2010 16:09:04 +0000 Subject: [PATCH] [releng] Prepare 3.3 Stream --- .../bin/doit_irsbuild.sh | 5 ++- .../org.eclipse.rse.build/downloads/index.php | 4 +- releng/org.eclipse.rse.build/setup.sh | 14 +++--- .../template/buildNotes.php | 43 ++++++------------- .../bin/mkTestUpdates.sh | 40 ++++++++--------- releng/org.eclipse.rse.updatesite/site.xml | 5 ++- 6 files changed, 49 insertions(+), 62 deletions(-) diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh index 5f4285c4f1b..40182fec0b8 100755 --- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh +++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh @@ -40,7 +40,8 @@ buildType=$1 buildId=$2 case x$buildType in xP|xN|xI|xS|xR) ok=1 ;; - xM|xJ) mapTag=R3_1_maintenance ; ok=1 ;; + xM) mapTag=R3_2_maintenance ; ok=1 ;; + xJ) mapTag=R3_1_maintenance ; ok=1 ;; xK|xL) mapTag=R3_0_maintenance ; ok=1 ;; *) ok=0 ;; esac @@ -116,7 +117,7 @@ if [ -f package.count -a "$FILES" != "" ]; then if [ "$DO_SIGN" = "1" ]; then #sign the zipfiles - ${mydir}/batch_sign.sh `pwd` + #${mydir}/batch_sign.sh `pwd` fi if [ ${buildType} = N -a -d ../N.latest ]; then diff --git a/releng/org.eclipse.rse.build/downloads/index.php b/releng/org.eclipse.rse.build/downloads/index.php index cdfaa6e7333..6f02d7ee536 100644 --- a/releng/org.eclipse.rse.build/downloads/index.php +++ b/releng/org.eclipse.rse.build/downloads/index.php @@ -50,8 +50,8 @@ Software User Agreement unless otherwise specified.

Other eclipse.org project downloads are available here.
If you just want the latest drops (no dstore server), you can also get them from the -TM 3.1 update site (latest release), or the -TM 3.2 milestone site (stable milestones).

+TM 3.2 update site (latest release), or the +TM 3.2.x milestone site (stable milestones).

For information about different kinds of builds look diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh index adf59323a6f..86696063f90 100755 --- a/releng/org.eclipse.rse.build/setup.sh +++ b/releng/org.eclipse.rse.build/setup.sh @@ -47,9 +47,9 @@ case ${uname_s}${uname_m} in esac # prepare the base Eclipse installation in folder "eclipse" -ep_rel="S-" -ep_ver=3.6RC4 -ep_date="-201006031500" +ep_rel="R-" +ep_ver=3.6 +ep_date="-201006080911" P2_disabled=false P2_no_dropins=false if [ ! -f eclipse/plugins/org.eclipse.swt_3.6.0.v3650b.jar ]; then @@ -142,7 +142,7 @@ fi #CDTLOC=releases/ganymede/dist/${CDTNAME} CDTREL=7.0.0 CDTFEAT=7.0.0 -CDTVER=201006041510 +CDTVER=201006141710 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 @@ -172,9 +172,9 @@ if [ ! -f eclipse/plugins/org.eclipse.cdt_${CDTFEAT}.${CDTVER}.jar ]; then fi # checkout the basebuilder -baseBuilderTag=R36_RC2 -if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.6.0.v20100519.jar \ - -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.6.0.v20100512/pdebuild.jar \ +baseBuilderTag=R36_RC4 +if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.6.0.v20100601.jar \ + -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.6.0.v20100603/pdebuild.jar \ -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.p2.metadata.generator_1.0.200.v20100503a.jar ]; then if [ -d org.eclipse.releng.basebuilder ]; then echo "Re-getting basebuilder from CVS..." diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php index efdff211517..58dcd9b0d62 100755 --- a/releng/org.eclipse.rse.build/template/buildNotes.php +++ b/releng/org.eclipse.rse.build/template/buildNotes.php @@ -29,22 +29,20 @@ Platform Runtime is the minimum requirement for core RSE and Terminal. Discovery needs EMF. -

  • At least 35 bugs were resolved: Use - - +
  • At least 13 bugs were resolved: Use + + this query to show the list of bugs fixed since - - TM 3.2M7 - [build notes].
    • + + TM 3.2 + [build notes].
  • For details on checkins, see TM SearchCVS, the @@ -88,7 +86,7 @@ are the best places for you to get started.
    -

    For the upcoming TM 3.2 release, only backward compatible API changes +

    For the upcoming TM 3.3 release, only backward compatible API changes are planned, especially in order to support improved componentization and UI/Non-UI splitting. In the interest of improving the code base, though, please @@ -111,27 +109,14 @@ and may require changes in client code even though they are binary compatible. More information can be found in the associated bugzilla items.

      -
    • TM 3.2M7 API Specification Updates +
    • TM @buildId@ API Specification Updates
        -
      • The IServerLogger - interface was marked as @noimplement in order to allow adding a new method. Clients must extend the - default ServerLogger - class in order to contribute a valid custom server logger. We believe that any useful server logger would have done that - already, so the API specification update seems acceptable - [305272].
        • -
      • -
    • TM 3.2M6 API Specification Updates -
    + + + Use /,//d' \ -e '//,//d' \ - -e '//,//d' \ + -e '//,//d' \ site.xml > site.xml.new mv -f site.xml.new site.xml sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ @@ -373,7 +373,7 @@ being contributed to the Galileo coordinated release train (Eclipse 3.5).' \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -e '//,//d' \ -e '//,//d' \ - -e '//,//d' \ + -e '//,//d' \ site.xml > site.xml.new mv -f site.xml.new site.xml sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ @@ -415,7 +415,7 @@ else site.xml > site.xml.new1 sed -e '//,//d' \ site.xml.new1 > site.xml.new2 - sed -e '//,//d' \ + sed -e '//,//d' \ site.xml.new2 > site.xml.new mv -f site.xml.new site.xml rm site.xml.new1 site.xml.new2 diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml index 79c2d903360..3e2d73ae86b 100644 --- a/releng/org.eclipse.rse.updatesite/site.xml +++ b/releng/org.eclipse.rse.updatesite/site.xml @@ -687,7 +687,7 @@ - + @@ -744,5 +744,6 @@ Features and add-ons of the 3.2 release of Target Management / RSE. - + +