From 1117a033836eb0cbd5c5f5d02b0dca0f455fa0e2 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Thu, 29 Sep 2011 17:23:24 +0000 Subject: [PATCH] [releng] Prepare TM 3.4 Juno builds --- .../org.eclipse.rse.build/bin/make_signed.sh | 2 +- .../downloads/dlconfig.txt | 4 +- .../org.eclipse.rse.build/downloads/index.php | 2 +- .../bin/mkTestUpdates.sh | 34 +++++++++++++-- .../org.eclipse.rse.updatesite/category.xml | 22 +++++----- releng/org.eclipse.rse.updatesite/site.xml | 42 +++++++++---------- 6 files changed, 67 insertions(+), 39 deletions(-) diff --git a/releng/org.eclipse.rse.build/bin/make_signed.sh b/releng/org.eclipse.rse.build/bin/make_signed.sh index 14b144a3ac8..ed0545447cc 100755 --- a/releng/org.eclipse.rse.build/bin/make_signed.sh +++ b/releng/org.eclipse.rse.build/bin/make_signed.sh @@ -22,7 +22,7 @@ tmpdir=/tmp/${USER}.$$ # Accept environment variables set outside the script if [ "${UPDATE_SITE}" = "" ]; then - UPDATE_SITE=$HOME/downloads-tm/updates/3.3milestones + UPDATE_SITE=$HOME/downloads-tm/updates/3.4milestones fi if [ "${SIGNED_JAR_SOURCE}" = "" ]; then SIGNED_JAR_SOURCE=${tmpdir}/eclipse_ext/tm diff --git a/releng/org.eclipse.rse.build/downloads/dlconfig.txt b/releng/org.eclipse.rse.build/downloads/dlconfig.txt index 092967a2661..aaec21a76d4 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.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& +dropPrefix[]=R&dropPrefix[]=S&dropPrefix[]=I&dropPrefix[]=N&dropPrefix[]=H&dropPrefix[]=M&dropPrefix[]=J&dropPrefix[]=L& +dropType[]=Latest Release&dropType[]=3.4 Stream Stable Build&dropType[]=3.4 Stream Integration Build&dropType[]=3.4 Stream Nightly Build&dropType[]=3.3.x Stream Maintenance 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 90f49da017d..1ae94a2b0d0 100644 --- a/releng/org.eclipse.rse.build/downloads/index.php +++ b/releng/org.eclipse.rse.build/downloads/index.php @@ -50,7 +50,7 @@ Software User Agreement unless otherwise specified.
here.
For information about different kinds of builds look
diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index d499fd8417b..90e19e6ad32 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -42,7 +42,7 @@ fi
# get newest plugins and features: to be done manually on real update site
TPVERSION="Target Management"
-VERSION=3.3.x
+VERSION=3.4.x
DO_STATS=0
DO_CATEGORIES=0
TYPE=none
@@ -59,10 +59,12 @@ esac
case ${SITEDIR} in
3.2*) VERSION=3.2 ; DO_CATEGORIES=1 ;;
3.3*) VERSION=3.3 ; DO_CATEGORIES=1 ;;
+ 3.4*) VERSION=3.4 ; DO_CATEGORIES=1 ;;
esac
case ${SITEDIR} in
3.2) DO_STATS=1 ;;
3.3) DO_STATS=1 ;;
+ 3.4) DO_STATS=1 ;;
esac
case ${SITEPARENT} in
staging) SITEDIR=staging/${SITEDIR} ;;
@@ -87,7 +89,7 @@ if [ ${TYPE} = test ]; then
# Major version updates are not allowed.
#MINOR_UPDATE_OK=1
# Minor/major version updates are not allowed.
- MINOR_UPDATE_OK=0
+ MINOR_UPDATE_OK=1
# Update of "qualifier" requires also updating "micro"
echo "VERIFYING VERSION CORRECTNESS: Features against ../updates/3.3"
ls features/*.jar | sed -e 's,^.*features/,,' | sort > f1.$$.txt
@@ -308,7 +310,7 @@ elif [ ${TYPE} = milestone ]; then
-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-e '\,,a\
This site contains Target Management Milestones (I-, S- and M- builds) which are \
-being contributed to the Eclipse Indigo coordinated release train (Eclipse 3.7.x).' \
+being contributed to the Eclipse Juno coordinated release train (Eclipse 4.2.x).' \
index.html > index.html.new
mv -f index.html.new index.html
## keep 3.0.x features in site.xml
@@ -448,6 +450,32 @@ being contributed to the Eclipse Indigo coordinated release train (Eclipse 3.7.x
sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-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" \
+ web/site.xsl > web/site.xsl.new
+ mv -f web/site.xsl.new web/site.xsl
+elif [ `basename $SITE` = 3.4 ]; then
+ TPTYPE="3.4"
+ TPVERSION="${TPVERSION} ${TPTYPE}"
+ TYPE=official
+ echo "Working on ${TPVERSION} update site"
+ echo "Expect that you copied your features and plugins yourself"
+ stamp=`date +'%Y%m%d-%H%M'`
+ rm index.html site.xml web/site.xsl
+ cvs -q update -dPR
+ sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
+ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
+ -e '\,,a\
+This site contains Target Management 3.4 Releases and Updates (R- builds) which are \
+being contributed to the Eclipse Juno coordinated release train (Eclipse 4.2.x).' \
+ index.html > index.html.new
+ mv -f index.html.new index.html
+ ## dont keep 2.0.x features in site.xml
+ sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
+ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
+ -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" \
diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml
index 09581efbc04..b357f22053f 100644
--- a/releng/org.eclipse.rse.updatesite/category.xml
+++ b/releng/org.eclipse.rse.updatesite/category.xml
@@ -1,38 +1,38 @@