Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2017-10-17 18:54:09 +0000
committerStephan Herrmann2017-10-17 18:54:09 +0000
commitc4ae0f3898458af6203ebbf788b96f5bdd03ea70 (patch)
tree4a5dfd8114395596bb1c8343f4aebe925dff2a6b /releng/EnrichPoms
parentb4abe3dce9ae38bb5fd9a797371824a2772e479c (diff)
downloadorg.eclipse.objectteams-c4ae0f3898458af6203ebbf788b96f5bdd03ea70.tar.gz
org.eclipse.objectteams-c4ae0f3898458af6203ebbf788b96f5bdd03ea70.tar.xz
org.eclipse.objectteams-c4ae0f3898458af6203ebbf788b96f5bdd03ea70.zip
Bug 510072: Scripts & tool for publishing to Maven Central should
migrate to releng git - trying to handle multi versions in create_baseline
Diffstat (limited to 'releng/EnrichPoms')
-rw-r--r--releng/EnrichPoms/CBIaggregator.sh6
-rw-r--r--releng/EnrichPoms/publishPDE.sh4
-rw-r--r--releng/EnrichPoms/publishPlatform.sh4
3 files changed, 12 insertions, 2 deletions
diff --git a/releng/EnrichPoms/CBIaggregator.sh b/releng/EnrichPoms/CBIaggregator.sh
index 094d541b7..ae6bda1c7 100644
--- a/releng/EnrichPoms/CBIaggregator.sh
+++ b/releng/EnrichPoms/CBIaggregator.sh
@@ -38,6 +38,12 @@ function create_baseline() {
file=`basename $line`
name=`echo $file | sed -e 's/\(.*\)_.*/\1/' | tr '.' '_'`
version=`echo $file | sed -e 's/.*_\(.*\)\.v[0-9-]*\.jar/\1/'`
+ previous=`eval echo \\${VERSION_$name}`
+ if [ "$previous$" != "" ]
+ then
+ version=${previous},${version}
+ fi
+ eval VERSION_$name=$version
echo VERSION_$name=$version
done > ${WORKSPACE}/baseline.txt
cd -
diff --git a/releng/EnrichPoms/publishPDE.sh b/releng/EnrichPoms/publishPDE.sh
index 349588509..8444b2e3e 100644
--- a/releng/EnrichPoms/publishPDE.sh
+++ b/releng/EnrichPoms/publishPDE.sh
@@ -47,10 +47,12 @@ function same_as_baseline() {
simple=`basename $1`
name=`echo $simple | sed -e "s|\(.*\)-.*|\1|" | tr '.' '_'`
version=`echo $simple | sed -e "s|.*-\(.*\).pom|\1|"`
- if [ "`eval echo \\${VERSION_$name}`" == "$version" ]
+ base_version=`eval echo \\${VERSION_$name}`
+ if [[ $base_version =~ $version ]]
then
return 0
else
+ echo "different versions for ${name}: ${version} is not in ${base_version}"
return 1
fi
}
diff --git a/releng/EnrichPoms/publishPlatform.sh b/releng/EnrichPoms/publishPlatform.sh
index 736d31826..4d3d72e43 100644
--- a/releng/EnrichPoms/publishPlatform.sh
+++ b/releng/EnrichPoms/publishPlatform.sh
@@ -48,10 +48,12 @@ function same_as_baseline() {
simple=`basename $1`
name=`echo $simple | sed -e "s|\(.*\)-.*|\1|" | tr '.' '_'`
version=`echo $simple | sed -e "s|.*-\(.*\).pom|\1|"`
- if [ "`eval echo \\${VERSION_$name}`" == "$version" ]
+ base_version=`eval echo \\${VERSION_$name}`
+ if [[ $base_version =~ $version ]]
then
return 0
else
+ echo "different versions for ${name}: ${version} is not in ${base_version}"
return 1
fi
}

Back to the top