diff --git a/releng/mids.setup b/releng/mids.setup index 1a0ee6b..912a953 100644 --- a/releng/mids.setup +++ b/releng/mids.setup @@ -497,9 +497,9 @@ + url="https://download.eclipse.org/trace4cps/v0.2/update-site/"/> + url="https://download.eclipse.org/lsat/v0.3/update-site/"/> + url="https://tno.github.io/PPS/update-site/v0.20.0/"/> diff --git a/releng/nl.tno.mids.releng.target/nl.tno.mids.releng.target.target b/releng/nl.tno.mids.releng.target/nl.tno.mids.releng.target.target index 039d101..25ac82b 100644 --- a/releng/nl.tno.mids.releng.target/nl.tno.mids.releng.target.target +++ b/releng/nl.tno.mids.releng.target/nl.tno.mids.releng.target.target @@ -1,6 +1,6 @@ - + @@ -45,11 +45,11 @@ - - - - - + + + + + diff --git a/releng/versionQualifier.sh b/releng/versionQualifier.sh index 3a552c6..acf252b 100755 --- a/releng/versionQualifier.sh +++ b/releng/versionQualifier.sh @@ -13,11 +13,16 @@ QUALIFIER_POSTFIX="dev" if [ $# -gt 0 ] then - QUALIFIER_POSTFIX=$(echo $1 | sed -e 's/^[^-]*-//') + QUALIFIER_POSTFIX=$(echo $1 | cut -s -d '-' -f2-) fi # Get Git last commit date. GIT_DATE_EPOCH=$(git log -1 --format=%cd --date=raw | cut -d ' ' -f 1) GIT_DATE=$(date -d @$GIT_DATE_EPOCH -u +%Y%m%d-%H%M%S) -echo "v$GIT_DATE-$QUALIFIER_POSTFIX" +if [ -z "$QUALIFIER_POSTFIX" ] +then + echo "v$GIT_DATE" +else + echo "v$GIT_DATE-$QUALIFIER_POSTFIX" +fi