diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh index 6fdf2eb475c..f932ed060e8 100755 --- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh +++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh @@ -78,9 +78,9 @@ if [ ${TYPE} = test ]; then # 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 against ../updates/3.1" + echo "VERIFYING VERSION CORRECTNESS: Features against ../updates/3.2" ls features/*.jar | sed -e 's,^.*features/,,' | sort > f1.$$.txt - ls ../updates/3.1/features/*.jar | sed -e 's,^.*features/,,' | sort > f2.$$.txt + ls ../updates/3.2/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 @@ -88,20 +88,20 @@ if [ ${TYPE} = test ]; then 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 - fbase=`echo $f | sed -e 's,\(.*_[0-9][0-9]*\)\.[0-9][0-9]*\..*,\1,'` - fold=`grep ${fbase} f2.$$.txt` + 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 update or NEW : ${f}" + echo "PROBLEM: MAJOR or MINOR update : ${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 update or NEW : ${f}" + #fi done - echo "VERIFYING VERSION CORRECTNESS: Plugins against ../updates/3.1" + echo "VERIFYING VERSION CORRECTNESS: Plugins against ../updates/3.2" ls plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p1.$$.txt - ls ../updates/3.1/plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p2.$$.txt + ls ../updates/3.2/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 @@ -109,16 +109,16 @@ if [ ${TYPE} = test ]; then 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 - pbase=`echo $p | sed -e 's,\(.*_[0-9][0-9]*\)\.[0-9][0-9]*\..*,\1,'` - pold=`grep ${pbase} p2.$$.txt` + 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 update or NEW : ${p}" + echo "PROBLEM: MAJOR or MINOR update : ${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 update or NEW : ${p}" + #fi done #rm f_new.txt p_new.txt mv -f f1.$$.txt fversions.txt @@ -135,7 +135,7 @@ if [ ${TYPE} = test ]; then sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -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" \ @@ -267,7 +267,7 @@ elif [ ${TYPE} = testSigned ]; then sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -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" \ @@ -293,7 +293,7 @@ being contributed to the Galileo coordinated release train (Eclipse 3.5.x).' \ sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -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" \ @@ -319,7 +319,7 @@ to test them before going live.' \ sed -e "s,/dsdp/tm/updates/2.0,/dsdp/tm/updates/${SITEDIR},g" \ -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \ -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" \ @@ -346,7 +346,7 @@ being contributed to the Ganymede coordinated release train (Eclipse 3.4).' \ -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" \ @@ -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/category.xml b/releng/org.eclipse.rse.updatesite/category.xml index c905c057d94..58e132ea122 100644 --- a/releng/org.eclipse.rse.updatesite/category.xml +++ b/releng/org.eclipse.rse.updatesite/category.xml @@ -1,9 +1,9 @@ - + - + @@ -21,7 +21,7 @@ - +