From 36951e6f7036363b8c7741a792fe443f70091f8c Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Sun, 1 Feb 2009 18:52:47 +0000
Subject: [PATCH] Release towars 3.1m5 test candidate

---
 .../bin/mkTestUpdates.sh                      | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index 476c1455698..0064731c3ee 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -65,6 +65,47 @@ if [ ${TYPE} = test ]; then
         cp -R $DIR/plugins .
       fi
     fi
+    # CHECK VERSION CORRECTNESS for MICRO UPDATES only
+    # Minor/major version updates are not allowed.
+    # Update of "qualifier" requires also updating "micro"
+    echo "VERIFYING VERSION CORRECTNESS: Features"
+    ls features/*.jar | sed -e 's,^.*features/,,' | sort > f1.$$.txt
+    ls ../updates/3.0/features/*.jar | sed -e 's,^.*features/,,' | sort > f2.$$.txt
+    diff f2.$$.txt f1.$$.txt | grep '^[>]' \
+       | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > f_new.txt
+    for f in `cat f_new.txt`; do
+      fold=`grep ${f} f2.$$.txt`
+      if [ "${fold}" != "" ]; then
+        echo "PROBLEM: QUALIFIER update without MICRO: ${f}"
+      fi
+      fbase=`echo $f | sed -e 's,\(.*_[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,'`
+      fold=`grep ${fbase} f2.$$.txt`
+      if [ "${fold}" = "" ]; then
+        echo "PROBLEM: MAJOR or MINOR update : ${f}"
+      fi
+    done
+    echo "VERIFYING VERSION CORRECTNESS: Plugins"
+    ls plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p1.$$.txt
+    ls ../updates/3.0/plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p2.$$.txt
+    diff p2.$$.txt p1.$$.txt | grep '^[>]' \
+       | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > p_new.txt
+    for p in `cat p_new.txt`; do
+      pold=`grep ${p} p2.$$.txt`
+      if [ "${pold}" != "" ]; then
+        echo "PROBLEM: QUALIFIER update without MICRO: ${p}"
+      fi
+      pbase=`echo $p | sed -e 's,\(.*_[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,'`
+      pold=`grep ${pbase} p2.$$.txt`
+      if [ "${pold}" = "" ]; then
+        echo "PROBLEM: MAJOR or MINOR update : ${p}"
+      fi
+    done
+    #rm f_new.txt p_new.txt
+    mv -f f1.$$.txt fversions.txt
+    mv -f p1.$$.txt pversions.txt
+    mv -f f2.$$.txt f30versions.txt
+    mv -f p2.$$.txt p30versions.txt
+    ## rm f1.$$.txt f2.$$.txt p1.$$.txt p2.$$.txt    
     rm index.html site.xml web/site.xsl
     cvs -q update -dPR
     sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \
@@ -212,47 +253,6 @@ elif [ ${TYPE} = testSigned ]; then
     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
-    # CHECK VERSION CORRECTNESS for MICRO UPDATES only
-    # Minor/major version updates are not allowed.
-    # Update of "qualifier" requires also updating "micro"
-    echo "VERIFYING VERSION CORRECTNESS: Features"
-    ls features/*.jar | sed -e 's,^.*features/,,' | sort > f1.$$.txt
-    ls ../updates/3.0/features/*.jar | sed -e 's,^.*features/,,' | sort > f2.$$.txt
-    diff f2.$$.txt f1.$$.txt | grep '^[>]' \
-       | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > f_new.txt
-    for f in `cat f_new.txt`; do
-      fold=`grep ${f} f2.$$.txt`
-      if [ "${fold}" != "" ]; then
-        echo "PROBLEM: QUALIFIER update without MICRO: ${f}"
-      fi
-      fbase=`echo $f | sed -e 's,\(.*_[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,'`
-      fold=`grep ${fbase} f2.$$.txt`
-      if [ "${fold}" = "" ]; then
-        echo "PROBLEM: MAJOR or MINOR update : ${f}"
-      fi
-    done
-    echo "VERIFYING VERSION CORRECTNESS: Plugins"
-    ls plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p1.$$.txt
-    ls ../updates/3.0/plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p2.$$.txt
-    diff p2.$$.txt p1.$$.txt | grep '^[>]' \
-       | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > p_new.txt
-    for p in `cat p_new.txt`; do
-      pold=`grep ${p} p2.$$.txt`
-      if [ "${pold}" != "" ]; then
-        echo "PROBLEM: QUALIFIER update without MICRO: ${p}"
-      fi
-      pbase=`echo $p | sed -e 's,\(.*_[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,'`
-      pold=`grep ${pbase} p2.$$.txt`
-      if [ "${pold}" = "" ]; then
-        echo "PROBLEM: MAJOR or MINOR update : ${p}"
-      fi
-    done
-    #rm f_new.txt p_new.txt
-    mv -f f1.$$.txt fversions.txt
-    mv -f p1.$$.txt pversions.txt
-    mv -f f2.$$.txt f30versions.txt
-    mv -f p2.$$.txt p30versions.txt
-    ## rm f1.$$.txt f2.$$.txt p1.$$.txt p2.$$.txt    
 elif [ ${TYPE} = milestone ]; then
     echo "Working on milestone update site"
     TPTYPE="3.1 Milestone"