[releng] Prepare TM 3.4 Juno builds

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

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&
+dropPrefix[]=R&dropPrefix[]=S&dropPrefix[]=I&dropPrefix[]=N&dropPrefix[]=H&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&
+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&

releng/org.eclipse.rse.build/downloads/index.php

@@ -50,7 +50,7 @@ Software User Agreement</a> unless otherwise specified. </p>
 <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.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>
+<a href="http://download.eclipse.org/tm/updates/3.4milestones">TM 3.4.x milestone site</a> (stable milestones).</p>
 
 <p>
 For information about different kinds of builds look

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 '\,</h1>,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 '/<!-- BEGIN_2_0 -->/,/<!-- BEGIN_3_3 -->/d' \
+    	-e '/<!-- BEGIN_3_4 -->/,/<!-- END_ALL -->/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 '\,</h1>,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 '/<!-- BEGIN_2_0 -->/,/<!-- BEGIN_3_4 -->/d' \
         site.xml > site.xml.new
     mv -f site.xml.new site.xml
     sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \

releng/org.eclipse.rse.updatesite/category.xml

@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
    <feature url="features/org.eclipse.rse_3.3.1.qualifier.jar" id="org.eclipse.rse" version="3.3.1.qualifier">
-      <category name="tm_331_main"/>
+      <category name="tm_34_main"/>
    </feature>
    <feature url="features/org.eclipse.rse.sdk_3.3.1.qualifier.jar" id="org.eclipse.rse.sdk" version="3.3.1.qualifier">
-      <category name="tm_331_main"/>
+      <category name="tm_34_main"/>
    </feature>
    <feature url="features/org.eclipse.rse.useractions_1.1.300.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.300.qualifier">
-      <category name="tm_331_main"/>
+      <category name="tm_34_main"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_3.1.200.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.200.qualifier">
-      <category name="tm_331_optional"/>
+      <category name="tm_34_optional"/>
    </feature>
    <feature url="features/org.eclipse.rse.scp_0.1.0.qualifier.jar" id="org.eclipse.rse.scp" version="0.1.0.qualifier">
-      <category name="tm_331_optional"/>
+      <category name="tm_34_optional"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_3.3.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.3.0.qualifier">
-      <category name="tm_331_optional"/>
+      <category name="tm_34_optional"/>
    </feature>
    <feature url="features/org.eclipse.rse.wince_0.3.0.qualifier.jar" id="org.eclipse.rse.wince" version="0.3.0.qualifier">
-      <category name="tm_331_optional"/>
+      <category name="tm_34_optional"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.local.sdk_0.2.1.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.2.1.qualifier">
-      <category name="tm_331_optional"/>
+      <category name="tm_34_optional"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_3.2.1.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.2.1.qualifier">
-      <category name="tm_331_main"/>
+      <category name="tm_34_main"/>
    </feature>
-   <category-def name="tm_331_main" label="TM and RSE 3.3.1 Main Features">
+   <category-def name="tm_34_main" label="TM and RSE 3.4 Main Features">
       <description>
          TM and RSE Main Features
       </description>
    </category-def>
-   <category-def name="tm_331_optional" label="TM and RSE 3.3.1 Optional Add-Ons">
+   <category-def name="tm_34_optional" label="TM and RSE 3.4 Optional Add-Ons">
       <description>
          Examples, Tests and Incubation Plug-ins.
       </description>

releng/org.eclipse.rse.updatesite/site.xml

@@ -745,63 +745,63 @@
       </description>
    </category-def>
 <!-- END_3_3 -->
-<!-- BEGIN_3_3_1 -->
+<!-- BEGIN_3_4 -->
    <feature url="features/org.eclipse.rse.core_3.3.1.qualifier.jar" id="org.eclipse.rse.core" version="3.3.1.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.dstore_3.3.1.qualifier.jar" id="org.eclipse.rse.dstore" version="3.3.1.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.ftp_3.0.301.qualifier.jar" id="org.eclipse.rse.ftp" version="3.0.301.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.local_2.1.300.qualifier.jar" id="org.eclipse.rse.local" version="2.1.300.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse_3.3.1.qualifier.jar" id="org.eclipse.rse" version="3.3.1.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.sdk_3.3.1.qualifier.jar" id="org.eclipse.rse.sdk" version="3.3.1.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.ssh_3.0.301.qualifier.jar" id="org.eclipse.rse.ssh" version="3.0.301.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.telnet_2.2.200.qualifier.jar" id="org.eclipse.rse.telnet" version="2.2.200.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_3.1.200.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.200.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.terminals_1.1.1.qualifier.jar" id="org.eclipse.rse.terminals" version="1.1.1.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_3.3.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.3.0.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.useractions_1.1.300.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.300.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.scp_0.1.0.qualifier.jar" id="org.eclipse.rse.scp" version="0.1.0.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.rse.wince_0.3.0.qualifier.jar" id="org.eclipse.rse.wince" version="0.3.0.qualifier" os="win32" arch="x86">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_3.2.1.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.2.1.qualifier">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.local_0.2.0.qualifier.jar" id="org.eclipse.tm.terminal.local" version="0.2.0.qualifier" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.local.sdk_0.2.1.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.2.1.qualifier" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.3.1"/>
+      <category name="TM and RSE Uncategorized 3.4"/>
    </feature>
-   <category-def name="TM and RSE Uncategorized 3.3.1" label="TM and RSE Uncategorized 3.3.1">
+   <category-def name="TM and RSE Uncategorized 3.4" label="TM and RSE Uncategorized 3.4">
       <description>
-         Features and add-ons of the 3.3.1 release of Target Management / RSE.
+         Features and add-ons of the 3.4 (Juno) release of Target Management / RSE.
       </description>
    </category-def>
-<!-- END_3_3_1 -->
+<!-- END_3_4 -->
 <!-- END_ALL -->
 </site>