changeset 1413:ff297a6f60ef

Clean eclipse cruft from update-version script reviewed-by: jerboaa review-thread: http://icedtea.classpath.org/pipermail/thermostat/2014-June/009956.html PR1822
author Jon VanAlten <jon.vanalten@redhat.com>
date Tue, 03 Jun 2014 11:57:38 -0600
parents a0592d702416
children 2c1c1a161396
files distribution/tools/update-version
diffstat 1 files changed, 3 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/tools/update-version	Tue Jun 03 11:55:56 2014 -0600
+++ b/distribution/tools/update-version	Tue Jun 03 11:57:38 2014 -0600
@@ -115,43 +115,22 @@
   find ./ -name *.target | grep -v \/target\/
 }
 
-find_eclipse_manifest() {
-  find ./eclipse -name MANIFEST.MF | grep -v \/target\/
-}
-
-find_eclipse_category_feature() {
-  find ./eclipse -name category.xml -o -name feature.xml | grep -v \/target\/
-}
-
-find_build_properties() {
-  find ./eclipse -name build.properties | grep -v \/target\/
-}
-
 bump_keep_qualifier() {
   echo "Keeping SNAPSHOT qualifier..."
   sed -i s/${old_regex}-SNAPSHOT/${new}-SNAPSHOT/g `find_pom_metadata`
   sed -i s/${old_regex}\.SNAPSHOT/${new}.SNAPSHOT/g `find_target`
-  sed -i "s/Bundle-Version: ${old_regex}.qualifier/Bundle-Version: ${new}.qualifier/g" `find_eclipse_manifest`
-  sed -i s/${old_regex}.qualifier/${new}.qualifier/g `find_eclipse_category_feature`
 }
 
 bump_drop_qualifier() {
   echo "Dropping SNAPSHOT qualifier..."
   sed -i s/${old_regex}-SNAPSHOT/${new}/g `find_pom_metadata`
   sed -i s/${old_regex}\.SNAPSHOT/${new}/g `find_target`
-  sed -i "s/Bundle-Version: ${old_regex}.qualifier/Bundle-Version: ${new}/g" `find_eclipse_manifest`
-  sed -i s/${old_regex}.qualifier/${new}/g `find_eclipse_category_feature`
-  sed -i "s/forceContextQualifier = SNAPSHOT//" `find_build_properties`
-  sed -i '${/^$/d}' `find_build_properties`
 }
 
 bump_add_qualifier() {
   echo "Adding SNAPSHOT qualifier..."
   sed -i s/${old_regex}/${new}-SNAPSHOT/g `find_pom_metadata`
   sed -i s/${old_regex}/${new}.SNAPSHOT/g `find_target`
-  sed -i "s/Bundle-Version: ${old_regex}/Bundle-Version: ${new}.qualifier/g" `find_eclipse_manifest`
-  sed -i s/${old_regex}/${new}.qualifier/g `find_eclipse_category_feature`
-  sed -i "$ a \forceContextQualifier = SNAPSHOT" `find_build_properties`
 }
 
 echo ""
@@ -172,7 +151,8 @@
 echo ""
 find_and_warn_incomplete
 echo ""
-echo "Before you commit, tag, or release, be sure to run a full build:"
-echo "   USE_VNC=true make"
+echo "Before you commit, tag, or release, be sure to run a full build and"
+echo "run all tests.  The easiest way to do this is to run \"make\" from"
+echo "the root of the repository."
 exit 0