Skip to content

Commit 9e7fc19

Browse files
Merge pull request #2925 from mbeddr/merge/mps20243
Merge maintenance/mps20241 into maintenance/mps20243
2 parents e09d23c + d9579b4 commit 9e7fc19

File tree

1 file changed

+105
-0
lines changed
  • code/languages/com.mbeddr.platform.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform

1 file changed

+105
-0
lines changed

code/languages/com.mbeddr.platform.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,9 @@
297297
<node concept="m$_yC" id="5ZsrU$Jfnm_" role="m$_yJ">
298298
<ref role="m$_y1" node="5fGcQI8WTaQ" resolve="com.mbeddr.mpsutil.smodule" />
299299
</node>
300+
<node concept="m$_yC" id="5I3PmkSnDSy" role="m$_yJ">
301+
<ref role="m$_y1" to="90a9:6hpTCZQdXQX" resolve="com.mbeddr.mpsutil.editor.querylist" />
302+
</node>
300303
<node concept="m$_yC" id="64SK4bcNSkG" role="m$_yJ">
301304
<ref role="m$_y1" to="90a9:4p3FRivDLPy" resolve="org.apache.commons" />
302305
</node>
@@ -310,6 +313,9 @@
310313
<node concept="m$_yC" id="4wBLq3Y5yV5" role="m$_yJ">
311314
<ref role="m$_y1" to="90a9:2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
312315
</node>
316+
<node concept="m$_yC" id="5I3PmkSnAYo" role="m$_yJ">
317+
<ref role="m$_y1" to="90a9:2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
318+
</node>
313319
<node concept="m$_yC" id="2DDNE2eaR2F" role="m$_yJ">
314320
<ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
315321
</node>
@@ -557,6 +563,21 @@
557563
<node concept="m$_yC" id="6rBfBe1WsaJ" role="m$_yJ">
558564
<ref role="m$_y1" to="90a9:1sO539bGQvt" resolve="de.slisson.mps.richtext" />
559565
</node>
566+
<node concept="m$_yC" id="5I3PmkSnEHL" role="m$_yJ">
567+
<ref role="m$_y1" to="90a9:F1NWDqr5lJ" resolve="de.itemis.mps.grammarcells" />
568+
</node>
569+
<node concept="m$_yC" id="5I3PmkSnF5a" role="m$_yJ">
570+
<ref role="m$_y1" to="90a9:6hpTCZQdXQX" resolve="com.mbeddr.mpsutil.editor.querylist" />
571+
</node>
572+
<node concept="m$_yC" id="5I3PmkSnFtC" role="m$_yJ">
573+
<ref role="m$_y1" node="3lZeU8ehrPx" resolve="com.mbeddr.mpsutil.httpsupport" />
574+
</node>
575+
<node concept="m$_yC" id="5I3PmkSnIxk" role="m$_yJ">
576+
<ref role="m$_y1" to="90a9:6860Y5_ZW8e" resolve="de.itemis.mps.utils" />
577+
</node>
578+
<node concept="m$_yC" id="5I3PmkSnO_X" role="m$_yJ">
579+
<ref role="m$_y1" to="90a9:2NyZxKpUXYJ" resolve="de.itemis.mps.blutil" />
580+
</node>
560581
<node concept="m$_yC" id="6rBfBe1Wuqz" role="m$_yJ">
561582
<ref role="m$_y1" node="5fGcQI94fMR" resolve="com.mbeddr.mpsutil.common" />
562583
</node>
@@ -723,6 +744,9 @@
723744
<node concept="m$_yC" id="7VbYB1xE_k8" role="m$_yJ">
724745
<ref role="m$_y1" to="90a9:2NyZxKpUXYJ" resolve="de.itemis.mps.blutil" />
725746
</node>
747+
<node concept="m$_yC" id="5I3PmkSnxih" role="m$_yJ">
748+
<ref role="m$_y1" to="90a9:29so9Vb$6Tj" resolve="de.slisson.mps.tables" />
749+
</node>
726750
<node concept="m$_yC" id="64SK4bcNIGW" role="m$_yJ">
727751
<ref role="m$_y1" node="64SK4bcNyQW" resolve="com.mbeddr.mpsutil.editorsupport" />
728752
</node>
@@ -910,6 +934,12 @@
910934
<node concept="m$_yC" id="3mZVitHC1kc" role="m$_yJ">
911935
<ref role="m$_y1" to="90a9:4p3FRivDLPy" resolve="org.apache.commons" />
912936
</node>
937+
<node concept="m$_yC" id="5I3PmkSnScv" role="m$_yJ">
938+
<ref role="m$_y1" to="90a9:6hpTCZQdXQX" resolve="com.mbeddr.mpsutil.editor.querylist" />
939+
</node>
940+
<node concept="m$_yC" id="5I3PmkSnSzS" role="m$_yJ">
941+
<ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
942+
</node>
913943
</node>
914944
<node concept="m$_wf" id="6hpTCZQe7wE" role="3989C9">
915945
<property role="m$_wk" value="com.mbeddr.mpsutil.placeholderTextList" />
@@ -971,6 +1001,9 @@
9711001
<node concept="m$_yC" id="5fGcQI94m18" role="m$_yJ">
9721002
<ref role="m$_y1" node="5fGcQI94fMR" resolve="com.mbeddr.mpsutil.common" />
9731003
</node>
1004+
<node concept="m$_yC" id="5I3PmkSnwrX" role="m$_yJ">
1005+
<ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
1006+
</node>
9741007
<node concept="3_J27D" id="5fGcQI93Tz7" role="m_cZH">
9751008
<node concept="3Mxwew" id="5fGcQI93Tz8" role="3MwsjC">
9761009
<property role="3MwjfP" value="com.mbeddr.mpsutil.wizardwizard" />
@@ -1024,6 +1057,9 @@
10241057
<node concept="m$_yC" id="1xlcIshd7bT" role="m$_yJ">
10251058
<ref role="m$_y1" to="ffeo:4O0hKJpjIV3" resolve="jetbrains.mps.ide.devkit" />
10261059
</node>
1060+
<node concept="m$_yC" id="5I3PmkSnvQI" role="m$_yJ">
1061+
<ref role="m$_y1" to="90a9:F1NWDqr5lJ" resolve="de.itemis.mps.grammarcells" />
1062+
</node>
10271063
</node>
10281064
<node concept="m$_wf" id="5fGcQI94fMR" role="3989C9">
10291065
<property role="m$_wk" value="com.mbeddr.mpsutil.common" />
@@ -1046,6 +1082,12 @@
10461082
<node concept="m$_yC" id="5fGcQI94fMY" role="m$_yJ">
10471083
<ref role="m$_y1" to="ffeo:4k71ibbLe59" resolve="com.intellij.modules.mps" />
10481084
</node>
1085+
<node concept="m$_yC" id="5I3PmkSnyzc" role="m$_yJ">
1086+
<ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
1087+
</node>
1088+
<node concept="m$_yC" id="5I3PmkSnTcx" role="m$_yJ">
1089+
<ref role="m$_y1" to="90a9:4p3FRivDLPy" resolve="org.apache.commons" />
1090+
</node>
10491091
<node concept="3_J27D" id="5fGcQI94fMZ" role="m_cZH">
10501092
<node concept="3Mxwew" id="5fGcQI94fN0" role="3MwsjC">
10511093
<property role="3MwjfP" value="com.mbeddr.mpsutil.common" />
@@ -1295,6 +1337,15 @@
12951337
<node concept="m$_yC" id="ZhAg9Tj4d0" role="m$_yJ">
12961338
<ref role="m$_y1" to="90a9:4be$WTb1MZD" resolve="de.itemis.mps.editor.diagram" />
12971339
</node>
1340+
<node concept="m$_yC" id="5I3PmkSo5Z8" role="m$_yJ">
1341+
<ref role="m$_y1" node="64SK4bcNyQW" resolve="com.mbeddr.mpsutil.editorsupport" />
1342+
</node>
1343+
<node concept="m$_yC" id="5I3PmkSo9cG" role="m$_yJ">
1344+
<ref role="m$_y1" node="59sJF$9ugx_" resolve="com.mbeddr.mpsutil.spreferences" />
1345+
</node>
1346+
<node concept="m$_yC" id="5I3PmkSodlM" role="m$_yJ">
1347+
<ref role="m$_y1" node="nnCEsSfXF5" resolve="com.mbeddr.mpsutil.refactoring" />
1348+
</node>
12981349
<node concept="m$_yC" id="26FYVWAjM5F" role="m$_yJ">
12991350
<ref role="m$_y1" to="90a9:6hpTCZQdXQX" resolve="com.mbeddr.mpsutil.editor.querylist" />
13001351
</node>
@@ -1428,6 +1479,9 @@
14281479
<node concept="m$_yC" id="64SK4bcNM6e" role="m$_yJ">
14291480
<ref role="m$_y1" node="64SK4bcNyQW" resolve="com.mbeddr.mpsutil.editorsupport" />
14301481
</node>
1482+
<node concept="m$_yC" id="5I3PmkSozeS" role="m$_yJ">
1483+
<ref role="m$_y1" node="NMVW79yitG" resolve="com.mbeddr.mpsutil.userstyles" />
1484+
</node>
14311485
<node concept="3_J27D" id="7tNo_gxoK8o" role="m_cZH">
14321486
<node concept="3Mxwew" id="7tNo_gxoK8p" role="3MwsjC">
14331487
<property role="3MwjfP" value="mbeddr.doc" />
@@ -1502,6 +1556,9 @@
15021556
<node concept="m$_yC" id="59sJF$9uyDy" role="m$_yJ">
15031557
<ref role="m$_y1" to="ffeo:4k71ibbLe59" resolve="com.intellij.modules.mps" />
15041558
</node>
1559+
<node concept="m$_yC" id="5I3PmkSog$r" role="m$_yJ">
1560+
<ref role="m$_y1" to="90a9:7szUFELHeHf" resolve="de.itemis.mps.editor.widgets" />
1561+
</node>
15051562
<node concept="m$f5U" id="59sJF$9uiZw" role="m$_yh">
15061563
<ref role="m$f5T" node="3quoVcnJkAK" resolve="group.spreferences" />
15071564
</node>
@@ -1541,9 +1598,18 @@
15411598
<node concept="m$_yC" id="NlXl$eqRcj" role="m$_yJ">
15421599
<ref role="m$_y1" to="90a9:1sO539bGQvt" resolve="de.slisson.mps.richtext" />
15431600
</node>
1601+
<node concept="m$_yC" id="5I3PmkSojMJ" role="m$_yJ">
1602+
<ref role="m$_y1" to="90a9:6hpTCZQdXQX" resolve="com.mbeddr.mpsutil.editor.querylist" />
1603+
</node>
1604+
<node concept="m$_yC" id="5I3PmkSoh08" role="m$_yJ">
1605+
<ref role="m$_y1" to="90a9:7szUFELHeHf" resolve="de.itemis.mps.editor.widgets" />
1606+
</node>
15441607
<node concept="m$_yC" id="NlXl$eqXt4" role="m$_yJ">
15451608
<ref role="m$_y1" to="90a9:4p3FRivDLPy" resolve="org.apache.commons" />
15461609
</node>
1610+
<node concept="m$_yC" id="5I3PmkSoyEz" role="m$_yJ">
1611+
<ref role="m$_y1" to="90a9:4be$WTb1MZD" resolve="de.itemis.mps.editor.diagram" />
1612+
</node>
15471613
<node concept="m$f5U" id="NlXl$eqByF" role="m$_yh">
15481614
<ref role="m$f5T" node="3quoVcnJTPD" resolve="group.margincell_review" />
15491615
</node>
@@ -3305,6 +3371,9 @@
33053371
<node concept="m$_yC" id="3VIBP3dq_3y" role="m$_yJ">
33063372
<ref role="m$_y1" node="Vtr7jyB0oM" resolve="com.mbeddr.mpsutil.filepicker" />
33073373
</node>
3374+
<node concept="m$_yC" id="5I3PmkSokIM" role="m$_yJ">
3375+
<ref role="m$_y1" to="90a9:2NyZxKpUXYJ" resolve="de.itemis.mps.blutil" />
3376+
</node>
33083377
</node>
33093378
<node concept="2G$12M" id="3quoVcnR1gA" role="3989C9">
33103379
<property role="TrG5h" value="group.ui-support" />
@@ -7672,6 +7741,9 @@
76727741
<node concept="m$_yC" id="nnCEsShyGw" role="m$_yJ">
76737742
<ref role="m$_y1" node="6rBfBe1XaAA" resolve="com.mbeddr.mpsutil.contextactions" />
76747743
</node>
7744+
<node concept="m$_yC" id="5I3PmkSom8w" role="m$_yJ">
7745+
<ref role="m$_y1" node="64SK4bcNyQW" resolve="com.mbeddr.mpsutil.editorsupport" />
7746+
</node>
76757747
<node concept="2iUeEo" id="7yAshxDtx45" role="2iVFfd">
76767748
<property role="2iUeEt" value="mbeddr" />
76777749
<property role="2iUeEu" value="http://mbeddr.com" />
@@ -16587,6 +16659,9 @@
1658716659
<node concept="m$_yC" id="7yAshxDtwsn" role="m$_yJ">
1658816660
<ref role="m$_y1" to="90a9:4p3FRivDLPy" resolve="org.apache.commons" />
1658916661
</node>
16662+
<node concept="m$_yC" id="5I3PmkSov7K" role="m$_yJ">
16663+
<ref role="m$_y1" to="90a9:2NyZxKpUXYJ" resolve="de.itemis.mps.blutil" />
16664+
</node>
1659016665
</node>
1659116666
<node concept="2G$12M" id="3Gj8GGYjpUG" role="3989C9">
1659216667
<property role="TrG5h" value="group.nodes_tracing" />
@@ -17128,6 +17203,15 @@
1712817203
<node concept="m$_yC" id="75qFqB425iF" role="m$_yJ">
1712917204
<ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
1713017205
</node>
17206+
<node concept="m$_yC" id="5I3PmkSorv$" role="m$_yJ">
17207+
<ref role="m$_y1" to="90a9:F1NWDqr5lJ" resolve="de.itemis.mps.grammarcells" />
17208+
</node>
17209+
<node concept="m$_yC" id="5I3PmkSorPS" role="m$_yJ">
17210+
<ref role="m$_y1" to="90a9:2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
17211+
</node>
17212+
<node concept="m$_yC" id="5I3PmkSovBL" role="m$_yJ">
17213+
<ref role="m$_y1" to="90a9:2NyZxKpUXYJ" resolve="de.itemis.mps.blutil" />
17214+
</node>
1713117215
<node concept="3_J27D" id="NMVW79y25C" role="m_cZH">
1713217216
<node concept="3Mxwew" id="NMVW79y25D" role="3MwsjC">
1713317217
<property role="3MwjfP" value="com.mbeddr.mpsutil.json" />
@@ -18470,6 +18554,12 @@
1847018554
<node concept="m$_yC" id="4JmsWjEr2u_" role="m$_yJ">
1847118555
<ref role="m$_y1" to="90a9:77YfcvOMg42" resolve="de.itemis.mps.compare" />
1847218556
</node>
18557+
<node concept="m$_yC" id="5I3PmkSop8X" role="m$_yJ">
18558+
<ref role="m$_y1" to="90a9:F1NWDqr5lJ" resolve="de.itemis.mps.grammarcells" />
18559+
</node>
18560+
<node concept="m$_yC" id="5I3PmkSoplJ" role="m$_yJ">
18561+
<ref role="m$_y1" to="90a9:2Xjt3l57iTJ" resolve="de.slisson.mps.hacks" />
18562+
</node>
1847318563
</node>
1847418564
<node concept="m$_wf" id="2hNr1jFzOYG" role="3989C9">
1847518565
<property role="m$_wk" value="com.mbeddr.mpsutil.checkinHandler" />
@@ -18485,6 +18575,21 @@
1848518575
<node concept="m$_yC" id="4LY$CIohKH$" role="m$_yJ">
1848618576
<ref role="m$_y1" to="ffeo:1diEraJ0skp" resolve="jetbrains.mps.kotlin" />
1848718577
</node>
18578+
<node concept="m$_yC" id="5I3PmkSoAjD" role="m$_yJ">
18579+
<ref role="m$_y1" to="ffeo:4wxeloVufXr" resolve="jetbrains.mps.git4idea.stubs" />
18580+
</node>
18581+
<node concept="m$_yC" id="5I3PmkSoAHc" role="m$_yJ">
18582+
<ref role="m$_y1" to="ffeo:RJsmGEieyQ" resolve="jetbrains.mps.vcs" />
18583+
</node>
18584+
<node concept="m$_yC" id="5I3PmkSoDQh" role="m$_yJ">
18585+
<ref role="m$_y1" to="90a9:6SVXTgIe8wD" resolve="de.itemis.mps.celllayout" />
18586+
</node>
18587+
<node concept="m$_yC" id="5I3PmkSoGKr" role="m$_yJ">
18588+
<ref role="m$_y1" to="90a9:6Y0V2RJk3uw" resolve="de.itemis.mps.selection" />
18589+
</node>
18590+
<node concept="m$_yC" id="5I3PmkSoJQh" role="m$_yJ">
18591+
<ref role="m$_y1" to="90a9:31bAEZ0srEa" resolve="de.slisson.mps.editor.multiline" />
18592+
</node>
1848818593
<node concept="3_J27D" id="2hNr1jFzOYI" role="m$_yQ">
1848918594
<node concept="3Mxwew" id="2hNr1jFzOYJ" role="3MwsjC">
1849018595
<property role="3MwjfP" value="com.mbeddr.mpsutil.checkinHandler" />

0 commit comments

Comments
 (0)