From 3da844a2e5fb6394bac96a7578a090155b509a84 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 5 Nov 2009 20:13:36 +0000 Subject: [PATCH] [releng] Update builder for 3.6m3 -- support J/K/L Legacy builds --- releng/org.eclipse.rse.build/README_build.txt | 2 +- .../bin/doit_irsbuild.sh | 4 +++- releng/org.eclipse.rse.build/build.pl | 2 +- releng/org.eclipse.rse.build/build.rb | 2 +- .../org.eclipse.rse.build/customTargets.xml | 15 ++++++++++++ .../downloads/build_types.html | 20 ++++++++++++---- .../downloads/dlconfig.txt | 4 ++-- releng/org.eclipse.rse.build/setup.sh | 23 +++++++++++-------- .../template/buildNotes.php | 21 ++++++++--------- 9 files changed, 61 insertions(+), 32 deletions(-) diff --git a/releng/org.eclipse.rse.build/README_build.txt b/releng/org.eclipse.rse.build/README_build.txt index bb1fc8e4ca9..9377bfdb14d 100644 --- a/releng/org.eclipse.rse.build/README_build.txt +++ b/releng/org.eclipse.rse.build/README_build.txt @@ -7,7 +7,7 @@ ssh build.eclipse.org cd /shared/dsdp/tm/ mkdir ws2_user cd ws2_user -ln -s `pws` $HOME/ws2 +ln -s `pwd` $HOME/ws2 ln -s /home/data/httpd/download.eclipse.org/dsdp/tm $HOME/downloads-tm cp -R ../ws2/IBMJava2-ppc-142 . wget -O setup.sh "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh?rev=HEAD&cvsroot=DSDP_Project&content-type=text/plain" diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh index e0e635de338..5f4285c4f1b 100755 --- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh +++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh @@ -39,7 +39,9 @@ mapTag=HEAD buildType=$1 buildId=$2 case x$buildType in - xP|xN|xI|xS|xR|xM) ok=1 ;; + xP|xN|xI|xS|xR) ok=1 ;; + xM|xJ) mapTag=R3_1_maintenance ; ok=1 ;; + xK|xL) mapTag=R3_0_maintenance ; ok=1 ;; *) ok=0 ;; esac if [ "$3" != "" ]; then diff --git a/releng/org.eclipse.rse.build/build.pl b/releng/org.eclipse.rse.build/build.pl index a82bc93d7ab..55d79ed156a 100644 --- a/releng/org.eclipse.rse.build/build.pl +++ b/releng/org.eclipse.rse.build/build.pl @@ -79,7 +79,7 @@ $packageDirectory = "$working/package"; $publishDirectory = "$working/publish"; $tag = ask("Enter tag to fetch from CVS", "HEAD"); -$buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable)", "P"); +$buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable, J/M=Maintenance, K/L=Legacy)", "P"); ($sec, $minute, $hour, $mday, $mon, $year) = localtime(); $mydstamp = sprintf("%4.4d%2.2d%2.2d", $year + 1900, ($mon + 1), $mday); $mytstamp = sprintf("%2.2d%2.2d", $hour, $minute, $sec); diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb index 36cde9e7773..a5d1d0e07d6 100644 --- a/releng/org.eclipse.rse.build/build.rb +++ b/releng/org.eclipse.rse.build/build.rb @@ -63,7 +63,7 @@ packageDirectory = "#{working}/package" publishDirectory = "#{working}/publish" tag = ask("Enter tag to fetch from CVS", "HEAD") -buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable)", "P") +buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable, J/M=Maintenance, K/L=Legacy)", "P") mydstamp = Time.now.strftime("%Y%m%d") mytstamp = Time.now.strftime("%H%M") buildId = ask("Enter the build id", buildType + mydstamp + "-" + mydstamp) diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml index e9460e194ab..e75c4246406 100644 --- a/releng/org.eclipse.rse.build/customTargets.xml +++ b/releng/org.eclipse.rse.build/customTargets.xml @@ -206,6 +206,18 @@ + + + + + + + + + + + + @@ -371,7 +383,10 @@ + + + diff --git a/releng/org.eclipse.rse.build/downloads/build_types.html b/releng/org.eclipse.rse.build/downloads/build_types.html index 131c40e8494..759069c1967 100644 --- a/releng/org.eclipse.rse.build/downloads/build_types.html +++ b/releng/org.eclipse.rse.build/downloads/build_types.html @@ -14,7 +14,7 @@ -

Releases +

R - Releases
Releases are builds that have been declared major releases by the development team - for example @@ -28,7 +28,7 @@ - Stable Builds + S - Stable Builds
Stable builds are integration builds that have been found to be stable enough for most people to use. @@ -44,7 +44,7 @@ -

Integration Builds +

I - Integration Builds
Periodically, component teams version off their work in what they believe is a stable, consistent @@ -59,7 +59,7 @@ - Nightly Builds + N - Nightly Builds
Nightly builds are produced every night from whatever has been released into the HEAD stream of the @@ -69,7 +69,7 @@ - Maintenance Builds + J,M - Maintenance Builds
Maintenance builds are produced periodically to incorporate fixes into an existing release. They are typically @@ -78,6 +78,16 @@ or service release (i.e. R1.1 or R1.0.1) after development teams have deemed one to be stable following one or more test-fix pass cycles. + + + K,L - Legacy Builds +
+ Legacy builds are maintenance builds + for some older release, after the usual service releases (n.n.2 release). + Legacy builds do not intend to culminate into any release, and are produced for + escalated fixes only on request. Typically, companies requesting a legacy build + need to contribute the resources for doing that build themselves. +

 

diff --git a/releng/org.eclipse.rse.build/downloads/dlconfig.txt b/releng/org.eclipse.rse.build/downloads/dlconfig.txt index a82f4e7fb6d..7c0f74c02ec 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& -dropType[]=Latest Release&dropType[]=3.1.1 Stream Stable Build&dropType[]=3.1.1 Stream Integration Build&dropType[]=3.1.1 Stream Nightly Build&dropType[]=3.0.x Stream Maintenance Build& +dropPrefix[]=R&dropPrefix[]=S&dropPrefix[]=I&dropPrefix[]=N&dropPrefix[]=J&dropPrefix[]=M&dropPrefix[]=L& +dropType[]=Latest Release&dropType[]=3.2 Stream Stable Build&dropType[]=3.2 Stream Integration Build&dropType[]=3.2 Stream Nightly Build&dropType[]=3.1.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/setup.sh b/releng/org.eclipse.rse.build/setup.sh index 4dad1d321f3..740527fca23 100755 --- a/releng/org.eclipse.rse.build/setup.sh +++ b/releng/org.eclipse.rse.build/setup.sh @@ -18,6 +18,12 @@ # script to find the published packages # # Bootstrapping: Get this script by +# export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp +# cvs co -r HEAD org.eclipse.tm.rse/releng/org.eclipse.rse.build +# sh org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh +# +# - OR - +# # wget -O setup.sh "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh?rev=HEAD&cvsroot=DSDP_Project&content-type=text/plain" # sh setup.sh # ./doit_ibuild.sh @@ -42,11 +48,8 @@ esac # prepare the base Eclipse installation in folder "eclipse" ep_rel="S-" -ep_ver=3.5M7 -ep_date="-200904302300" -#ep_rel= -#ep_ver=I20090426-2000 -#ep_date= +ep_ver=3.6M3 +ep_date="-200910301201" P2_disabled=false P2_no_dropins=false if [ ! -f eclipse/plugins/org.eclipse.swt_3.5.0.v3545a.jar ]; then @@ -110,11 +113,11 @@ else DROPUP=../.. fi -# EMF 2.5M7 +# EMF 2.5.0 EMFBRANCH=2.5.0 -EMFREL=S -EMFDATE=200905041408 -EMFVER=2.5.0M7 +EMFREL=R +EMFDATE=200906151043 +EMFVER=2.5.0 if [ ! -f ${DROPIN}/eclipse/plugins/org.eclipse.emf.doc_${EMFBRANCH}.v${EMFDATE}.jar ]; then # Need EMF 2.4 SDK for Service Discovery ISV Docs Backlinks echo "Getting EMF SDK..." @@ -141,7 +144,7 @@ if [ ! -f ${DROPIN}/eclipse/plugins/gnu.io.rxtx_2.1.7.4_v20071016.jar ]; then fi # checkout the basebuilder -baseBuilderTag=R35_M6 +baseBuilderTag=R36_M2 if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.5.0.v20090309-1900.jar \ -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.5.0.v20090312-1500/pdebuild.jar \ -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.p2.metadata.generator_1.0.100.v20090309-1845.jar ]; then diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php index fcc2aad1e82..36e8eb0bb6a 100755 --- a/releng/org.eclipse.rse.build/template/buildNotes.php +++ b/releng/org.eclipse.rse.build/template/buildNotes.php @@ -28,21 +28,20 @@ RSE runs on Java 1.4. Platform Runtime is the minimum requirement for core RSE and Terminal. Discovery needs EMF. -
  • Highlights of Bugs fixed since TM 3.1: +
  • Highlights of Bugs fixed since TM 3.1.1:
      -
    • A build problem was fixed which prevented the Team/Synchronize feature of importexport to run from downloaded drops - [283482].
      • -
    • The dstore processes subsystem now also works on Solaris - [175293].
      • +
    • A regression in the Terminal widget was fixed, which made initial output after login + invisible above the initial viewport + [294327].
    • -
  • At least 59 bugs were resolved: Use - - +
  • At least 1 bug was resolved: Use + + this query to show the list of bugs fixed since - - TM 3.1 - [build notes].
    • + + TM 3.1.1 + [build notes].
  • For details on checkins, see TM SearchCVS, the