Merge pull request #6 from TNO/5-upgrade-to-pps-v0.20

#5 Upgrade to PPS v0.20.0
TNO · Aug 4, 2024 · cf77a66 · cf77a66
2 parents ed18004 + 72f1644
commit cf77a66
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/releng/mids.setup b/releng/mids.setup
@@ -497,17 +497,17 @@
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/>
         <repository
-            url="https://download.eclipse.org/trace4cps/nightly/update-site/"/>
+            url="https://download.eclipse.org/trace4cps/v0.2/update-site/"/>
         <repository
-            url="https://download.eclipse.org/lsat/nightly/update-site/"/>
+            url="https://download.eclipse.org/lsat/v0.3/update-site/"/>
         <repository
             url="https://download.eclipse.org/justj/jres/11/updates/release/latest"/>
         <repository
             url="https://hallvard.github.io/plantuml/plantuml.lib/1.2023.11"/>
         <repository
             url="https://hallvard.github.io/plantuml/plantuml.eclipse/1.1.30"/>
         <repository
-            url="https://tno.github.io/PPS/update-site/v0.20.0-RC5/"/>
+            url="https://tno.github.io/PPS/update-site/v0.20.0/"/>
       </repositoryList>
     </targlet>
   </setupTask>

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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from MIDS" sequenceNumber="95">
+<target name="Generated from MIDS" sequenceNumber="96">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
@@ -45,11 +45,11 @@
       <repository location="https://download.eclipse.org/releases/2021-12/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="nl.esi.pps.common.emf.codegen.ecore" version="0.20.0.v20231129-123829-RC5"/>
-      <unit id="nl.esi.pps.common.emf.feature.feature.group" version="0.20.0.v20231129-123829-RC5"/>
-      <unit id="nl.esi.pps.common.ui.feature.feature.group" version="0.20.0.v20231129-123829-RC5"/>
-      <unit id="nl.esi.pps.tmsc.ui.feature.feature.group" version="0.20.0.v20231129-123829-RC5"/>
-      <repository location="https://tno.github.io/PPS/update-site/v0.20.0-RC5/"/>
+      <unit id="nl.esi.pps.common.emf.codegen.ecore" version="0.20.0.v20240222-171036"/>
+      <unit id="nl.esi.pps.common.emf.feature.feature.group" version="0.20.0.v20240222-171036"/>
+      <unit id="nl.esi.pps.common.ui.feature.feature.group" version="0.20.0.v20240222-171036"/>
+      <unit id="nl.esi.pps.tmsc.ui.feature.feature.group" version="0.20.0.v20240222-171036"/>
+      <repository location="https://tno.github.io/PPS/update-site/v0.20.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="com.google.inject" version="5.0.1.v20210324-2015"/>

diff --git 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