From 1b9d0a09dce610124ac6fa938de1c9d9d30d71a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= <sergej@koscejev.cz>
Date: Mon, 16 Sep 2024 09:08:30 +0200
Subject: [PATCH 1/3] build_mbeddr: add dependency on copy_allScripts

The dependency was transitive via the spawner before but has to be
added directly now.
---
 build/com.mbeddr/languages/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/com.mbeddr/languages/build.gradle b/build/com.mbeddr/languages/build.gradle
index d747c901f0c..21fd03e3abd 100755
--- a/build/com.mbeddr/languages/build.gradle
+++ b/build/com.mbeddr/languages/build.gradle
@@ -50,18 +50,18 @@ ant.taskdef(name: 'junit', classname: 'org.apache.tools.ant.taskdefs.optional.ju
 ant.taskdef(name: 'junitreport', classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
         classpath: configurations.junitAnt.asPath)
 
-def mbeddrDependencies
+def mbeddrPlatformDependency
 
 def usePrebuiltPlatform = ciBuild && !project.hasProperty('forceBuildPlatform')
 
 //on teamcity we don't build the platform we take it from the nexus. Locally we want to build it
 if (usePrebuiltPlatform) {
-    mbeddrDependencies = [resolve_mbeddr_platform]
+    mbeddrPlatformDependency = resolve_mbeddr_platform
 } else {
-    mbeddrDependencies = [':com.mbeddr:platform:build_platform']
+    mbeddrPlatformDependency = ':com.mbeddr:platform:build_platform'
 }
 
-task build_mbeddr(type: BuildLanguages, dependsOn: mbeddrDependencies) {
+task build_mbeddr(type: BuildLanguages, dependsOn: [':com.mbeddr:platform:copy_allScripts', mbeddrPlatformDependency]) {
     script script_build_mbeddr
     outputs.dir("$artifactsDir/mbeddr")
 }

From 41fe3342b0fd14325992d6331751b6f36ce1e038 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Wed, 18 Sep 2024 12:41:38 +0200
Subject: [PATCH 2/3] Revert "Update
 code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps"

This reverts commit f59fdadc26a764d0f0644a80159ca5c70783fa9a.
---
 .../languages/com.mbeddr.doc/languageModels/plugin.mps          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
index 42bba43f1da..cf0b0087da5 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
@@ -2317,7 +2317,7 @@
                 <node concept="17QB3L" id="5Ulr5FUQKky" role="1tU5fm" />
                 <node concept="3cpWs3" id="5Ulr5FUQLHz" role="33vP2m">
                   <node concept="Xl_RD" id="5Ulr5FUQLH$" role="3uHU7B">
-                    <property role="Xl_RC" value="Screenshots might not be taken correctly in MpsEnvironment (Ant &lt;generate&gt; task). " />
+                    <property role="Xl_RC" value="Screenshots might not be taken in MpsEnvironment (Ant &lt;generate&gt; task). " />
                   </node>
                   <node concept="Xl_RD" id="5Ulr5FUQLH_" role="3uHU7w">
                     <property role="Xl_RC" value="Use mps-gradle-plugin, mps-build-backends, MPS tests, or other means to run the MPS make process in an IDEA environment." />

From 6c242d1b1b8f8b632a369e23d2b3ee15f283344d Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Wed, 18 Sep 2024 12:41:39 +0200
Subject: [PATCH 3/3] Revert "mbeddr.doc: don't stop screenshot generation in
 MpsEnvironment"

This reverts commit a5f370b463c0706f4aed5452e84f453bfa647d4c.
---
 .../languages/com.mbeddr.doc/languageModels/plugin.mps      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
index cf0b0087da5..a3db43199d1 100644
--- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
@@ -276,6 +276,7 @@
         <child id="8276990574909234106" name="finallyBody" index="1wplMD" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -2317,7 +2318,7 @@
                 <node concept="17QB3L" id="5Ulr5FUQKky" role="1tU5fm" />
                 <node concept="3cpWs3" id="5Ulr5FUQLHz" role="33vP2m">
                   <node concept="Xl_RD" id="5Ulr5FUQLH$" role="3uHU7B">
-                    <property role="Xl_RC" value="Screenshots might not be taken in MpsEnvironment (Ant &lt;generate&gt; task). " />
+                    <property role="Xl_RC" value="Screenshots cannot be taken in MpsEnvironment (Ant &lt;generate&gt; task). " />
                   </node>
                   <node concept="Xl_RD" id="5Ulr5FUQLH_" role="3uHU7w">
                     <property role="Xl_RC" value="Use mps-gradle-plugin, mps-build-backends, MPS tests, or other means to run the MPS make process in an IDEA environment." />
@@ -2851,6 +2852,7 @@
                                       <ref role="3cqZAo" node="5Ulr5FUQ$ao" resolve="reportMpsEnvironment" />
                                     </node>
                                   </node>
+                                  <node concept="3zACq4" id="5Ulr5FUQ9rW" role="3cqZAp" />
                                 </node>
                                 <node concept="37vLTw" id="5Ulr5FUPY0h" role="3clFbw">
                                   <ref role="3cqZAo" node="5Ulr5FUPOud" resolve="isMpsEnvironment" />
@@ -3191,11 +3193,13 @@
                                       <ref role="3cqZAo" node="5Ulr5FUQ$ao" resolve="reportMpsEnvironment" />
                                     </node>
                                   </node>
+                                  <node concept="3zACq4" id="5Ulr5FUQHa8" role="3cqZAp" />
                                 </node>
                                 <node concept="37vLTw" id="5Ulr5FUQHa9" role="3clFbw">
                                   <ref role="3cqZAo" node="5Ulr5FUPOud" resolve="isMpsEnvironment" />
                                 </node>
                               </node>
+                              <node concept="3clFbH" id="5Ulr5FUQgvP" role="3cqZAp" />
                               <node concept="3cpWs8" id="223OxQl_y91" role="3cqZAp">
                                 <node concept="3cpWsn" id="223OxQl_y92" role="3cpWs9">
                                   <property role="TrG5h" value="node" />