From c949bdd072b080025c2400550bb0e7b4beb2e916 Mon Sep 17 00:00:00 2001
From: Stephan Eberle <stephaneberle9@gmail.com>
Date: Fri, 8 Apr 2022 21:30:25 +0200
Subject: [PATCH 1/7] core: improved runtime error handling of buid
 configuration post processors

(cherry picked from commit bdd432057da4a8e2acf01a49d85ada6349687d52)
---
 .../languageModels/behavior.mps               | 56 +++++++++----------
 .../languageModels/plugin.mps                 | 22 +++-----
 2 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
index fc92aea6959..24b37f28a69 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
@@ -8010,45 +8010,39 @@
               </node>
             </node>
             <node concept="3clFbS" id="2obGnlS343q" role="1zc67A">
-              <node concept="3clFbF" id="2obGnlS343r" role="3cqZAp">
-                <node concept="2OqwBi" id="2obGnlS343s" role="3clFbG">
-                  <node concept="37vLTw" id="2obGnlS343t" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2obGnlS343o" resolve="ex" />
-                  </node>
-                  <node concept="liA8E" id="2obGnlS343u" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace()" resolve="printStackTrace" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs6" id="2obGnlS343v" role="3cqZAp">
-                <node concept="3cpWs3" id="2obGnlS343w" role="3cqZAk">
-                  <node concept="2OqwBi" id="2obGnlS343x" role="3uHU7w">
-                    <node concept="37vLTw" id="2obGnlS343y" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2obGnlS343o" resolve="ex" />
-                    </node>
-                    <node concept="liA8E" id="2obGnlS343z" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
-                    </node>
-                  </node>
-                  <node concept="3cpWs3" id="2obGnlS343$" role="3uHU7B">
-                    <node concept="3cpWs3" id="2obGnlS343_" role="3uHU7B">
-                      <node concept="Xl_RD" id="2obGnlS343A" role="3uHU7B">
-                        <property role="Xl_RC" value="cannot start process '" />
-                      </node>
-                      <node concept="37vLTw" id="2obGnlS343B" role="3uHU7w">
-                        <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
+              <node concept="YS8fn" id="3u0yL9n8TED" role="3cqZAp">
+                <node concept="2ShNRf" id="3u0yL9n8VQv" role="YScLw">
+                  <node concept="1pGfFk" id="3u0yL9n9aVE" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                    <node concept="3cpWs3" id="3u0yL9n9bwz" role="37wK5m">
+                      <node concept="2OqwBi" id="3u0yL9n9bw$" role="3uHU7w">
+                        <node concept="37vLTw" id="3u0yL9n9bw_" role="2Oq$k0">
+                          <ref role="3cqZAo" node="2obGnlS343o" resolve="ex" />
+                        </node>
+                        <node concept="liA8E" id="3u0yL9n9bwA" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
+                        </node>
+                      </node>
+                      <node concept="3cpWs3" id="3u0yL9n9bwB" role="3uHU7B">
+                        <node concept="3cpWs3" id="3u0yL9n9bwC" role="3uHU7B">
+                          <node concept="Xl_RD" id="3u0yL9n9bwD" role="3uHU7B">
+                            <property role="Xl_RC" value="cannot start process '" />
+                          </node>
+                          <node concept="37vLTw" id="3u0yL9n9bwE" role="3uHU7w">
+                            <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="3u0yL9n9bwF" role="3uHU7w">
+                          <property role="Xl_RC" value="': " />
+                        </node>
                       </node>
                     </node>
-                    <node concept="Xl_RD" id="2obGnlS343C" role="3uHU7w">
-                      <property role="Xl_RC" value="': " />
-                    </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
           <node concept="3clFbS" id="2obGnlS341Z" role="1zxBo7">
-            <node concept="3clFbH" id="2obGnlS3420" role="3cqZAp" />
             <node concept="3SKdUt" id="2obGnlS3421" role="3cqZAp">
               <node concept="1PaTwC" id="13p6s1wtimC" role="1aUNEU">
                 <node concept="3oM_SD" id="13p6s1wtimD" role="1PaTwD">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
index c4480347270..123f7d0e84d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
@@ -267,6 +267,10 @@
       <concept id="2360002718792622184" name="jetbrains.mps.make.script.structure.OutputResources" flags="nn" index="ElOAg">
         <child id="2360002718792622193" name="resource" index="ElOA9" />
       </concept>
+      <concept id="3668957831723333672" name="jetbrains.mps.make.script.structure.ReportFeedbackStatement" flags="nn" index="1daRAt">
+        <property id="3668957831723333678" name="feedback" index="1daRAr" />
+        <child id="3668957831723336680" name="message" index="1daK9t" />
+      </concept>
       <concept id="187226666892683650" name="jetbrains.mps.make.script.structure.BeginWorkStatement" flags="ng" index="1u1O0F">
         <property id="682890046602602769" name="workName" index="h7ZnK" />
         <child id="187226666892740071" name="ofTotal" index="1u1ALe" />
@@ -289,11 +293,6 @@
         <property id="6332851714983843871" name="severity" index="2xdLsb" />
         <child id="5721587534047265374" name="message" index="9lYJi" />
       </concept>
-      <concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
-        <property id="2034914114981261751" name="severity" index="RRSoG" />
-        <child id="2034914114981261755" name="throwable" index="RRSow" />
-        <child id="2034914114981261753" name="message" index="RRSoy" />
-      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -673,19 +672,16 @@
                                             </node>
                                           </node>
                                           <node concept="3clFbS" id="hZOnLD2vwV" role="1zc67A">
-                                            <node concept="RRSsy" id="2MF0N8t5ArR" role="3cqZAp">
-                                              <property role="RRSoG" value="gZ5fh_4/error" />
-                                              <node concept="2OqwBi" id="2MF0N8t5ArS" role="RRSoy">
-                                                <node concept="37vLTw" id="2MF0N8t5ArT" role="2Oq$k0">
+                                            <node concept="1daRAt" id="3$LBSIbf222" role="3cqZAp">
+                                              <property role="1daRAr" value="3bEKrlZKrwH/ERROR" />
+                                              <node concept="2OqwBi" id="3$LBSIbf2jn" role="1daK9t">
+                                                <node concept="37vLTw" id="3$LBSIbf2jo" role="2Oq$k0">
                                                   <ref role="3cqZAo" node="hZOnLD2vwT" resolve="ex" />
                                                 </node>
-                                                <node concept="liA8E" id="2MF0N8t5ArU" role="2OqNvi">
+                                                <node concept="liA8E" id="3$LBSIbf2jp" role="2OqNvi">
                                                   <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                                 </node>
                                               </node>
-                                              <node concept="37vLTw" id="2MF0N8t5ArV" role="RRSow">
-                                                <ref role="3cqZAo" node="hZOnLD2vwT" resolve="ex" />
-                                              </node>
                                             </node>
                                             <node concept="3clFbF" id="7UinkOsYB6x" role="3cqZAp">
                                               <node concept="37vLTI" id="7UinkOsYBSz" role="3clFbG">

From efb6a8c69f89c67b75fc525da427768aa7ee8e56 Mon Sep 17 00:00:00 2001
From: Stephan Eberle <stephaneberle9@gmail.com>
Date: Tue, 19 Apr 2022 14:07:22 +0200
Subject: [PATCH 2/7] core: improved logging of buid configuration post
 processors

---
 .../languageModels/behavior.mps               | 35 +++++-----
 .../languageModels/plugin.mps                 | 67 ++++++++-----------
 2 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
index 24b37f28a69..d7f6b4f57eb 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
@@ -8026,7 +8026,7 @@
                       <node concept="3cpWs3" id="3u0yL9n9bwB" role="3uHU7B">
                         <node concept="3cpWs3" id="3u0yL9n9bwC" role="3uHU7B">
                           <node concept="Xl_RD" id="3u0yL9n9bwD" role="3uHU7B">
-                            <property role="Xl_RC" value="cannot start process '" />
+                            <property role="Xl_RC" value="Failed to run '" />
                           </node>
                           <node concept="37vLTw" id="3u0yL9n9bwE" role="3uHU7w">
                             <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
@@ -8270,21 +8270,26 @@
                   </node>
                 </node>
                 <node concept="3cpWs6" id="2obGnlS3433" role="3cqZAp">
-                  <node concept="3cpWs3" id="2obGnlS3434" role="3cqZAk">
-                    <node concept="37vLTw" id="2obGnlS3435" role="3uHU7w">
-                      <ref role="3cqZAo" node="2obGnlS342Y" resolve="resultCode" />
-                    </node>
-                    <node concept="3cpWs3" id="2obGnlS3436" role="3uHU7B">
-                      <node concept="3cpWs3" id="2obGnlS3437" role="3uHU7B">
-                        <node concept="Xl_RD" id="2obGnlS3438" role="3uHU7B">
-                          <property role="Xl_RC" value="process '" />
+                  <node concept="3cpWs3" id="5VUggFEWHTA" role="3cqZAk">
+                    <node concept="Xl_RD" id="5VUggFEWHTD" role="3uHU7w">
+                      <property role="Xl_RC" value=")" />
+                    </node>
+                    <node concept="3cpWs3" id="2obGnlS3434" role="3uHU7B">
+                      <node concept="3cpWs3" id="2obGnlS3436" role="3uHU7B">
+                        <node concept="3cpWs3" id="2obGnlS3437" role="3uHU7B">
+                          <node concept="Xl_RD" id="2obGnlS3438" role="3uHU7B">
+                            <property role="Xl_RC" value="'" />
+                          </node>
+                          <node concept="37vLTw" id="2obGnlS3439" role="3uHU7w">
+                            <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
+                          </node>
                         </node>
-                        <node concept="37vLTw" id="2obGnlS3439" role="3uHU7w">
-                          <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
+                        <node concept="Xl_RD" id="2obGnlS343a" role="3uHU7w">
+                          <property role="Xl_RC" value="' successfully completed (exit code: " />
                         </node>
                       </node>
-                      <node concept="Xl_RD" id="2obGnlS343a" role="3uHU7w">
-                        <property role="Xl_RC" value="' finished with exit code " />
+                      <node concept="37vLTw" id="2obGnlS3435" role="3uHU7w">
+                        <ref role="3cqZAo" node="2obGnlS342Y" resolve="resultCode" />
                       </node>
                     </node>
                   </node>
@@ -8302,14 +8307,14 @@
                     <node concept="3cpWs3" id="2obGnlS343h" role="3cqZAk">
                       <node concept="3cpWs3" id="2obGnlS343i" role="3uHU7B">
                         <node concept="Xl_RD" id="2obGnlS343j" role="3uHU7B">
-                          <property role="Xl_RC" value="process '" />
+                          <property role="Xl_RC" value="'" />
                         </node>
                         <node concept="37vLTw" id="2obGnlS343k" role="3uHU7w">
                           <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
                         </node>
                       </node>
                       <node concept="Xl_RD" id="2obGnlS343l" role="3uHU7w">
-                        <property role="Xl_RC" value="' was started in a non-blocking way" />
+                        <property role="Xl_RC" value="' has been started in a non-blocking way" />
                       </node>
                     </node>
                   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
index 123f7d0e84d..f9814078f4d 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
@@ -29,6 +29,7 @@
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
     <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" implicit="true" />
     <import index="hfuk" ref="r:b25dd364-bc3f-4a66-97d1-262009610c5e(jetbrains.mps.make)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -82,9 +83,6 @@
       <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
         <child id="1182160096073" name="cls" index="YeSDq" />
       </concept>
-      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
-        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
-      </concept>
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <property id="1075300953594" name="abstractClass" index="1sVAO0" />
@@ -288,12 +286,6 @@
         <property id="7077360340906447918" name="result" index="3D7k6l" />
       </concept>
     </language>
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
-        <property id="6332851714983843871" name="severity" index="2xdLsb" />
-        <child id="5721587534047265374" name="message" index="9lYJi" />
-      </concept>
-    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -307,6 +299,9 @@
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
       <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
         <child id="6750920497477046361" name="conceptArgument" index="3MHsoP" />
@@ -719,11 +714,19 @@
                                                     <property role="Xl_RC" value="/" />
                                                   </node>
                                                 </node>
-                                                <node concept="2YIFZM" id="5Hxjapwed3b" role="3uHU7w">
-                                                  <ref role="37wK5l" to="unno:7WvVJ3rORmu" resolve="getModelLongName" />
-                                                  <ref role="1Pybhc" to="unno:1NYD3hytmTa" resolve="SNodeOperations" />
-                                                  <node concept="37vLTw" id="2obGnlRuwqu" role="37wK5m">
-                                                    <ref role="3cqZAo" node="2obGnlRg4rC" resolve="model" />
+                                                <node concept="2OqwBi" id="5VUggFEY548" role="3uHU7w">
+                                                  <node concept="2OqwBi" id="5VUggFEY4sd" role="2Oq$k0">
+                                                    <node concept="liA8E" id="5VUggFEY4L5" role="2OqNvi">
+                                                      <ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
+                                                    </node>
+                                                    <node concept="2JrnkZ" id="5VUggFEY4si" role="2Oq$k0">
+                                                      <node concept="37vLTw" id="5VUggFEY3bq" role="2JrQYb">
+                                                        <ref role="3cqZAo" node="2obGnlRg4rC" resolve="model" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="liA8E" id="5VUggFEY5py" role="2OqNvi">
+                                                    <ref role="37wK5l" to="mhbf:~SModelName.getLongName()" resolve="getLongName" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -852,36 +855,20 @@
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="2xdQw9" id="2Fugwv5PNO$" role="3cqZAp">
-                                                <property role="2xdLsb" value="h1akgim/info" />
-                                                <node concept="3cpWs3" id="2obGnlRRPSF" role="9lYJi">
-                                                  <node concept="37vLTw" id="2obGnlRRQww" role="3uHU7w">
+                                              <node concept="1daRAt" id="5VUggFEWnmi" role="3cqZAp">
+                                                <node concept="3cpWs3" id="5VUggFEWn$L" role="1daK9t">
+                                                  <node concept="37vLTw" id="5VUggFEWn$M" role="3uHU7w">
                                                     <ref role="3cqZAo" node="2obGnlRRAhv" resolve="res" />
                                                   </node>
-                                                  <node concept="3cpWs3" id="2obGnlRS8KN" role="3uHU7B">
-                                                    <node concept="Xl_RD" id="2obGnlRS8KQ" role="3uHU7w">
-                                                      <property role="Xl_RC" value=": " />
+                                                  <node concept="3cpWs3" id="5VUggFEWn$N" role="3uHU7B">
+                                                    <node concept="Xl_RD" id="5VUggFEWn$O" role="3uHU7w">
+                                                      <property role="Xl_RC" value="': " />
                                                     </node>
-                                                    <node concept="3cpWs3" id="2obGnlRS5nw" role="3uHU7B">
-                                                      <node concept="3cpWs3" id="2obGnlRS17U" role="3uHU7B">
-                                                        <node concept="3cpWs3" id="2obGnlRRUvP" role="3uHU7B">
-                                                          <node concept="Xl_RD" id="2obGnlRRE0g" role="3uHU7B">
-                                                            <property role="Xl_RC" value="postprocess " />
-                                                          </node>
-                                                          <node concept="2OqwBi" id="2obGnlRRWrp" role="3uHU7w">
-                                                            <node concept="2GrUjf" id="2obGnlRRVa1" role="2Oq$k0">
-                                                              <ref role="2Gs0qQ" node="2obGnlRzDHJ" resolve="pp" />
-                                                            </node>
-                                                            <node concept="2qgKlT" id="2obGnlRRZ2i" role="2OqNvi">
-                                                              <ref role="37wK5l" to="ahli:2obGnlRzRct" resolve="getDescription" />
-                                                            </node>
-                                                          </node>
-                                                        </node>
-                                                        <node concept="Xl_RD" id="2obGnlRS17X" role="3uHU7w">
-                                                          <property role="Xl_RC" value=" on " />
-                                                        </node>
+                                                    <node concept="3cpWs3" id="5VUggFEWn$P" role="3uHU7B">
+                                                      <node concept="Xl_RD" id="5VUggFEWn$S" role="3uHU7B">
+                                                        <property role="Xl_RC" value="Postprocessed '" />
                                                       </node>
-                                                      <node concept="37vLTw" id="2obGnlRS6ky" role="3uHU7w">
+                                                      <node concept="37vLTw" id="5VUggFEWn$X" role="3uHU7w">
                                                         <ref role="3cqZAo" node="6dqrGHqK54t" resolve="moduleName" />
                                                       </node>
                                                     </node>

From 8c894119501aef0021db5cee57dc07ea9aff943f Mon Sep 17 00:00:00 2001
From: Stephan Eberle <stephaneberle9@gmail.com>
Date: Tue, 19 Apr 2022 14:09:26 +0200
Subject: [PATCH 3/7] core: updated model descriptors

---
 .../com.mbeddr.core.buildconfig/buildconfig.mpl       |  7 +++++++
 .../com.mbeddr.core.buildconfig.documentation.mps     | 11 +++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/com.mbeddr.core.buildconfig.documentation.mps

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl
index 2f4ae1b42b2..3f17fc2496b 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl
@@ -241,12 +241,19 @@
     <dependency reexport="false">2693fc71-9b0e-4b05-ab13-f57227d675f2(com.mbeddr.core.util)</dependency>
   </dependencies>
   <languageVersions>
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
+    <language slang="l:2374bc90-7e37-41f1-a9c4-c2e35194c36a:com.mbeddr.doc" version="3" />
+    <language slang="l:38a074ed-e5ad-4b2d-be31-ca436911b8aa:com.mbeddr.doc.aspect" version="0" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
+    <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="1" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
     <language slang="l:b92f861d-0184-446d-b88b-6dcf0e070241:com.mbeddr.mpsutil.intentions" version="0" />
+    <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
+    <language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
     <language slang="l:c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1:com.mbeddr.mpsutil.spreferences" version="0" />
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
+    <language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
     <language slang="l:52733268-be24-4f5f-ab84-a73b7c0c03b0:de.slisson.mps.richtext.customcell" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/com.mbeddr.core.buildconfig.documentation.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/com.mbeddr.core.buildconfig.documentation.mps
new file mode 100644
index 00000000000..758122bae03
--- /dev/null
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/com.mbeddr.core.buildconfig.documentation.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:5fc0a55f-347e-4513-8f08-3f67993fcbda(com.mbeddr.core.buildconfig.documentation)">
+  <persistence version="9" />
+  <languages>
+    <use id="38a074ed-e5ad-4b2d-be31-ca436911b8aa" name="com.mbeddr.doc.aspect" version="0" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+

From 10853dc0e7acdc5e74d0e6f2f2571c2ee5cb3f74 Mon Sep 17 00:00:00 2001
From: Stephan Eberle <stephaneberle9@gmail.com>
Date: Tue, 19 Apr 2022 17:54:16 +0200
Subject: [PATCH 4/7] core: enabled RunPostProcessors to capture command output
 and report it to MPS message view; improved reporting made by RunMake

---
 .../languageModels/behavior.mps               | 383 ++++++++++--------
 .../languageModels/plugin.mps                 | 103 +++--
 .../languageModels/plugin.mps                 | 288 +++----------
 3 files changed, 349 insertions(+), 425 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
index d7f6b4f57eb..eba6f46f6d6 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
@@ -9,6 +9,7 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
+    <use id="95f8a3e6-f994-4ca0-a65e-763c9bae2d3b" name="jetbrains.mps.make.script" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -39,16 +40,21 @@
     <import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="3ju5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.vfs(MPS.Core/)" />
-    <import index="w827" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.vfs.openapi(MPS.Core/)" />
     <import index="7otb" ref="r:12f155ed-0af0-4e37-8eac-70f4cf323371(com.mbeddr.core.buildconfig.plugin)" />
     <import index="8oaq" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.io(org.apache.commons/)" />
     <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
     <import index="eoo2" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.nio.file(JDK/)" />
+    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
+    <import index="sjfu" ref="r:1f4ec22e-71ca-4d2d-9dd6-ed345595375d(com.mbeddr.core.make.plugin)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
     <import index="p15z" ref="63e0e566-5131-447e-90e3-12ea330e1a00/r:ac36bf27-36e9-407d-ba8e-953c68088e41(com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.behavior)" implicit="true" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
+      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
+        <child id="1238852204892" name="componentType" index="1Lm7xW" />
+      </concept>
       <concept id="1238853782547" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleLiteral" flags="nn" index="1Ls8ON">
         <child id="1238853845806" name="component" index="1Lso8e" />
       </concept>
@@ -147,6 +153,10 @@
       <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
         <child id="1070534760952" name="componentType" index="10Q1$1" />
       </concept>
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
       <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
         <property id="8606350594693632173" name="isTransient" index="eg7rD" />
         <property id="1240249534625" name="isVolatile" index="34CwA1" />
@@ -532,6 +542,7 @@
       <concept id="1522217801069396578" name="jetbrains.mps.baseLanguage.collections.structure.FoldLeftOperation" flags="nn" index="1MD8d$">
         <child id="1522217801069421796" name="seed" index="1MDeny" />
       </concept>
+      <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
       <concept id="1178894719932" name="jetbrains.mps.baseLanguage.collections.structure.DistinctOperation" flags="nn" index="1VAtEI" />
     </language>
   </registry>
@@ -7494,7 +7505,6 @@
       <property role="13i0it" value="true" />
       <property role="TrG5h" value="execute" />
       <node concept="3Tm1VV" id="2obGnlQSrPE" role="1B3o_S" />
-      <node concept="17QB3L" id="2obGnlRKtdl" role="3clF45" />
       <node concept="3clFbS" id="2obGnlQSrPG" role="3clF47" />
       <node concept="37vLTG" id="2obGnlRoMYA" role="3clF46">
         <property role="TrG5h" value="moduleName" />
@@ -7504,6 +7514,14 @@
         <property role="TrG5h" value="path" />
         <node concept="17QB3L" id="2obGnlRoMZw" role="1tU5fm" />
       </node>
+      <node concept="1LlUBW" id="5VUggFFcdxe" role="3clF45">
+        <node concept="_YKpA" id="5VUggFFcdx_" role="1Lm7xW">
+          <node concept="3uibUv" id="5VUggFFcdxN" role="_ZDj9">
+            <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+          </node>
+        </node>
+        <node concept="17QB3L" id="5VUggFFcdye" role="1Lm7xW" />
+      </node>
     </node>
     <node concept="13hLZK" id="2obGnlQSrss" role="13h7CW">
       <node concept="3clFbS" id="2obGnlQSrst" role="2VODD2" />
@@ -8043,43 +8061,9 @@
             </node>
           </node>
           <node concept="3clFbS" id="2obGnlS341Z" role="1zxBo7">
-            <node concept="3SKdUt" id="2obGnlS3421" role="3cqZAp">
-              <node concept="1PaTwC" id="13p6s1wtimC" role="1aUNEU">
-                <node concept="3oM_SD" id="13p6s1wtimD" role="1PaTwD">
-                  <property role="3oM_SC" value="use" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimE" role="1PaTwD">
-                  <property role="3oM_SC" value="ProcessBuilder" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimF" role="1PaTwD">
-                  <property role="3oM_SC" value="to" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimG" role="1PaTwD">
-                  <property role="3oM_SC" value="automatically" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimH" role="1PaTwD">
-                  <property role="3oM_SC" value="get" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimI" role="1PaTwD">
-                  <property role="3oM_SC" value="make.exe" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimJ" role="1PaTwD">
-                  <property role="3oM_SC" value="via" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimK" role="1PaTwD">
-                  <property role="3oM_SC" value="PATH" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimL" role="1PaTwD">
-                  <property role="3oM_SC" value="and" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimM" role="1PaTwD">
-                  <property role="3oM_SC" value="environment" />
-                </node>
-              </node>
-            </node>
             <node concept="3cpWs8" id="2obGnlS3423" role="3cqZAp">
               <node concept="3cpWsn" id="2obGnlS3424" role="3cpWs9">
-                <property role="TrG5h" value="pb" />
+                <property role="TrG5h" value="processBuilder" />
                 <node concept="3uibUv" id="2obGnlS3425" role="1tU5fm">
                   <ref role="3uigEE" to="wyt6:~ProcessBuilder" resolve="ProcessBuilder" />
                 </node>
@@ -8099,7 +8083,7 @@
             <node concept="3clFbF" id="2obGnlS342b" role="3cqZAp">
               <node concept="2OqwBi" id="2obGnlS342c" role="3clFbG">
                 <node concept="37vLTw" id="2obGnlS342d" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2obGnlS3424" resolve="pb" />
+                  <ref role="3cqZAo" node="2obGnlS3424" resolve="processBuilder" />
                 </node>
                 <node concept="liA8E" id="2obGnlS342e" role="2OqNvi">
                   <ref role="37wK5l" to="wyt6:~ProcessBuilder.directory(java.io.File)" resolve="directory" />
@@ -8117,7 +8101,7 @@
             <node concept="3clFbF" id="2obGnlS342i" role="3cqZAp">
               <node concept="2OqwBi" id="2obGnlS342j" role="3clFbG">
                 <node concept="37vLTw" id="2obGnlS342k" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2obGnlS3424" resolve="pb" />
+                  <ref role="3cqZAo" node="2obGnlS3424" resolve="processBuilder" />
                 </node>
                 <node concept="liA8E" id="2obGnlS342l" role="2OqNvi">
                   <ref role="37wK5l" to="wyt6:~ProcessBuilder.redirectErrorStream(boolean)" resolve="redirectErrorStream" />
@@ -8135,7 +8119,7 @@
                 </node>
                 <node concept="2OqwBi" id="2obGnlS342q" role="33vP2m">
                   <node concept="37vLTw" id="2obGnlS342r" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2obGnlS3424" resolve="pb" />
+                    <ref role="3cqZAo" node="2obGnlS3424" resolve="processBuilder" />
                   </node>
                   <node concept="liA8E" id="2obGnlS342s" role="2OqNvi">
                     <ref role="37wK5l" to="wyt6:~ProcessBuilder.start()" resolve="start" />
@@ -8144,120 +8128,141 @@
               </node>
             </node>
             <node concept="3clFbH" id="2obGnlS342t" role="3cqZAp" />
-            <node concept="3SKdUt" id="2obGnlS342u" role="3cqZAp">
-              <node concept="1PaTwC" id="13p6s1wtimN" role="1aUNEU">
-                <node concept="3oM_SD" id="13p6s1wtimO" role="1PaTwD">
-                  <property role="3oM_SC" value="workaround" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimP" role="1PaTwD">
-                  <property role="3oM_SC" value="for" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimQ" role="1PaTwD">
-                  <property role="3oM_SC" value="redirecting" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimR" role="1PaTwD">
-                  <property role="3oM_SC" value="stdin" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimS" role="1PaTwD">
-                  <property role="3oM_SC" value="and" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimT" role="1PaTwD">
-                  <property role="3oM_SC" value="stderr." />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimU" role="1PaTwD">
-                  <property role="3oM_SC" value="If" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimV" role="1PaTwD">
-                  <property role="3oM_SC" value="not," />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimW" role="1PaTwD">
-                  <property role="3oM_SC" value="make.exe" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimX" role="1PaTwD">
-                  <property role="3oM_SC" value="blocks" />
-                </node>
-                <node concept="3oM_SD" id="13p6s1wtimY" role="1PaTwD">
-                  <property role="3oM_SC" value="in" />
+            <node concept="3clFbJ" id="2obGnlS342V" role="3cqZAp">
+              <node concept="3clFbS" id="2obGnlS342W" role="3clFbx">
+                <node concept="3cpWs8" id="3NVVczysmaS" role="3cqZAp">
+                  <node concept="3cpWsn" id="3NVVczysmaT" role="3cpWs9">
+                    <property role="TrG5h" value="executor" />
+                    <node concept="3uibUv" id="3NVVczysL2A" role="1tU5fm">
+                      <ref role="3uigEE" to="5zyv:~ExecutorService" resolve="ExecutorService" />
+                    </node>
+                    <node concept="2YIFZM" id="3NVVczyswTU" role="33vP2m">
+                      <ref role="37wK5l" to="5zyv:~Executors.newFixedThreadPool(int)" resolve="newFixedThreadPool" />
+                      <ref role="1Pybhc" to="5zyv:~Executors" resolve="Executors" />
+                      <node concept="3cmrfG" id="3NVVczyswTZ" role="37wK5m">
+                        <property role="3cmrfH" value="2" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
-                <node concept="3oM_SD" id="13p6s1wtimZ" role="1PaTwD">
-                  <property role="3oM_SC" value="windows" />
+                <node concept="3cpWs8" id="3NVVczxG3d$" role="3cqZAp">
+                  <node concept="3cpWsn" id="3NVVczxG3d_" role="3cpWs9">
+                    <property role="TrG5h" value="standardInputWriter" />
+                    <node concept="3uibUv" id="3NVVczxG3dA" role="1tU5fm">
+                      <ref role="3uigEE" to="sjfu:3NVVczxBKeo" resolve="LogWriter" />
+                    </node>
+                    <node concept="2ShNRf" id="3NVVczxG4$W" role="33vP2m">
+                      <node concept="1pGfFk" id="3NVVczxG4$V" role="2ShVmc">
+                        <ref role="37wK5l" to="sjfu:3NVVczxBKe$" resolve="LogWriter" />
+                        <node concept="2OqwBi" id="3NVVczxG6pL" role="37wK5m">
+                          <node concept="37vLTw" id="3NVVczxG4_V" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2obGnlS342o" resolve="process" />
+                          </node>
+                          <node concept="liA8E" id="3NVVczxG8je" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Process.getInputStream()" resolve="getInputStream" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="5VUggFF10JL" role="37wK5m">
+                          <ref role="3cqZAo" node="2obGnlS343D" resolve="moduleName" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="2obGnlS342w" role="3cqZAp">
-              <node concept="3cpWsn" id="2obGnlS342x" role="3cpWs9">
-                <property role="TrG5h" value="s1" />
-                <node concept="3uibUv" id="2obGnlS342y" role="1tU5fm">
-                  <ref role="3uigEE" node="1ptFCtLqsAj" resolve="StreamGobbler" />
+                <node concept="3cpWs8" id="3NVVczxG9X1" role="3cqZAp">
+                  <node concept="3cpWsn" id="3NVVczxG9X2" role="3cpWs9">
+                    <property role="TrG5h" value="standardErrorWriter" />
+                    <node concept="3uibUv" id="3NVVczxG9X3" role="1tU5fm">
+                      <ref role="3uigEE" to="sjfu:3NVVczxBKeo" resolve="LogWriter" />
+                    </node>
+                    <node concept="2ShNRf" id="3NVVczxG9X4" role="33vP2m">
+                      <node concept="1pGfFk" id="3NVVczxG9X5" role="2ShVmc">
+                        <ref role="37wK5l" to="sjfu:3NVVczxBKe$" resolve="LogWriter" />
+                        <node concept="2OqwBi" id="3NVVczxG9X6" role="37wK5m">
+                          <node concept="37vLTw" id="3NVVczxG9X7" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2obGnlS342o" resolve="process" />
+                          </node>
+                          <node concept="liA8E" id="3NVVczxG9X8" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~Process.getErrorStream()" resolve="getErrorStream" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="5VUggFF12y1" role="37wK5m">
+                          <ref role="3cqZAo" node="2obGnlS343D" resolve="moduleName" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                 </node>
-                <node concept="2ShNRf" id="2obGnlS342z" role="33vP2m">
-                  <node concept="1pGfFk" id="2obGnlS342$" role="2ShVmc">
-                    <ref role="37wK5l" node="1ptFCtLqsBp" resolve="StreamGobbler" />
-                    <node concept="Xl_RD" id="2obGnlS342_" role="37wK5m">
-                      <property role="Xl_RC" value="stdin" />
+                <node concept="3cpWs8" id="3NVVczytbO8" role="3cqZAp">
+                  <node concept="3cpWsn" id="3NVVczytbOb" role="3cpWs9">
+                    <property role="TrG5h" value="standardInputMessages" />
+                    <node concept="_YKpA" id="3NVVczytbO4" role="1tU5fm">
+                      <node concept="3uibUv" id="3NVVczyteT3" role="_ZDj9">
+                        <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                      </node>
                     </node>
-                    <node concept="2OqwBi" id="2obGnlS342A" role="37wK5m">
-                      <node concept="37vLTw" id="2obGnlS342B" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2obGnlS342o" resolve="process" />
+                    <node concept="10QFUN" id="3NVVczytnXb" role="33vP2m">
+                      <node concept="_YKpA" id="3NVVczyto1V" role="10QFUM">
+                        <node concept="3uibUv" id="3NVVczytpWf" role="_ZDj9">
+                          <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                        </node>
                       </node>
-                      <node concept="liA8E" id="2obGnlS342C" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Process.getInputStream()" resolve="getInputStream" />
+                      <node concept="2OqwBi" id="4OhLxls2DXU" role="10QFUP">
+                        <node concept="2OqwBi" id="4OhLxls2DXV" role="2Oq$k0">
+                          <node concept="37vLTw" id="4OhLxls2DXW" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3NVVczysmaT" resolve="executor" />
+                          </node>
+                          <node concept="liA8E" id="4OhLxls2DXX" role="2OqNvi">
+                            <ref role="37wK5l" to="5zyv:~ExecutorService.submit(java.util.concurrent.Callable)" resolve="submit" />
+                            <node concept="37vLTw" id="4OhLxls2DXY" role="37wK5m">
+                              <ref role="3cqZAo" node="3NVVczxG3d_" resolve="standardInputWriter" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="4OhLxls2DXZ" role="2OqNvi">
+                          <ref role="37wK5l" to="5zyv:~Future.get()" resolve="get" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="2obGnlS342D" role="3cqZAp">
-              <node concept="3cpWsn" id="2obGnlS342E" role="3cpWs9">
-                <property role="TrG5h" value="s2" />
-                <node concept="3uibUv" id="2obGnlS342F" role="1tU5fm">
-                  <ref role="3uigEE" node="1ptFCtLqsAj" resolve="StreamGobbler" />
-                </node>
-                <node concept="2ShNRf" id="2obGnlS342G" role="33vP2m">
-                  <node concept="1pGfFk" id="2obGnlS342H" role="2ShVmc">
-                    <ref role="37wK5l" node="1ptFCtLqsBp" resolve="StreamGobbler" />
-                    <node concept="Xl_RD" id="2obGnlS342I" role="37wK5m">
-                      <property role="Xl_RC" value="stderr" />
+                <node concept="3cpWs8" id="3NVVczytrBU" role="3cqZAp">
+                  <node concept="3cpWsn" id="3NVVczytrBV" role="3cpWs9">
+                    <property role="TrG5h" value="standardErrorMessages" />
+                    <node concept="_YKpA" id="3NVVczytrBW" role="1tU5fm">
+                      <node concept="3uibUv" id="3NVVczytrBX" role="_ZDj9">
+                        <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                      </node>
                     </node>
-                    <node concept="2OqwBi" id="2obGnlS342J" role="37wK5m">
-                      <node concept="37vLTw" id="2obGnlS342K" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2obGnlS342o" resolve="process" />
+                    <node concept="10QFUN" id="3NVVczytrBY" role="33vP2m">
+                      <node concept="_YKpA" id="3NVVczytrBZ" role="10QFUM">
+                        <node concept="3uibUv" id="3NVVczytrC0" role="_ZDj9">
+                          <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                        </node>
                       </node>
-                      <node concept="liA8E" id="2obGnlS342L" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Process.getErrorStream()" resolve="getErrorStream" />
+                      <node concept="2OqwBi" id="4OhLxls2GGW" role="10QFUP">
+                        <node concept="2OqwBi" id="4OhLxls2GGX" role="2Oq$k0">
+                          <node concept="37vLTw" id="4OhLxls2GGY" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3NVVczysmaT" resolve="executor" />
+                          </node>
+                          <node concept="liA8E" id="4OhLxls2GGZ" role="2OqNvi">
+                            <ref role="37wK5l" to="5zyv:~ExecutorService.submit(java.util.concurrent.Callable)" resolve="submit" />
+                            <node concept="37vLTw" id="4OhLxls2J_$" role="37wK5m">
+                              <ref role="3cqZAo" node="3NVVczxG9X2" resolve="standardErrorWriter" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="4OhLxls2GH1" role="2OqNvi">
+                          <ref role="37wK5l" to="5zyv:~Future.get()" resolve="get" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="2obGnlS342M" role="3cqZAp">
-              <node concept="2OqwBi" id="2obGnlS342N" role="3clFbG">
-                <node concept="37vLTw" id="2obGnlS342O" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2obGnlS342x" resolve="s1" />
-                </node>
-                <node concept="liA8E" id="2obGnlS342P" role="2OqNvi">
-                  <ref role="37wK5l" node="1ptFCtLqsAk" resolve="start" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="2obGnlS342Q" role="3cqZAp">
-              <node concept="2OqwBi" id="2obGnlS342R" role="3clFbG">
-                <node concept="37vLTw" id="2obGnlS342S" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2obGnlS342E" resolve="s2" />
-                </node>
-                <node concept="liA8E" id="2obGnlS342T" role="2OqNvi">
-                  <ref role="37wK5l" node="1ptFCtLqsAk" resolve="start" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="2obGnlS342U" role="3cqZAp" />
-            <node concept="3clFbJ" id="2obGnlS342V" role="3cqZAp">
-              <node concept="3clFbS" id="2obGnlS342W" role="3clFbx">
+                <node concept="3clFbH" id="5VUggFF1AwM" role="3cqZAp" />
                 <node concept="3cpWs8" id="2obGnlS342X" role="3cqZAp">
                   <node concept="3cpWsn" id="2obGnlS342Y" role="3cpWs9">
-                    <property role="TrG5h" value="resultCode" />
+                    <property role="TrG5h" value="exitValue" />
                     <node concept="10Oyi0" id="2obGnlS342Z" role="1tU5fm" />
                     <node concept="2OqwBi" id="2obGnlS3430" role="33vP2m">
                       <node concept="37vLTw" id="2obGnlS3431" role="2Oq$k0">
@@ -8269,27 +8274,60 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3cpWs6" id="2obGnlS3433" role="3cqZAp">
-                  <node concept="3cpWs3" id="5VUggFEWHTA" role="3cqZAk">
-                    <node concept="Xl_RD" id="5VUggFEWHTD" role="3uHU7w">
-                      <property role="Xl_RC" value=")" />
-                    </node>
-                    <node concept="3cpWs3" id="2obGnlS3434" role="3uHU7B">
-                      <node concept="3cpWs3" id="2obGnlS3436" role="3uHU7B">
-                        <node concept="3cpWs3" id="2obGnlS3437" role="3uHU7B">
-                          <node concept="Xl_RD" id="2obGnlS3438" role="3uHU7B">
-                            <property role="Xl_RC" value="'" />
+                <node concept="3clFbH" id="5VUggFF19vt" role="3cqZAp" />
+                <node concept="3clFbJ" id="5VUggFF0oCw" role="3cqZAp">
+                  <node concept="3clFbS" id="5VUggFF0oCy" role="3clFbx">
+                    <node concept="YS8fn" id="5VUggFF0pbV" role="3cqZAp">
+                      <node concept="2ShNRf" id="5VUggFF0qga" role="YScLw">
+                        <node concept="1pGfFk" id="5VUggFF0t_3" role="2ShVmc">
+                          <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                          <node concept="3cpWs3" id="5VUggFF0xhW" role="37wK5m">
+                            <node concept="37vLTw" id="5VUggFF0xzU" role="3uHU7w">
+                              <ref role="3cqZAo" node="2obGnlS342Y" resolve="exitValue" />
+                            </node>
+                            <node concept="Xl_RD" id="5VUggFF0u7W" role="3uHU7B">
+                              <property role="Xl_RC" value="Process finished with non-zero exit code " />
+                            </node>
                           </node>
-                          <node concept="37vLTw" id="2obGnlS3439" role="3uHU7w">
-                            <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3eOSWO" id="5zgShfbCz6K" role="3clFbw">
+                    <node concept="3cmrfG" id="5zgShfbCz6L" role="3uHU7w">
+                      <property role="3cmrfH" value="0" />
+                    </node>
+                    <node concept="37vLTw" id="4OhLxlsdWjK" role="3uHU7B">
+                      <ref role="3cqZAo" node="2obGnlS342Y" resolve="exitValue" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs6" id="5VUggFFcfUk" role="3cqZAp">
+                  <node concept="1Ls8ON" id="5VUggFFclEt" role="3cqZAk">
+                    <node concept="2OqwBi" id="5VUggFFcsaO" role="1Lso8e">
+                      <node concept="2OqwBi" id="5VUggFFcneL" role="2Oq$k0">
+                        <node concept="37vLTw" id="5VUggFFcmBf" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3NVVczytbOb" resolve="standardInputMessages" />
+                        </node>
+                        <node concept="3QWeyG" id="5VUggFFcoDw" role="2OqNvi">
+                          <node concept="37vLTw" id="5VUggFFcpbN" role="576Qk">
+                            <ref role="3cqZAo" node="3NVVczytrBV" resolve="standardErrorMessages" />
                           </node>
                         </node>
-                        <node concept="Xl_RD" id="2obGnlS343a" role="3uHU7w">
-                          <property role="Xl_RC" value="' successfully completed (exit code: " />
+                      </node>
+                      <node concept="ANE8D" id="5VUggFFct8r" role="2OqNvi" />
+                    </node>
+                    <node concept="3cpWs3" id="5VUggFFcqns" role="1Lso8e">
+                      <node concept="3cpWs3" id="5VUggFFcqnt" role="3uHU7B">
+                        <node concept="Xl_RD" id="5VUggFFcqnu" role="3uHU7B">
+                          <property role="Xl_RC" value="'" />
+                        </node>
+                        <node concept="37vLTw" id="5VUggFFcqnv" role="3uHU7w">
+                          <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
                         </node>
                       </node>
-                      <node concept="37vLTw" id="2obGnlS3435" role="3uHU7w">
-                        <ref role="3cqZAo" node="2obGnlS342Y" resolve="resultCode" />
+                      <node concept="Xl_RD" id="5VUggFFcqnw" role="3uHU7w">
+                        <property role="Xl_RC" value="' successfully completed" />
                       </node>
                     </node>
                   </node>
@@ -8303,25 +8341,33 @@
               </node>
               <node concept="9aQIb" id="2obGnlS343e" role="9aQIa">
                 <node concept="3clFbS" id="2obGnlS343f" role="9aQI4">
-                  <node concept="3cpWs6" id="2obGnlS343g" role="3cqZAp">
-                    <node concept="3cpWs3" id="2obGnlS343h" role="3cqZAk">
-                      <node concept="3cpWs3" id="2obGnlS343i" role="3uHU7B">
-                        <node concept="Xl_RD" id="2obGnlS343j" role="3uHU7B">
-                          <property role="Xl_RC" value="'" />
-                        </node>
-                        <node concept="37vLTw" id="2obGnlS343k" role="3uHU7w">
-                          <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
+                  <node concept="3cpWs6" id="5VUggFFcuf2" role="3cqZAp">
+                    <node concept="1Ls8ON" id="5VUggFFcyKb" role="3cqZAk">
+                      <node concept="2ShNRf" id="5VUggFFcBPG" role="1Lso8e">
+                        <node concept="Tc6Ow" id="5VUggFFcE6o" role="2ShVmc">
+                          <node concept="3uibUv" id="5VUggFFcGgs" role="HW$YZ">
+                            <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                          </node>
                         </node>
                       </node>
-                      <node concept="Xl_RD" id="2obGnlS343l" role="3uHU7w">
-                        <property role="Xl_RC" value="' has been started in a non-blocking way" />
+                      <node concept="3cpWs3" id="5VUggFFcAbs" role="1Lso8e">
+                        <node concept="3cpWs3" id="5VUggFFcAbt" role="3uHU7B">
+                          <node concept="Xl_RD" id="5VUggFFcAbu" role="3uHU7B">
+                            <property role="Xl_RC" value="'" />
+                          </node>
+                          <node concept="37vLTw" id="5VUggFFcAbv" role="3uHU7w">
+                            <ref role="3cqZAo" node="2obGnlS341D" resolve="cmdString" />
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="5VUggFFcAbw" role="3uHU7w">
+                          <property role="Xl_RC" value="' has been started in a non-blocking way" />
+                        </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="2obGnlS343m" role="3cqZAp" />
           </node>
         </node>
       </node>
@@ -8333,7 +8379,14 @@
         <property role="TrG5h" value="path" />
         <node concept="17QB3L" id="2obGnlS343G" role="1tU5fm" />
       </node>
-      <node concept="17QB3L" id="2obGnlS343H" role="3clF45" />
+      <node concept="1LlUBW" id="5VUggFFceV5" role="3clF45">
+        <node concept="_YKpA" id="5VUggFFceV6" role="1Lm7xW">
+          <node concept="3uibUv" id="5VUggFFceV7" role="_ZDj9">
+            <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+          </node>
+        </node>
+        <node concept="17QB3L" id="5VUggFFceV8" role="1Lm7xW" />
+      </node>
     </node>
   </node>
   <node concept="13h7C7" id="4zqPC3av52n">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
index f9814078f4d..7eb31967401 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/plugin.mps
@@ -17,17 +17,11 @@
     <import index="fn29" ref="r:6ba2667b-185e-45cd-ac65-e4b9d66da28e(jetbrains.mps.smodel.resources)" />
     <import index="51wr" ref="r:b31f1c3c-99aa-4f1e-a329-cba27efb1a6b(com.mbeddr.core.buildconfig.structure)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="unno" ref="r:61e3d524-8c49-4491-b5e3-f6d6e9364527(jetbrains.mps.util)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="ahli" ref="r:44ccebce-f3a6-4238-afbf-c4a18f6348c1(com.mbeddr.core.buildconfig.behavior)" />
     <import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
-    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="3ju5" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.vfs(MPS.Core/)" />
-    <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="rcia" ref="r:bae7addc-e10d-4f29-a8ac-0448d3c5daaf(com.mbeddr.core.expressions.plugin)" />
-    <import index="ap4t" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.generator(MPS.Core/)" />
-    <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
-    <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
+    <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" implicit="true" />
@@ -42,6 +36,13 @@
       <concept id="1239576519914" name="jetbrains.mps.baseLanguage.tuples.structure.NamedTupleComponentAccessOperation" flags="nn" index="2sxana">
         <reference id="1239576542472" name="component" index="2sxfKC" />
       </concept>
+      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
+        <child id="1238852204892" name="componentType" index="1Lm7xW" />
+      </concept>
+      <concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
+        <child id="1238857764950" name="tuple" index="1LFl5Q" />
+        <child id="1238857834412" name="index" index="1LF_Uc" />
+      </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -808,9 +809,24 @@
                                               </node>
                                             </node>
                                           </node>
+                                          <node concept="1daRAt" id="5VUggFFefWy" role="3cqZAp">
+                                            <node concept="3cpWs3" id="5VUggFFefWB" role="1daK9t">
+                                              <node concept="Xl_RD" id="5VUggFFefWC" role="3uHU7w">
+                                                <property role="Xl_RC" value="':" />
+                                              </node>
+                                              <node concept="3cpWs3" id="5VUggFFefWD" role="3uHU7B">
+                                                <node concept="Xl_RD" id="5VUggFFefWE" role="3uHU7B">
+                                                  <property role="Xl_RC" value="Postprocessing '" />
+                                                </node>
+                                                <node concept="37vLTw" id="5VUggFFefWF" role="3uHU7w">
+                                                  <ref role="3cqZAo" node="6dqrGHqK54t" resolve="moduleName" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
                                           <node concept="2Gpval" id="2obGnlRzDHH" role="3cqZAp">
                                             <node concept="2GrKxI" id="2obGnlRzDHJ" role="2Gsz3X">
-                                              <property role="TrG5h" value="pp" />
+                                              <property role="TrG5h" value="postProcssor" />
                                             </node>
                                             <node concept="37vLTw" id="2obGnlRzHcx" role="2GsD0m">
                                               <ref role="3cqZAo" node="2obGnlRzCr2" resolve="postProcessors" />
@@ -827,7 +843,7 @@
                                                   </node>
                                                   <node concept="2OqwBi" id="2obGnlR$8yr" role="3uHU7w">
                                                     <node concept="2GrUjf" id="2obGnlRzQya" role="2Oq$k0">
-                                                      <ref role="2Gs0qQ" node="2obGnlRzDHJ" resolve="pp" />
+                                                      <ref role="2Gs0qQ" node="2obGnlRzDHJ" resolve="postProcssor" />
                                                     </node>
                                                     <node concept="2qgKlT" id="2obGnlR$b17" role="2OqNvi">
                                                       <ref role="37wK5l" to="ahli:2obGnlRzRct" resolve="getDescription" />
@@ -835,46 +851,65 @@
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="3cpWs8" id="2obGnlRRAhu" role="3cqZAp">
-                                                <node concept="3cpWsn" id="2obGnlRRAhv" role="3cpWs9">
-                                                  <property role="TrG5h" value="res" />
-                                                  <node concept="17QB3L" id="2obGnlRRAgx" role="1tU5fm" />
-                                                  <node concept="2OqwBi" id="2obGnlRRAhw" role="33vP2m">
-                                                    <node concept="2GrUjf" id="2obGnlRRAhx" role="2Oq$k0">
-                                                      <ref role="2Gs0qQ" node="2obGnlRzDHJ" resolve="pp" />
+                                              <node concept="3cpWs8" id="5VUggFFcHv6" role="3cqZAp">
+                                                <node concept="3cpWsn" id="5VUggFFcHv7" role="3cpWs9">
+                                                  <property role="TrG5h" value="result" />
+                                                  <node concept="1LlUBW" id="5VUggFFcH6Q" role="1tU5fm">
+                                                    <node concept="_YKpA" id="5VUggFFcH6Z" role="1Lm7xW">
+                                                      <node concept="3uibUv" id="5VUggFFcH70" role="_ZDj9">
+                                                        <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                                                      </node>
                                                     </node>
-                                                    <node concept="2qgKlT" id="2obGnlRRAhy" role="2OqNvi">
+                                                    <node concept="17QB3L" id="5VUggFFcH71" role="1Lm7xW" />
+                                                  </node>
+                                                  <node concept="2OqwBi" id="5VUggFFcHv8" role="33vP2m">
+                                                    <node concept="2GrUjf" id="5VUggFFcHv9" role="2Oq$k0">
+                                                      <ref role="2Gs0qQ" node="2obGnlRzDHJ" resolve="postProcssor" />
+                                                    </node>
+                                                    <node concept="2qgKlT" id="5VUggFFcHva" role="2OqNvi">
                                                       <ref role="37wK5l" to="ahli:2obGnlQSrPD" resolve="execute" />
-                                                      <node concept="37vLTw" id="2obGnlRRAhz" role="37wK5m">
+                                                      <node concept="37vLTw" id="5VUggFFcHvb" role="37wK5m">
                                                         <ref role="3cqZAo" node="6dqrGHqK54t" resolve="moduleName" />
                                                       </node>
-                                                      <node concept="37vLTw" id="5pX5kNhQ7W_" role="37wK5m">
+                                                      <node concept="37vLTw" id="5VUggFFcHvc" role="37wK5m">
                                                         <ref role="3cqZAo" node="5pX5kNhQ0Yo" resolve="outputLocation" />
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="1daRAt" id="5VUggFEWnmi" role="3cqZAp">
-                                                <node concept="3cpWs3" id="5VUggFEWn$L" role="1daK9t">
-                                                  <node concept="37vLTw" id="5VUggFEWn$M" role="3uHU7w">
-                                                    <ref role="3cqZAo" node="2obGnlRRAhv" resolve="res" />
+                                              <node concept="2Gpval" id="3NVVczytYnt" role="3cqZAp">
+                                                <node concept="15s5l7" id="6KI2Y3Z00pZ" role="lGtFl" />
+                                                <node concept="2GrKxI" id="3NVVczytYnu" role="2Gsz3X">
+                                                  <property role="TrG5h" value="message" />
+                                                </node>
+                                                <node concept="1LFfDK" id="5VUggFFcN85" role="2GsD0m">
+                                                  <node concept="3cmrfG" id="5VUggFFcNor" role="1LF_Uc">
+                                                    <property role="3cmrfH" value="0" />
                                                   </node>
-                                                  <node concept="3cpWs3" id="5VUggFEWn$N" role="3uHU7B">
-                                                    <node concept="Xl_RD" id="5VUggFEWn$O" role="3uHU7w">
-                                                      <property role="Xl_RC" value="': " />
-                                                    </node>
-                                                    <node concept="3cpWs3" id="5VUggFEWn$P" role="3uHU7B">
-                                                      <node concept="Xl_RD" id="5VUggFEWn$S" role="3uHU7B">
-                                                        <property role="Xl_RC" value="Postprocessed '" />
-                                                      </node>
-                                                      <node concept="37vLTw" id="5VUggFEWn$X" role="3uHU7w">
-                                                        <ref role="3cqZAo" node="6dqrGHqK54t" resolve="moduleName" />
-                                                      </node>
+                                                  <node concept="37vLTw" id="3NVVczzDh4F" role="1LFl5Q">
+                                                    <ref role="3cqZAo" node="5VUggFFcHv7" resolve="result" />
+                                                  </node>
+                                                </node>
+                                                <node concept="3clFbS" id="3NVVczytYnw" role="2LFqv$">
+                                                  <node concept="1daRAt" id="3NVVczytYnx" role="3cqZAp">
+                                                    <property role="1daRAr" value="MESSAGE" />
+                                                    <node concept="2GrUjf" id="3NVVczzoJnk" role="1daK9t">
+                                                      <ref role="2Gs0qQ" node="3NVVczytYnu" resolve="message" />
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
+                                              <node concept="1daRAt" id="5VUggFEWnmi" role="3cqZAp">
+                                                <node concept="1LFfDK" id="5VUggFFcJac" role="1daK9t">
+                                                  <node concept="3cmrfG" id="5VUggFFcJpw" role="1LF_Uc">
+                                                    <property role="3cmrfH" value="1" />
+                                                  </node>
+                                                  <node concept="37vLTw" id="5VUggFEWn$M" role="1LFl5Q">
+                                                    <ref role="3cqZAo" node="5VUggFFcHv7" resolve="result" />
+                                                  </node>
+                                                </node>
+                                              </node>
                                             </node>
                                           </node>
                                         </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/plugin.mps
index b5a39e93b35..826129559e5 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/plugin.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/plugin.mps
@@ -280,7 +280,6 @@
       <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
-        <child id="1350122676458893092" name="text" index="3ndbpf" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -1046,8 +1045,23 @@
                       <node concept="1daRAt" id="3cN5OOfBeWL" role="3cqZAp">
                         <property role="1daRAr" value="ERROR" />
                         <node concept="3cpWs3" id="3cN5OOfBeX2" role="1daK9t">
-                          <node concept="Xl_RD" id="3cN5OOfBeX3" role="3uHU7B">
-                            <property role="Xl_RC" value="make failed: " />
+                          <node concept="3cpWs3" id="5VUggFFgBkm" role="3uHU7B">
+                            <node concept="Xl_RD" id="5VUggFFgAM9" role="3uHU7w">
+                              <property role="Xl_RC" value="' failed: " />
+                            </node>
+                            <node concept="3cpWs3" id="5VUggFFgAM1" role="3uHU7B">
+                              <node concept="Xl_RD" id="5VUggFFgAM7" role="3uHU7B">
+                                <property role="Xl_RC" value="make for '" />
+                              </node>
+                              <node concept="1LFfDK" id="5VUggFFgBkB" role="3uHU7w">
+                                <node concept="2GrUjf" id="5VUggFFgBkC" role="1LFl5Q">
+                                  <ref role="2Gs0qQ" node="5zgShfbCz4u" resolve="pathTuple" />
+                                </node>
+                                <node concept="3cmrfG" id="5VUggFFgBkD" role="1LF_Uc">
+                                  <property role="3cmrfH" value="1" />
+                                </node>
+                              </node>
+                            </node>
                           </node>
                           <node concept="2OqwBi" id="3cN5OOfBeX4" role="3uHU7w">
                             <node concept="37vLTw" id="3cN5OOfBeX5" role="2Oq$k0">
@@ -1083,40 +1097,6 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3SKdUt" id="5zgShfbCz4E" role="3cqZAp">
-                      <node concept="1PaTwC" id="13p6s1wtiws" role="3ndbpf">
-                        <node concept="3oM_SD" id="13p6s1wtiwt" role="1PaTwD">
-                          <property role="3oM_SC" value="use" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwu" role="1PaTwD">
-                          <property role="3oM_SC" value="ProcessBuilder" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwv" role="1PaTwD">
-                          <property role="3oM_SC" value="to" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiww" role="1PaTwD">
-                          <property role="3oM_SC" value="automatically" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwx" role="1PaTwD">
-                          <property role="3oM_SC" value="get" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwy" role="1PaTwD">
-                          <property role="3oM_SC" value="make.exe" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwz" role="1PaTwD">
-                          <property role="3oM_SC" value="via" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiw$" role="1PaTwD">
-                          <property role="3oM_SC" value="PATH" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiw_" role="1PaTwD">
-                          <property role="3oM_SC" value="and" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwA" role="1PaTwD">
-                          <property role="3oM_SC" value="environment" />
-                        </node>
-                      </node>
-                    </node>
                     <node concept="3cpWs8" id="3s1LyzGriHS" role="3cqZAp">
                       <node concept="3cpWsn" id="3s1LyzGriHV" role="3cpWs9">
                         <property role="TrG5h" value="makeCommand" />
@@ -1213,46 +1193,6 @@
                           </node>
                           <node concept="3clFbJ" id="7GmkyIHGcyx" role="3cqZAp">
                             <node concept="3clFbS" id="7GmkyIHGcyz" role="3clFbx">
-                              <node concept="3SKdUt" id="3dZgFhDBGCf" role="3cqZAp">
-                                <node concept="1PaTwC" id="13p6s1wtiwB" role="3ndbpf">
-                                  <node concept="3oM_SD" id="13p6s1wtiwC" role="1PaTwD">
-                                    <property role="3oM_SC" value="The" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwD" role="1PaTwD">
-                                    <property role="3oM_SC" value="-j" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwE" role="1PaTwD">
-                                    <property role="3oM_SC" value="option" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwF" role="1PaTwD">
-                                    <property role="3oM_SC" value="instructs" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwG" role="1PaTwD">
-                                    <property role="3oM_SC" value="the" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwH" role="1PaTwD">
-                                    <property role="3oM_SC" value="make" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwI" role="1PaTwD">
-                                    <property role="3oM_SC" value="to" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwJ" role="1PaTwD">
-                                    <property role="3oM_SC" value="run" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwK" role="1PaTwD">
-                                    <property role="3oM_SC" value="it's" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwL" role="1PaTwD">
-                                    <property role="3oM_SC" value="recipes" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwM" role="1PaTwD">
-                                    <property role="3oM_SC" value="in" />
-                                  </node>
-                                  <node concept="3oM_SD" id="13p6s1wtiwN" role="1PaTwD">
-                                    <property role="3oM_SC" value="parallel" />
-                                  </node>
-                                </node>
-                              </node>
                               <node concept="3clFbF" id="3dZgFhDBtn_" role="3cqZAp">
                                 <node concept="37vLTI" id="3dZgFhDBt$X" role="3clFbG">
                                   <node concept="37vLTw" id="3dZgFhDBtnz" role="37vLTJ">
@@ -1379,46 +1319,6 @@
                       </node>
                     </node>
                     <node concept="3clFbH" id="6qXnQYnrE2P" role="3cqZAp" />
-                    <node concept="3SKdUt" id="5zgShfbCz56" role="3cqZAp">
-                      <node concept="1PaTwC" id="13p6s1wtiwO" role="3ndbpf">
-                        <node concept="3oM_SD" id="13p6s1wtiwP" role="1PaTwD">
-                          <property role="3oM_SC" value="workaround" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwQ" role="1PaTwD">
-                          <property role="3oM_SC" value="for" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwR" role="1PaTwD">
-                          <property role="3oM_SC" value="redirecting" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwS" role="1PaTwD">
-                          <property role="3oM_SC" value="stdin" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwT" role="1PaTwD">
-                          <property role="3oM_SC" value="and" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwU" role="1PaTwD">
-                          <property role="3oM_SC" value="stderr." />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwV" role="1PaTwD">
-                          <property role="3oM_SC" value="If" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwW" role="1PaTwD">
-                          <property role="3oM_SC" value="not," />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwX" role="1PaTwD">
-                          <property role="3oM_SC" value="make.exe" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwY" role="1PaTwD">
-                          <property role="3oM_SC" value="blocks" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtiwZ" role="1PaTwD">
-                          <property role="3oM_SC" value="in" />
-                        </node>
-                        <node concept="3oM_SD" id="13p6s1wtix0" role="1PaTwD">
-                          <property role="3oM_SC" value="windows" />
-                        </node>
-                      </node>
-                    </node>
                     <node concept="3cpWs8" id="3NVVczysmaS" role="3cqZAp">
                       <node concept="3cpWsn" id="3NVVczysmaT" role="3cpWs9">
                         <property role="TrG5h" value="executor" />
@@ -1682,31 +1582,43 @@
                         <node concept="3clFbS" id="5zgShfbCz6Q" role="9aQI4">
                           <node concept="1daRAt" id="7PIfE8orgBY" role="3cqZAp">
                             <property role="1daRAr" value="INFO" />
-                            <node concept="3cpWs3" id="5mK2hjZ_5hv" role="1daK9t">
-                              <node concept="3cpWs3" id="5mK2hjZ_10b" role="3uHU7B">
-                                <node concept="3cpWs3" id="7PIfE8orgJu" role="3uHU7B">
-                                  <node concept="Xl_RD" id="7PIfE8orgJv" role="3uHU7B">
-                                    <property role="Xl_RC" value="make finished successfully for " />
-                                  </node>
-                                  <node concept="1LFfDK" id="7PIfE8orgJw" role="3uHU7w">
-                                    <node concept="2GrUjf" id="7PIfE8orgJx" role="1LFl5Q">
-                                      <ref role="2Gs0qQ" node="5zgShfbCz4u" resolve="pathTuple" />
+                            <node concept="3cpWs3" id="5VUggFFeZhF" role="1daK9t">
+                              <node concept="Xl_RD" id="5VUggFFf01V" role="3uHU7w">
+                                <property role="Xl_RC" value="')" />
+                              </node>
+                              <node concept="3cpWs3" id="5mK2hjZ_5hv" role="3uHU7B">
+                                <node concept="3cpWs3" id="5mK2hjZ_10b" role="3uHU7B">
+                                  <node concept="3cpWs3" id="7PIfE8orgJu" role="3uHU7B">
+                                    <node concept="Xl_RD" id="7PIfE8orgJv" role="3uHU7B">
+                                      <property role="Xl_RC" value="make for '" />
                                     </node>
-                                    <node concept="3cmrfG" id="7PIfE8orgJy" role="1LF_Uc">
-                                      <property role="3cmrfH" value="1" />
+                                    <node concept="1LFfDK" id="7PIfE8orgJw" role="3uHU7w">
+                                      <node concept="2GrUjf" id="7PIfE8orgJx" role="1LFl5Q">
+                                        <ref role="2Gs0qQ" node="5zgShfbCz4u" resolve="pathTuple" />
+                                      </node>
+                                      <node concept="3cmrfG" id="7PIfE8orgJy" role="1LF_Uc">
+                                        <property role="3cmrfH" value="1" />
+                                      </node>
                                     </node>
                                   </node>
+                                  <node concept="Xl_RD" id="5mK2hjZ_1Ta" role="3uHU7w">
+                                    <property role="Xl_RC" value="' successfully completed (make command: '" />
+                                  </node>
                                 </node>
-                                <node concept="Xl_RD" id="5mK2hjZ_1Ta" role="3uHU7w">
-                                  <property role="Xl_RC" value=" with make command " />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="5mK2hjZ_9Lm" role="3uHU7w">
-                                <node concept="37vLTw" id="5mK2hjZ_93B" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3dZgFhDBrjd" resolve="processBuilder" />
-                                </node>
-                                <node concept="liA8E" id="5mK2hjZ_aFN" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~ProcessBuilder.command()" resolve="command" />
+                                <node concept="2YIFZM" id="5VUggFFffWB" role="3uHU7w">
+                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                  <ref role="37wK5l" to="wyt6:~String.join(java.lang.CharSequence,java.lang.Iterable)" resolve="join" />
+                                  <node concept="Xl_RD" id="5VUggFFfgJl" role="37wK5m">
+                                    <property role="Xl_RC" value=" " />
+                                  </node>
+                                  <node concept="2OqwBi" id="5mK2hjZ_9Lm" role="37wK5m">
+                                    <node concept="37vLTw" id="5mK2hjZ_93B" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="3dZgFhDBrjd" resolve="processBuilder" />
+                                    </node>
+                                    <node concept="liA8E" id="5mK2hjZ_aFN" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~ProcessBuilder.command()" resolve="command" />
+                                    </node>
+                                  </node>
                                 </node>
                               </node>
                             </node>
@@ -2059,20 +1971,7 @@
       </node>
       <node concept="3Tmbuc" id="3NVVczxOwKY" role="1B3o_S" />
     </node>
-    <node concept="312cEg" id="3NVVczxC4fm" role="jymVt">
-      <property role="34CwA1" value="false" />
-      <property role="eg7rD" value="false" />
-      <property role="TrG5h" value="dirInfoTuple" />
-      <property role="3TUv4t" value="false" />
-      <node concept="1LlUBW" id="3NVVczxC3ao" role="1tU5fm">
-        <node concept="17QB3L" id="3NVVczxC5qt" role="1Lm7xW" />
-        <node concept="17QB3L" id="3NVVczxC5uY" role="1Lm7xW" />
-        <node concept="3Tqbb2" id="3s1LyzGgcyP" role="1Lm7xW">
-          <ref role="ehGHo" to="i2y7:3s1LyzGeK9o" resolve="IMakePathProvider" />
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="3NVVczxOwT3" role="1B3o_S" />
-    </node>
+    <node concept="2tJIrI" id="5VUggFF0MPP" role="jymVt" />
     <node concept="312cEg" id="4OhLxls9zXZ" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
@@ -2110,14 +2009,8 @@
         </node>
       </node>
       <node concept="37vLTG" id="3NVVczxIgXA" role="3clF46">
-        <property role="TrG5h" value="dirInfoTuple" />
-        <node concept="1LlUBW" id="3NVVczxIh6Z" role="1tU5fm">
-          <node concept="17QB3L" id="3NVVczxIhat" role="1Lm7xW" />
-          <node concept="17QB3L" id="3NVVczxIhe8" role="1Lm7xW" />
-          <node concept="3Tqbb2" id="3s1LyzGgbX4" role="1Lm7xW">
-            <ref role="ehGHo" to="i2y7:3s1LyzGeK9o" resolve="IMakePathProvider" />
-          </node>
-        </node>
+        <property role="TrG5h" value="fqModelName" />
+        <node concept="17QB3L" id="5VUggFF0UKz" role="1tU5fm" />
       </node>
       <node concept="3cqZAl" id="3NVVczxBKeD" role="3clF45" />
       <node concept="3Tm1VV" id="3NVVczxBKeE" role="1B3o_S" />
@@ -2145,35 +2038,17 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="3NVVczxIhI4" role="3cqZAp">
-          <node concept="37vLTI" id="3NVVczxIjeA" role="3clFbG">
-            <node concept="37vLTw" id="3NVVczxIjoJ" role="37vLTx">
-              <ref role="3cqZAo" node="3NVVczxIgXA" resolve="dirInfoTuple" />
-            </node>
-            <node concept="2OqwBi" id="3NVVczxIhMm" role="37vLTJ">
-              <node concept="Xjq3P" id="3NVVczxIhI1" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3NVVczxIiqt" role="2OqNvi">
-                <ref role="2Oxat5" node="3NVVczxC4fm" resolve="dirInfoTuple" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="4OhLxls9_UZ" role="3cqZAp">
           <node concept="37vLTI" id="4OhLxls9AsR" role="3clFbG">
-            <node concept="37vLTw" id="4OhLxls9_UY" role="37vLTJ">
-              <ref role="3cqZAo" node="4OhLxls9zXZ" resolve="fqModelName" />
-            </node>
-            <node concept="1LFfDK" id="4OhLxls9BP3" role="37vLTx">
-              <node concept="3cmrfG" id="4OhLxls9BWS" role="1LF_Uc">
-                <property role="3cmrfH" value="1" />
-              </node>
-              <node concept="2OqwBi" id="4OhLxls9A_X" role="1LFl5Q">
-                <node concept="Xjq3P" id="4OhLxls9A_Y" role="2Oq$k0" />
-                <node concept="2OwXpG" id="4OhLxls9A_Z" role="2OqNvi">
-                  <ref role="2Oxat5" node="3NVVczxC4fm" resolve="dirInfoTuple" />
-                </node>
+            <node concept="2OqwBi" id="5VUggFF0YoS" role="37vLTJ">
+              <node concept="Xjq3P" id="5VUggFF0Y5y" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5VUggFF0YNC" role="2OqNvi">
+                <ref role="2Oxat5" node="4OhLxls9zXZ" resolve="fqModelName" />
               </node>
             </node>
+            <node concept="37vLTw" id="5VUggFF0Wk8" role="37vLTx">
+              <ref role="3cqZAo" node="3NVVczxIgXA" resolve="fqModelName" />
+            </node>
           </node>
         </node>
       </node>
@@ -2225,42 +2100,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="3dZgFhDU5FL" role="3cqZAp">
-          <node concept="37vLTI" id="3dZgFhDU5FM" role="3clFbG">
-            <node concept="2OqwBi" id="3dZgFhDU5FO" role="37vLTJ">
-              <node concept="Xjq3P" id="3dZgFhDU5FP" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3dZgFhDU5FQ" role="2OqNvi">
-                <ref role="2Oxat5" node="3NVVczxC4fm" resolve="dirInfoTuple" />
-              </node>
-            </node>
-            <node concept="1Ls8ON" id="3dZgFhDUfr2" role="37vLTx">
-              <node concept="1LFfDK" id="3dZgFhDUier" role="1Lso8e">
-                <node concept="3cmrfG" id="3dZgFhDUivg" role="1LF_Uc">
-                  <property role="3cmrfH" value="0" />
-                </node>
-                <node concept="37vLTw" id="3dZgFhDUfE4" role="1LFl5Q">
-                  <ref role="3cqZAo" node="3dZgFhDU5Fv" resolve="dirInfoTuple" />
-                </node>
-              </node>
-              <node concept="1LFfDK" id="3dZgFhDUjJL" role="1Lso8e">
-                <node concept="3cmrfG" id="3dZgFhDUjY_" role="1LF_Uc">
-                  <property role="3cmrfH" value="1" />
-                </node>
-                <node concept="37vLTw" id="3dZgFhDUiWv" role="1LFl5Q">
-                  <ref role="3cqZAo" node="3dZgFhDU5Fv" resolve="dirInfoTuple" />
-                </node>
-              </node>
-              <node concept="1LFfDK" id="3dZgFhDUm4$" role="1Lso8e">
-                <node concept="3cmrfG" id="3dZgFhDUmgB" role="1LF_Uc">
-                  <property role="3cmrfH" value="2" />
-                </node>
-                <node concept="37vLTw" id="3dZgFhDUlaw" role="1LFl5Q">
-                  <ref role="3cqZAo" node="3dZgFhDU5Fv" resolve="dirInfoTuple" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="3dZgFhDU5FR" role="3cqZAp">
           <node concept="37vLTI" id="3dZgFhDU5FS" role="3clFbG">
             <node concept="37vLTw" id="3dZgFhDU5FT" role="37vLTJ">
@@ -2270,11 +2109,8 @@
               <node concept="3cmrfG" id="3dZgFhDU5FV" role="1LF_Uc">
                 <property role="3cmrfH" value="1" />
               </node>
-              <node concept="2OqwBi" id="3dZgFhDU5FW" role="1LFl5Q">
-                <node concept="Xjq3P" id="3dZgFhDU5FX" role="2Oq$k0" />
-                <node concept="2OwXpG" id="3dZgFhDU5FY" role="2OqNvi">
-                  <ref role="2Oxat5" node="3NVVczxC4fm" resolve="dirInfoTuple" />
-                </node>
+              <node concept="37vLTw" id="3NVVczxIjoJ" role="1LFl5Q">
+                <ref role="3cqZAo" node="3dZgFhDU5Fv" resolve="dirInfoTuple" />
               </node>
             </node>
           </node>

From f50e3c0a9fe626a21b589aa4a96e0f1afbad653f Mon Sep 17 00:00:00 2001
From: Stephan Eberle <stephaneberle9@gmail.com>
Date: Tue, 19 Apr 2022 19:23:48 +0200
Subject: [PATCH 5/7] core: made sure that error messages of RunPostProcessors
 returning non-zero exit code include output captured from stderr/strout

---
 .../languageModels/behavior.mps               | 153 +++++++++++++++++-
 1 file changed, 149 insertions(+), 4 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
index eba6f46f6d6..2e511ff7d8c 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/behavior.mps
@@ -8277,10 +8277,26 @@
                 <node concept="3clFbH" id="5VUggFF19vt" role="3cqZAp" />
                 <node concept="3clFbJ" id="5VUggFF0oCw" role="3cqZAp">
                   <node concept="3clFbS" id="5VUggFF0oCy" role="3clFbx">
-                    <node concept="YS8fn" id="5VUggFF0pbV" role="3cqZAp">
-                      <node concept="2ShNRf" id="5VUggFF0qga" role="YScLw">
-                        <node concept="1pGfFk" id="5VUggFF0t_3" role="2ShVmc">
-                          <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                    <node concept="3cpWs8" id="5VUggFFmoqg" role="3cqZAp">
+                      <node concept="3cpWsn" id="5VUggFFmoqh" role="3cpWs9">
+                        <property role="TrG5h" value="message" />
+                        <node concept="3uibUv" id="5VUggFFmoqi" role="1tU5fm">
+                          <ref role="3uigEE" to="wyt6:~StringBuilder" resolve="StringBuilder" />
+                        </node>
+                        <node concept="2ShNRf" id="5VUggFFmpQB" role="33vP2m">
+                          <node concept="1pGfFk" id="5VUggFFmrxW" role="2ShVmc">
+                            <ref role="37wK5l" to="wyt6:~StringBuilder.&lt;init&gt;()" resolve="StringBuilder" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="5VUggFFmsw1" role="3cqZAp">
+                      <node concept="2OqwBi" id="5VUggFFmtmz" role="3clFbG">
+                        <node concept="37vLTw" id="5VUggFFmsvZ" role="2Oq$k0">
+                          <ref role="3cqZAo" node="5VUggFFmoqh" resolve="message" />
+                        </node>
+                        <node concept="liA8E" id="5VUggFFmuJ6" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                           <node concept="3cpWs3" id="5VUggFF0xhW" role="37wK5m">
                             <node concept="37vLTw" id="5VUggFF0xzU" role="3uHU7w">
                               <ref role="3cqZAo" node="2obGnlS342Y" resolve="exitValue" />
@@ -8292,6 +8308,135 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbJ" id="5VUggFFmkdt" role="3cqZAp">
+                      <node concept="3clFbS" id="5VUggFFmkdv" role="3clFbx">
+                        <node concept="3clFbF" id="5VUggFFmzBV" role="3cqZAp">
+                          <node concept="2OqwBi" id="5VUggFFm$uH" role="3clFbG">
+                            <node concept="37vLTw" id="5VUggFFmzBT" role="2Oq$k0">
+                              <ref role="3cqZAo" node="5VUggFFmoqh" resolve="message" />
+                            </node>
+                            <node concept="liA8E" id="5VUggFFm_LI" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                              <node concept="3cpWs3" id="5VUggFFmZS3" role="37wK5m">
+                                <node concept="Xl_RD" id="5VUggFFn1Iw" role="3uHU7B">
+                                  <property role="Xl_RC" value=": " />
+                                </node>
+                                <node concept="2YIFZM" id="5VUggFFmHTE" role="3uHU7w">
+                                  <ref role="37wK5l" to="wyt6:~String.join(java.lang.CharSequence,java.lang.Iterable)" resolve="join" />
+                                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                  <node concept="Xl_RD" id="5VUggFFmHTF" role="37wK5m">
+                                    <property role="Xl_RC" value=" " />
+                                  </node>
+                                  <node concept="2OqwBi" id="5VUggFFmJM3" role="37wK5m">
+                                    <node concept="37vLTw" id="5VUggFFmHTG" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="3NVVczytbOb" resolve="standardInputMessages" />
+                                    </node>
+                                    <node concept="3$u5V9" id="5VUggFFmKBa" role="2OqNvi">
+                                      <node concept="1bVj0M" id="5VUggFFmKBc" role="23t8la">
+                                        <node concept="3clFbS" id="5VUggFFmKBd" role="1bW5cS">
+                                          <node concept="3clFbF" id="5VUggFFmLrk" role="3cqZAp">
+                                            <node concept="2OqwBi" id="5VUggFFmMic" role="3clFbG">
+                                              <node concept="37vLTw" id="5VUggFFmLrj" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="5VUggFFmKBe" resolve="it" />
+                                              </node>
+                                              <node concept="liA8E" id="5VUggFFmO4P" role="2OqNvi">
+                                                <ref role="37wK5l" to="et5u:~IMessage.getText()" resolve="getText" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="Rh6nW" id="5VUggFFmKBe" role="1bW2Oz">
+                                          <property role="TrG5h" value="it" />
+                                          <node concept="2jxLKc" id="5VUggFFmKBf" role="1tU5fm" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="5VUggFFmlr0" role="3clFbw">
+                        <node concept="37vLTw" id="5VUggFFmkG7" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3NVVczytrBV" resolve="standardErrorMessages" />
+                        </node>
+                        <node concept="3GX2aA" id="5VUggFFmmlw" role="2OqNvi" />
+                      </node>
+                      <node concept="3eNFk2" id="5VUggFFmOOC" role="3eNLev">
+                        <node concept="2OqwBi" id="5VUggFFmQtP" role="3eO9$A">
+                          <node concept="37vLTw" id="5VUggFFmPwS" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3NVVczytbOb" resolve="standardInputMessages" />
+                          </node>
+                          <node concept="3GX2aA" id="5VUggFFmSOM" role="2OqNvi" />
+                        </node>
+                        <node concept="3clFbS" id="5VUggFFmOOE" role="3eOfB_">
+                          <node concept="3clFbF" id="5VUggFFmUwi" role="3cqZAp">
+                            <node concept="2OqwBi" id="5VUggFFmUwk" role="3clFbG">
+                              <node concept="37vLTw" id="5VUggFFmUwl" role="2Oq$k0">
+                                <ref role="3cqZAo" node="5VUggFFmoqh" resolve="message" />
+                              </node>
+                              <node concept="liA8E" id="5VUggFFmUwm" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
+                                <node concept="3cpWs3" id="5VUggFFn3yq" role="37wK5m">
+                                  <node concept="Xl_RD" id="5VUggFFn4xO" role="3uHU7B">
+                                    <property role="Xl_RC" value=": " />
+                                  </node>
+                                  <node concept="2YIFZM" id="5VUggFFmUwn" role="3uHU7w">
+                                    <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                                    <ref role="37wK5l" to="wyt6:~String.join(java.lang.CharSequence,java.lang.Iterable)" resolve="join" />
+                                    <node concept="Xl_RD" id="5VUggFFmUwo" role="37wK5m">
+                                      <property role="Xl_RC" value=" " />
+                                    </node>
+                                    <node concept="2OqwBi" id="5VUggFFmUwp" role="37wK5m">
+                                      <node concept="37vLTw" id="5VUggFFmUwq" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="3NVVczytbOb" resolve="standardInputMessages" />
+                                      </node>
+                                      <node concept="3$u5V9" id="5VUggFFmUwr" role="2OqNvi">
+                                        <node concept="1bVj0M" id="5VUggFFmUws" role="23t8la">
+                                          <node concept="3clFbS" id="5VUggFFmUwt" role="1bW5cS">
+                                            <node concept="3clFbF" id="5VUggFFmUwu" role="3cqZAp">
+                                              <node concept="2OqwBi" id="5VUggFFmUwv" role="3clFbG">
+                                                <node concept="37vLTw" id="5VUggFFmUww" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="5VUggFFmUwy" resolve="it" />
+                                                </node>
+                                                <node concept="liA8E" id="5VUggFFmUwx" role="2OqNvi">
+                                                  <ref role="37wK5l" to="et5u:~IMessage.getText()" resolve="getText" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="Rh6nW" id="5VUggFFmUwy" role="1bW2Oz">
+                                            <property role="TrG5h" value="it" />
+                                            <node concept="2jxLKc" id="5VUggFFmUwz" role="1tU5fm" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="YS8fn" id="5VUggFF0pbV" role="3cqZAp">
+                      <node concept="2ShNRf" id="5VUggFF0qga" role="YScLw">
+                        <node concept="1pGfFk" id="5VUggFF0t_3" role="2ShVmc">
+                          <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
+                          <node concept="2OqwBi" id="5VUggFFmWG$" role="37wK5m">
+                            <node concept="37vLTw" id="5VUggFFmVrK" role="2Oq$k0">
+                              <ref role="3cqZAo" node="5VUggFFmoqh" resolve="message" />
+                            </node>
+                            <node concept="liA8E" id="5VUggFFmY4x" role="2OqNvi">
+                              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                   <node concept="3eOSWO" id="5zgShfbCz6K" role="3clFbw">
                     <node concept="3cmrfG" id="5zgShfbCz6L" role="3uHU7w">

From 306280cc9be3d2328b074ae4261d35d5b9d4613c Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 25 Apr 2022 09:33:19 +0200
Subject: [PATCH 6/7] Tracer: Only set showInAnyCase flag if requested

---
 .../com/mbeddr/mpsutil/interpreter/rt.mps     | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
index 415c1c9f12f..8322246afab 100755
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps
@@ -15198,15 +15198,17 @@
             <ref role="3cqZAo" node="5d4Vabvrrrk" resolve="n" />
           </node>
         </node>
-        <node concept="3clFbF" id="5d4VabvrwtP" role="3cqZAp">
-          <node concept="37vLTI" id="5d4VabvrwXJ" role="3clFbG">
-            <node concept="3clFbT" id="5d4Vabvrx6Y" role="37vLTx">
-              <property role="3clFbU" value="true" />
-            </node>
-            <node concept="37vLTw" id="5d4VabvrwtN" role="37vLTJ">
-              <ref role="3cqZAo" node="5d4VabvrpXe" resolve="showInAnyCase" />
+        <node concept="3clFbJ" id="47bd3LX2C1X" role="3cqZAp">
+          <node concept="3clFbS" id="47bd3LX2C1Z" role="3clFbx">
+            <node concept="3clFbF" id="47bd3LX2EaX" role="3cqZAp">
+              <node concept="1rXfSq" id="47bd3LX2EaV" role="3clFbG">
+                <ref role="37wK5l" node="5syY_AL3BL8" resolve="markAsShowInAnyCase" />
+              </node>
             </node>
           </node>
+          <node concept="37vLTw" id="47bd3LX2D70" role="3clFbw">
+            <ref role="3cqZAo" node="5d4Vabvrt$O" resolve="showAlways" />
+          </node>
         </node>
       </node>
       <node concept="37vLTG" id="5d4Vabvrrrk" role="3clF46">
@@ -15826,15 +15828,22 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="5syY_ALIlwJ" role="3cqZAp">
-          <node concept="2OqwBi" id="5syY_ALIlP5" role="3clFbG">
-            <node concept="37vLTw" id="5syY_ALIlwH" role="2Oq$k0">
-              <ref role="3cqZAo" node="5syY_ALIamg" resolve="t" />
-            </node>
-            <node concept="liA8E" id="5syY_ALImyL" role="2OqNvi">
-              <ref role="37wK5l" node="5syY_AL3BL8" resolve="markAsShowInAnyCase" />
+        <node concept="3clFbJ" id="47bd3LX2Kxy" role="3cqZAp">
+          <node concept="3clFbS" id="47bd3LX2Kx$" role="3clFbx">
+            <node concept="3clFbF" id="5syY_ALIlwJ" role="3cqZAp">
+              <node concept="2OqwBi" id="5syY_ALIlP5" role="3clFbG">
+                <node concept="37vLTw" id="5syY_ALIlwH" role="2Oq$k0">
+                  <ref role="3cqZAo" node="5syY_ALIamg" resolve="t" />
+                </node>
+                <node concept="liA8E" id="5syY_ALImyL" role="2OqNvi">
+                  <ref role="37wK5l" node="5syY_AL3BL8" resolve="markAsShowInAnyCase" />
+                </node>
+              </node>
             </node>
           </node>
+          <node concept="37vLTw" id="47bd3LX2P31" role="3clFbw">
+            <ref role="3cqZAo" node="5syY_ALIgPL" resolve="showInAnyCase" />
+          </node>
         </node>
         <node concept="3clFbF" id="5syY_ALIn6b" role="3cqZAp">
           <node concept="2OqwBi" id="5syY_ALInr2" role="3clFbG">

From 4244c2e7fa125673741b6a3b0e7e5aef152de145 Mon Sep 17 00:00:00 2001
From: Wladimir Safonov <wladimir.safonov@itemis.de>
Date: Wed, 4 May 2022 17:06:15 +0200
Subject: [PATCH 7/7] genplans: removed reference to non-existing richtext
 generator

* richtext generator was empty and has been recently removed
---
 .../solutions/com.mbeddr.xmodel.plan/models/genplan.mps    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps
index 61141436ae7..1430030a30e 100644
--- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps
+++ b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps
@@ -33,7 +33,6 @@
     <import index="8ztd" ref="r:359a1f2d-1387-40bb-b161-9ae44585a023(com.mbeddr.core.udt.generator.template.main@generator)" implicit="true" />
     <import index="55ds" ref="r:b96d3d41-0689-4c87-9cb2-c68348742fc5(com.mbeddr.ext.components.generator.main.dummy@generator)" implicit="true" />
     <import index="jao2" ref="5d4cc688-63a8-4f95-aa0c-9d6d1a58cf75/r:43c07e77-b032-4380-8e31-f6608c958255(com.mbeddr.mpsutil.review.annotation#8455208232410315500/com.mbeddr.mpsutil.review.annotation.generator.template.main@generator)" implicit="true" />
-    <import index="7e8p" ref="r:03892136-2eeb-485b-8f8a-60160e054ca2(de.slisson.mps.richtext.generator.template.main@generator)" implicit="true" />
   </imports>
   <registry>
     <language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
@@ -393,12 +392,6 @@
         <ref role="3Vl8EH" to="jao2:7lmVLrULBFH" resolve="main" />
       </node>
     </node>
-    <node concept="2Pg1uL" id="3jTGQV$9V$z" role="2VgMA7">
-      <node concept="2Pgd6e" id="3jTGQV$9V$$" role="1t_9vn" />
-      <node concept="3Vl8EG" id="3jTGQV$9V$_" role="3VlUeB">
-        <ref role="3Vl8EH" to="7e8p:7HEwqRqEoj3" resolve="main" />
-      </node>
-    </node>
   </node>
 </model>