Merge pull request #2511 from mbeddr/merge/mps20223

Merge maintenance/mps20223 into master

CHANGELOG.md

@@ -7,6 +7,8 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
 
 # September 2024
 
+* Breaking change: debugger and spawner were not maintained and were removed.
+
 ## com.mbeddr.mpsutil.checkinHandler
 
 - A new kind of Checkin handlers (background handler) now support the interface `CommitCheck` which allows more options like running the code after the commit or in the background.

build-allScripts.xml

@@ -129,47 +129,6 @@
     </jar>
     <mkdir dir="${build.layout}/mbeddr.allScripts/languages" />
     <mkdir dir="${build.layout}/mbeddr.allScripts/languages/com.mbeddr.tests" />
-    <mkdir dir="${build.tmp}/default/com.mbeddr.debugger.testing.build.dev.build.jar" />
-    <mkdir dir="${build.tmp}/default/com.mbeddr.debugger.testing.build.dev.build.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/com.mbeddr.debugger.testing.build.dev.build.jar/META-INF/module.xml">
-      <module namespace="com.mbeddr.debugger.testing.build.dev.build" type="solution" uuid="0ecd68a7-ad67-4d1c-adb3-67b1e6f82ffa">
-        <dependencies>
-          <module ref="7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)" kind="cl" />
-          <module ref="2098f9e9-7b8d-4ee4-8e3f-46840f7fc3dd(com.mbeddr.debugger.tests.dev.build)" kind="cl" />
-          <module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
-          <module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
-          <module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
-        </dependencies>
-        <uses>
-          <language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
-          <language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
-          <language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
-        </uses>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="com.mbeddr.debugger.testing.build.dev.build-src.jar" descriptor="com.mbeddr.debugger-test.build.dev.build.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mbeddr.allScripts/languages/com.mbeddr.tests/com.mbeddr.debugger.testing.build.dev.build.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/com.mbeddr.debugger.testing.build.dev.build" />
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build" includes="icons/**, resources/**" />
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/com.mbeddr.debugger.testing.build.dev.build.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.debugger-test.build.dev.build-models">
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mbeddr.allScripts/languages/com.mbeddr.tests/com.mbeddr.debugger.testing.build.dev.build-src.jar" duplicate="preserve">
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build/com.mbeddr.debugger-test.build.dev.build.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.debugger-test.build.dev.build-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/com.mbeddr.core.tests.build.jar" />
     <mkdir dir="${build.tmp}/default/com.mbeddr.core.tests.build.jar/META-INF" />
     <echoxml file="${build.tmp}/default/com.mbeddr.core.tests.build.jar/META-INF/module.xml">
@@ -250,46 +209,6 @@
       <zipfileset file="${basedir}/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.core.tests.performance.build-models" prefix="module/models" />
     </jar>
-    <mkdir dir="${build.tmp}/default/com.mbeddr.debugger.tests.dev.build.jar" />
-    <mkdir dir="${build.tmp}/default/com.mbeddr.debugger.tests.dev.build.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/com.mbeddr.debugger.tests.dev.build.jar/META-INF/module.xml">
-      <module namespace="com.mbeddr.debugger.tests.dev.build" type="solution" uuid="2098f9e9-7b8d-4ee4-8e3f-46840f7fc3dd">
-        <dependencies>
-          <module ref="7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build)" kind="cl" />
-          <module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
-          <module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
-          <module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
-        </dependencies>
-        <uses>
-          <language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
-          <language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
-          <language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
-        </uses>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="com.mbeddr.debugger.tests.dev.build-src.jar" descriptor="com.mbeddr.debugger.tests.dev.build.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/mbeddr.allScripts/languages/com.mbeddr.tests/com.mbeddr.debugger.tests.dev.build.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/com.mbeddr.debugger.tests.dev.build" />
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build" includes="icons/**, resources/**" />
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/com.mbeddr.debugger.tests.dev.build.jar" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.debugger.tests.dev.build-models">
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/mbeddr.allScripts/languages/com.mbeddr.tests/com.mbeddr.debugger.tests.dev.build-src.jar" duplicate="preserve">
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build/com.mbeddr.debugger.tests.dev.build.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-com.mbeddr.debugger.tests.dev.build-models" prefix="module/models" />
-    </jar>
     <mkdir dir="${build.tmp}/default/com.mbeddr.cc.tests.dev.build.jar" />
     <mkdir dir="${build.tmp}/default/com.mbeddr.cc.tests.dev.build.jar/META-INF" />
     <echoxml file="${build.tmp}/default/com.mbeddr.cc.tests.dev.build.jar/META-INF/module.xml">
@@ -592,7 +511,7 @@
     <delete dir="${build.layout}" />
   </target>
 
-  <target name="compileJava" depends="java.compile.com.mbeddr.allScripts, java.compile.com.mbeddr.debugger.testing.build.dev.build, java.compile.com.mbeddr.core.tests.build, java.compile.com.mbeddr.core.tests.performance.build, java.compile.com.mbeddr.debugger.tests.dev.build, java.compile.com.mbeddr.cc.tests.dev.build, java.compile.com.mbeddr.ext.tests.build, java.compile.com.mbeddr.platform, java.compile.com.mbeddr.platform.tests.build, java.compile.com.mbeddr.build, java.compile.com.mbeddr.xmodel.build" />
+  <target name="compileJava" depends="java.compile.com.mbeddr.allScripts, java.compile.com.mbeddr.core.tests.build, java.compile.com.mbeddr.core.tests.performance.build, java.compile.com.mbeddr.cc.tests.dev.build, java.compile.com.mbeddr.ext.tests.build, java.compile.com.mbeddr.platform, java.compile.com.mbeddr.platform.tests.build, java.compile.com.mbeddr.build, java.compile.com.mbeddr.xmodel.build" />
 
   <target name="processResources" />
 
@@ -716,8 +635,6 @@
         <module file="${basedir}/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd" />
         <module file="${basedir}/solutions/com.mbeddr.core.tests.build/com.mbeddr.core.tests.build.msd" />
         <module file="${basedir}/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd" />
-        <module file="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build/com.mbeddr.debugger-test.build.dev.build.msd" />
-        <module file="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build/com.mbeddr.debugger.tests.dev.build.msd" />
         <module file="${basedir}/solutions/com.mbeddr.ext.build/build.msd" />
         <module file="${basedir}/solutions/com.mbeddr.platform/com.mbeddr.platform.msd" />
         <module file="${basedir}/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd" />
@@ -773,28 +690,6 @@
     </copy>
   </target>
 
-  <target name="java.compile.com.mbeddr.debugger.testing.build.dev.build" depends="java.compile.com.mbeddr.build, java.compile.com.mbeddr.debugger.tests.dev.build, java.compile.com.mbeddr.platform">
-    <mkdir dir="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/com.mbeddr.debugger.testing.build.dev.build" />
-    <javac destdir="${build.tmp}/java/out/com.mbeddr.debugger.testing.build.dev.build" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build/source_gen" />
-      </src>
-      <classpath>
-        <pathelement path="${build.tmp}/java/out/com.mbeddr.build" />
-        <pathelement path="${build.tmp}/java/out/com.mbeddr.debugger.tests.dev.build" />
-        <pathelement path="${build.tmp}/java/out/com.mbeddr.platform" />
-        <fileset file="${artifacts.de.itemis.mps.extensions}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
-      </classpath>
-    </javac>
-    <copy todir="${build.tmp}/java/out/com.mbeddr.debugger.testing.build.dev.build">
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build/source_gen">
-        <include name="**/*.info" />
-      </fileset>
-    </copy>
-  </target>
-
   <target name="java.compile.com.mbeddr.core.tests.build" depends="java.compile.com.mbeddr.build, java.compile.com.mbeddr.platform">
     <mkdir dir="${basedir}/solutions/com.mbeddr.core.tests.build/source_gen" />
     <mkdir dir="${build.tmp}/java/out/com.mbeddr.core.tests.build" />
@@ -837,27 +732,6 @@
     </copy>
   </target>
 
-  <target name="java.compile.com.mbeddr.debugger.tests.dev.build" depends="java.compile.com.mbeddr.build, java.compile.com.mbeddr.platform">
-    <mkdir dir="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/com.mbeddr.debugger.tests.dev.build" />
-    <javac destdir="${build.tmp}/java/out/com.mbeddr.debugger.tests.dev.build" fork="false" encoding="utf8" includeantruntime="false" debug="true" source="1.8" target="1.8">
-      <compilerarg value="-Xlint:none" />
-      <src>
-        <path location="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build/source_gen" />
-      </src>
-      <classpath>
-        <pathelement path="${build.tmp}/java/out/com.mbeddr.build" />
-        <pathelement path="${build.tmp}/java/out/com.mbeddr.platform" />
-        <fileset file="${artifacts.de.itemis.mps.extensions}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
-      </classpath>
-    </javac>
-    <copy todir="${build.tmp}/java/out/com.mbeddr.debugger.tests.dev.build">
-      <fileset dir="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build/source_gen">
-        <include name="**/*.info" />
-      </fileset>
-    </copy>
-  </target>
-
   <target name="java.compile.com.mbeddr.cc.tests.dev.build" depends="java.compile.com.mbeddr.build, java.compile.com.mbeddr.platform">
     <mkdir dir="${basedir}/solutions/com.mbeddr.cc.tests.dev.build/source_gen" />
     <mkdir dir="${build.tmp}/java/out/com.mbeddr.cc.tests.dev.build" />
@@ -986,8 +860,6 @@
     <delete dir="${basedir}/solutions/com.mbeddr.cc.tests.dev.build/source_gen" />
     <delete dir="${basedir}/solutions/com.mbeddr.core.tests.build/source_gen" />
     <delete dir="${basedir}/solutions/com.mbeddr.core.tests.performance.build/source_gen" />
-    <delete dir="${basedir}/solutions/com.mbeddr.debugger-test.build.dev.build/source_gen" />
-    <delete dir="${basedir}/solutions/com.mbeddr.debugger.tests.dev.build/source_gen" />
     <delete dir="${basedir}/solutions/com.mbeddr.ext.build/source_gen" />
     <delete dir="${basedir}/solutions/com.mbeddr.platform/source_gen" />
     <delete dir="${basedir}/solutions/com.mbeddr.platform.tests.build/source_gen" />

build.gradle

@@ -115,8 +115,7 @@ subprojects {
         if(mbeddrBuild == "stable" || mbeddrBuild.matches(/(maintenance|mps)[\/-](mps)?\d+(\.\d+)*/)) {
             ext.mbeddrBuild = "master"
         }
-
-        // locally versions are SNAPSHOT
+        // locally versions and all branches other than master/maintenance*/mps* are SNAPSHOTs
         if (ciBuild) {
             // setting mbeddrMajor
             if (project.hasProperty('mbeddrMajor')) {
@@ -134,7 +133,13 @@ subprojects {
                 ext.mbeddrBuildCounter = GitBasedVersioning.getGitCommitCount()
             }
 
-            ext.mbeddrBuildNumber = GitBasedVersioning.getVersion(mbeddrBuild, mbeddrMajor, mbeddrMinor, mbeddrBuildCounter as int)
+            if(mbeddrBuild == "master" || mbeddrBuild.matches(/(maintenance|mps)[\/-](mps)?\d+(\.\d+)*/)) {
+                ext.mbeddrBuildNumber = GitBasedVersioning.getVersion(mbeddrBuild, mbeddrMajor, mbeddrMinor, mbeddrBuildCounter as int)
+            } else {
+                // use same logic as in all other platforms for snapshot publications
+                ext.mbeddrBuildNumber = GitBasedVersioning.getVersion(mbeddrBuild, mbeddrMajor, mbeddrMinor, mbeddrBuildCounter as int) + "-SNAPSHOT"
+            }
+
         } else {
             ext.mbeddrBuildNumber = "${ext.mbeddrMajor}.${ext.mbeddrMinor}-SNAPSHOT"
             // TODO: not clear why this has been added - makes local builds from any branch to behave like a master build

code/applications/HeartBleed/_spreferences/PlatformTemplates/module.msd

@@ -13,7 +13,6 @@
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
-    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
     <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="9" />
     <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="5" />

code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/module.msd

@@ -12,7 +12,6 @@
   </facets>
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
-    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />

code/applications/HeartBleed/solutions/NewSolution.msd

@@ -19,8 +19,6 @@
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
     <language slang="l:b2da2e1a-b542-47f5-9be0-4dc21efe74a4:com.mbeddr.core.checks" version="0" />
     <language slang="l:390de4af-0c8d-4716-8dec-3d05ca751b28:com.mbeddr.core.cinterpreter" version="0" />
-    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
-    <language slang="l:ebb5e132-d298-4649-b320-b3f4d7f3acff:com.mbeddr.core.debug.blext" version="0" />
     <language slang="l:783af01f-87a7-412c-be99-293a162652b5:com.mbeddr.core.embedded" version="1" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
     <language slang="l:ad5e9db1-9600-47c7-86ef-614165b281b8:com.mbeddr.core.legacy" version="0" />

code/applications/IntegratedCExample/_spreferences/PlatformTemplates/module.msd

@@ -13,7 +13,6 @@
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:2d7fadf5-33f6-4e80-a78f-0f739add2bde:com.mbeddr.core.buildconfig" version="10" />
-    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
     <language slang="l:f93d1dbe-bfd1-42dd-932a-f375fa6f5373:com.mbeddr.core.make" version="9" />
     <language slang="l:6d11763d-483d-4b2b-8efc-09336c1b0001:com.mbeddr.core.modules" version="5" />

code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/module.msd

@@ -12,7 +12,6 @@
   </facets>
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
-    <language slang="l:223dd778-c44f-4ef3-9535-7aa7d12244a6:com.mbeddr.core.debug" version="0" />
     <language slang="l:61c69711-ed61-4850-81d9-7714ff227fb0:com.mbeddr.core.expressions" version="5" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />