diff options
-rw-r--r-- | releng/EnrichPoms/baseline.txt | 3 | ||||
-rw-r--r-- | releng/EnrichPoms/publishJDT.sh | 19 | ||||
-rw-r--r-- | releng/EnrichPoms/publishPDE.sh | 19 |
3 files changed, 30 insertions, 11 deletions
diff --git a/releng/EnrichPoms/baseline.txt b/releng/EnrichPoms/baseline.txt index e41204ba8..81a119eb8 100644 --- a/releng/EnrichPoms/baseline.txt +++ b/releng/EnrichPoms/baseline.txt @@ -303,6 +303,3 @@ VERSION_org_eclipse_ui_win32=3.4.0 VERSION_org_eclipse_ui_workbench=3.111.0 VERSION_org_eclipse_ui_workbench_texteditor=3.11.0 VERSION_org_eclipse_update_configurator=3.4.0 -# temporarily reset to previous to force upload these two missing artifacts: -VERSION_org_eclipse_equinox_console=1.1.300 -VERSION_org_eclipse_update_configurator=3.3.400 diff --git a/releng/EnrichPoms/publishJDT.sh b/releng/EnrichPoms/publishJDT.sh index bfec16308..e9b172775 100644 --- a/releng/EnrichPoms/publishJDT.sh +++ b/releng/EnrichPoms/publishJDT.sh @@ -47,14 +47,25 @@ function same_as_baseline() { simple=`basename $1` name=`echo $simple | sed -e "s|\(.*\)-.*|\1|" | tr '.' '_'` version=`echo $simple | sed -e "s|.*-\(.*\).pom|\1|"` - base_version=`eval echo \\${VERSION_$name}` - if [[ $base_version =~ $version ]] + base_versions=`eval echo \\${VERSION_$name}` + if [ -n $base_versions ] then - return 0 + local base_single + while read -d "," base_single + do + if [ $base_single == $version ]; then + return 0 + fi + done <<< "$base_versions" + if [ $base_single == $version ]; then + return 0 + fi else - echo "different versions for ${name}: ${version} is not in ${base_version}" + echo "Plug-in ${name}: ${version} seems to be new" return 1 fi + echo "different versions for ${name}: ${version} is not in ${base_versions}" + return 1 } for pomFile in org/eclipse/jdt/*/*/*.pom diff --git a/releng/EnrichPoms/publishPDE.sh b/releng/EnrichPoms/publishPDE.sh index 2494e7c75..9e1cd127f 100644 --- a/releng/EnrichPoms/publishPDE.sh +++ b/releng/EnrichPoms/publishPDE.sh @@ -47,14 +47,25 @@ function same_as_baseline() { simple=`basename $1` name=`echo $simple | sed -e "s|\(.*\)-.*|\1|" | tr '.' '_'` version=`echo $simple | sed -e "s|.*-\(.*\).pom|\1|"` - base_version=`eval echo \\${VERSION_$name}` - if [[ $base_version =~ $version ]] + base_versions=`eval echo \\${VERSION_$name}` + if [ -n $base_versions ] then - return 0 + local base_single + while read -d "," base_single + do + if [ $base_single == $version ]; then + return 0 + fi + done <<< "$base_versions" + if [ $base_single == $version ]; then + return 0 + fi else - echo "different versions for ${name}: ${version} is not in ${base_version}" + echo "Plug-in ${name}: ${version} seems to be new" return 1 fi + echo "different versions for ${name}: ${version} is not in ${base_versions}" + return 1 } for pomFile in org/eclipse/pde/*/*/*.pom |