Skip to content

Commit 78d2543

Browse files
committed
Resolved conflicts
1 parent 62f0200 commit 78d2543

File tree

4 files changed

+37
-40
lines changed

4 files changed

+37
-40
lines changed

build/scripts/build-allScripts.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<module ref="e70ad515-8ff0-4a50-8cb4-41406f14e348(org.iets3.opensource.build.gentests.rt)" kind="rt" />
6060
<module ref="3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform)" kind="cl" />
6161
<module ref="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" kind="cl" />
62+
<module ref="9d000fbd-bdca-4a46-b39b-c5ba9e79b38c(org.iets3.opensource.build.gentests)" kind="cl" />
6263
</dependencies>
6364
<uses>
6465
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
@@ -163,9 +164,9 @@
163164
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
164165
<fileset file="${artifacts.mps}/lib/mps-context.jar" />
165166
<fileset file="${artifacts.mps}/lib/mps-constraints-runtime.jar" />
166-
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
167167
<fileset file="${artifacts.mps}/lib/mps-problem.jar" />
168168
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
169+
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
169170
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
170171
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
171172
<fileset file="${artifacts.mps}/lib/mps-messages-for-rules.jar" />
@@ -194,11 +195,13 @@
194195
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
195196
<fileset file="${artifacts.mps}/lib/util-8.jar" />
196197
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
198+
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
197199
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
198200
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
199201
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
200202
<fileset file="${artifacts.mps}/lib/stats.jar" />
201203
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
204+
<fileset file="${artifacts.mps}/lib/trove.jar" />
202205
<fileset file="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.jar" />
203206
<fileset file="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build/languages/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.jar" />
204207
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/generator/template/org.iets3.core.expr.genjava.simpleTypes.generator.main@generator.mps

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
137137
<child id="1081516765348" name="expression" index="3fr31v" />
138138
</concept>
139-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
139+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
140140
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
141141
<child id="1068499141038" name="actualArgument" index="37wK5m" />
142142
<child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -158,7 +158,7 @@
158158
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
159159
</concept>
160160
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
161-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
161+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
162162
<child id="1178549979242" name="visibility" index="1B3o_S" />
163163
</concept>
164164
<concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
@@ -197,7 +197,7 @@
197197
<child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
198198
</concept>
199199
<concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
200-
<concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ng" index="v9R3L">
200+
<concept id="1722980698497626400" name="jetbrains.mps.lang.generator.structure.ITemplateCall" flags="ngI" index="v9R3L">
201201
<reference id="1722980698497626483" name="template" index="v9R2y" />
202202
</concept>
203203
<concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
@@ -332,7 +332,7 @@
332332
<property id="1757699476691236117" name="name_DebugInfo" index="2qtEX9" />
333333
<property id="1341860900487648621" name="propertyId" index="P4ACc" />
334334
</concept>
335-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
335+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
336336
<property id="1169194664001" name="name" index="TrG5h" />
337337
</concept>
338338
</language>

code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/[email protected]

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@
8787
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
8888
<child id="1068581517665" name="statement" index="3cqZAp" />
8989
</concept>
90-
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
91-
<property id="1068580123138" name="value" index="3clFbU" />
92-
</concept>
9390
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
9491
<property id="1068580320021" name="value" index="3cmrfH" />
9592
</concept>
@@ -2861,16 +2858,12 @@
28612858
<node concept="liA8E" id="3pzPpUGgG1O" role="2OqNvi">
28622859
<ref role="37wK5l" to="tken:3a3EL8RUD5I" resolve="getPlugins" />
28632860
<node concept="1iwH7S" id="3vNUe1zk1zv" role="37wK5m" />
2864-
<node concept="3clFbT" id="3vNUe1zqh0o" role="37wK5m">
2865-
<property role="3clFbU" value="true" />
2866-
</node>
28672861
</node>
28682862
<node concept="37vLTw" id="1bDPmBff00s" role="2Oq$k0">
28692863
<ref role="3cqZAo" node="5VKiljfMls" resolve="modulePlugins" />
28702864
</node>
28712865
</node>
28722866
</node>
2873-
<node concept="3clFbH" id="3a3EL8S1hox" role="3cqZAp" />
28742867
</node>
28752868
</node>
28762869
</node>

code/languages/org.iets3.opensource/solutions/org.iets3.core.junit.interpreter.run.configuration/models/org.iets3.core.junit.interpreter.run.configuration.plugin.mps

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
<import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" />
8787
<import index="707k" ref="r:3b363c34-a1ec-4ae6-92cc-95c0273ad0c2(xml4JUnit)" />
8888
<import index="jpm3" ref="r:e3e5593b-dfcd-4a2e-b10f-f1ed4a43f093(org.iets3.core.expr.plugin.plugin)" />
89+
<import index="lxc5" ref="r:b25f8540-4e18-427d-a8ac-60f947a3fbc1(jetbrains.mps.baselanguage.unitTest.execution)" />
8990
</imports>
9091
<registry>
9192
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -3624,7 +3625,7 @@
36243625
<property role="TrG5h" value="myOutStream" />
36253626
<node concept="3Tm6S6" id="4UL3Yhl8wmM" role="1B3o_S" />
36263627
<node concept="3uibUv" id="4UL3Yhl8wmN" role="1tU5fm">
3627-
<ref role="3uigEE" to="4l68:56tRMpP_bCe" resolve="CommandOutputStream" />
3628+
<ref role="3uigEE" to="34h4:56tRMpP_bCe" resolve="CommandOutputStream" />
36283629
</node>
36293630
</node>
36303631
<node concept="312cEg" id="4UL3Yhl8wmO" role="jymVt">
@@ -3633,7 +3634,7 @@
36333634
<property role="TrG5h" value="myErrStream" />
36343635
<node concept="3Tm6S6" id="4UL3Yhl8wmP" role="1B3o_S" />
36353636
<node concept="3uibUv" id="4UL3Yhl8wmQ" role="1tU5fm">
3636-
<ref role="3uigEE" to="4l68:56tRMpP_bCe" resolve="CommandOutputStream" />
3637+
<ref role="3uigEE" to="34h4:56tRMpP_bCe" resolve="CommandOutputStream" />
36373638
</node>
36383639
</node>
36393640
<node concept="312cEg" id="724B1NsqO9K" role="jymVt">
@@ -3759,7 +3760,7 @@
37593760
</node>
37603761
<node concept="2ShNRf" id="2zLV6oy87UN" role="37vLTx">
37613762
<node concept="1pGfFk" id="2zLV6oy87UO" role="2ShVmc">
3762-
<ref role="37wK5l" to="4l68:56tRMpP_bCf" resolve="CommandOutputStream" />
3763+
<ref role="37wK5l" to="34h4:56tRMpP_bCf" />
37633764
<node concept="10M0yZ" id="2zLV6oy87UP" role="37wK5m">
37643765
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
37653766
<ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
@@ -3775,7 +3776,7 @@
37753776
</node>
37763777
<node concept="2ShNRf" id="2zLV6oy87UV" role="37vLTx">
37773778
<node concept="1pGfFk" id="2zLV6oy87UW" role="2ShVmc">
3778-
<ref role="37wK5l" to="4l68:56tRMpP_bCf" resolve="CommandOutputStream" />
3779+
<ref role="37wK5l" to="34h4:56tRMpP_bCf" />
37793780
<node concept="10M0yZ" id="2zLV6oy87UX" role="37wK5m">
37803781
<ref role="1PxDUh" to="wyt6:~System" resolve="System" />
37813782
<ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
@@ -13280,7 +13281,7 @@
1328013281
<property role="TrG5h" value="myOutput" />
1328113282
<node concept="3Tm6S6" id="56tRMpP_bxA" role="1B3o_S" />
1328213283
<node concept="3uibUv" id="56tRMpP_bxB" role="1tU5fm">
13283-
<ref role="3uigEE" to="4l68:56tRMpP_bCe" resolve="CommandOutputStream" />
13284+
<ref role="3uigEE" to="34h4:56tRMpP_bCe" resolve="CommandOutputStream" />
1328413285
</node>
1328513286
</node>
1328613287
<node concept="312cEg" id="4$$HofN712e" role="jymVt">
@@ -13349,8 +13350,8 @@
1334913350
<node concept="1rXfSq" id="7uaFES0cB89" role="3clFbG">
1335013351
<ref role="37wK5l" node="56tRMpP_bzv" resolve="printSyncToken" />
1335113352
<node concept="10M0yZ" id="7uaFES0cLfn" role="37wK5m">
13352-
<ref role="3cqZAo" to="tpnd:2Zbjobgnloc" resolve="START_TESTRUN" />
13353-
<ref role="1PxDUh" to="tpnd:1zHDQsywvgL" resolve="TestEventMessage" />
13353+
<ref role="3cqZAo" to="lxc5:2Zbjobgnloc" resolve="START_TESTRUN" />
13354+
<ref role="1PxDUh" to="lxc5:1zHDQsywvgL" resolve="TestEventMessage" />
1335413355
</node>
1335513356
<node concept="37vLTw" id="7uaFES0cEzD" role="37wK5m">
1335613357
<ref role="3cqZAo" node="7uaFES0czFy" resolve="description" />
@@ -13395,8 +13396,8 @@
1339513396
<node concept="1rXfSq" id="7uaFES0cB34" role="3clFbG">
1339613397
<ref role="37wK5l" node="56tRMpP_bzv" resolve="printSyncToken" />
1339713398
<node concept="10M0yZ" id="7uaFES0cLgc" role="37wK5m">
13398-
<ref role="3cqZAo" to="tpnd:2Zbjobgnlt2" resolve="FINISH_TESTRUN" />
13399-
<ref role="1PxDUh" to="tpnd:1zHDQsywvgL" resolve="TestEventMessage" />
13399+
<ref role="3cqZAo" to="lxc5:2Zbjobgnlt2" resolve="FINISH_TESTRUN" />
13400+
<ref role="1PxDUh" to="lxc5:1zHDQsywvgL" resolve="TestEventMessage" />
1340013401
</node>
1340113402
<node concept="37vLTw" id="7uaFES0cG3G" role="37wK5m">
1340213403
<ref role="3cqZAo" node="4$$HofN712e" resolve="descriptionOnStartRun" />
@@ -13428,9 +13429,9 @@
1342813429
<node concept="3clFbF" id="56tRMpP_by3" role="3cqZAp">
1342913430
<node concept="1rXfSq" id="7uaFES0cBbS" role="3clFbG">
1343013431
<ref role="37wK5l" node="56tRMpP_bzv" resolve="printSyncToken" />
13431-
<node concept="10M0yZ" id="31Rnc32c5rJ" role="37wK5m">
13432-
<ref role="1PxDUh" to="tpnd:1zHDQsywvgL" resolve="TestEventMessage" />
13433-
<ref role="3cqZAo" to="tpnd:1zHDQsywvlu" resolve="FINISH_TEST" />
13432+
<node concept="10M0yZ" id="jp0dTAkmED" role="37wK5m">
13433+
<ref role="3cqZAo" to="lxc5:1zHDQsywvlu" resolve="FINISH_TEST" />
13434+
<ref role="1PxDUh" to="lxc5:1zHDQsywvgL" resolve="TestEventMessage" />
1343413435
</node>
1343513436
<node concept="37vLTw" id="2BHiRxgm_jj" role="37wK5m">
1343613437
<ref role="3cqZAo" node="56tRMpP_bxZ" resolve="description" />
@@ -13463,8 +13464,8 @@
1346313464
<node concept="1rXfSq" id="7uaFES0cBgj" role="3clFbG">
1346413465
<ref role="37wK5l" node="56tRMpP_bzv" resolve="printSyncToken" />
1346513466
<node concept="10M0yZ" id="31Rnc32c5oz" role="37wK5m">
13466-
<ref role="1PxDUh" to="tpnd:1zHDQsywvgL" resolve="TestEventMessage" />
13467-
<ref role="3cqZAo" to="tpnd:1zHDQsywvly" resolve="FAILURE_TEST_BEGIN" />
13467+
<ref role="1PxDUh" to="lxc5:1zHDQsywvgL" resolve="TestEventMessage" />
13468+
<ref role="3cqZAo" to="lxc5:1zHDQsywvly" resolve="FAILURE_TEST_BEGIN" />
1346813469
</node>
1346913470
<node concept="2OqwBi" id="3ViSmQmj_TX" role="37wK5m">
1347013471
<node concept="37vLTw" id="2BHiRxgmNCO" role="2Oq$k0">
@@ -13546,8 +13547,8 @@
1354613547
<node concept="1rXfSq" id="3ViSmQmsqNG" role="3clFbG">
1354713548
<ref role="37wK5l" node="56tRMpP_bzv" resolve="printSyncToken" />
1354813549
<node concept="10M0yZ" id="3ViSmQmsqNH" role="37wK5m">
13549-
<ref role="1PxDUh" to="tpnd:1zHDQsywvgL" resolve="TestEventMessage" />
13550-
<ref role="3cqZAo" to="tpnd:1zHDQsywvly" resolve="FAILURE_TEST_BEGIN" />
13550+
<ref role="1PxDUh" to="lxc5:1zHDQsywvgL" resolve="TestEventMessage" />
13551+
<ref role="3cqZAo" to="lxc5:1zHDQsywvly" resolve="FAILURE_TEST_BEGIN" />
1355113552
</node>
1355213553
<node concept="37vLTw" id="3ViSmQmt9LG" role="37wK5m">
1355313554
<ref role="3cqZAo" node="3ViSmQmsHyn" resolve="description" />
@@ -13598,9 +13599,9 @@
1359813599
<node concept="3clFbF" id="56tRMpP_byP" role="3cqZAp">
1359913600
<node concept="1rXfSq" id="7uaFES0cBkg" role="3clFbG">
1360013601
<ref role="37wK5l" node="56tRMpP_bzv" resolve="printSyncToken" />
13601-
<node concept="10M0yZ" id="31Rnc32c5m2" role="37wK5m">
13602-
<ref role="1PxDUh" to="tpnd:1zHDQsywvgL" resolve="TestEventMessage" />
13603-
<ref role="3cqZAo" to="tpnd:1zHDQsywvlE" resolve="ASSUMPTION_FAILURE_TEST_PREFIX" />
13602+
<node concept="10M0yZ" id="jp0dTAkj5I" role="37wK5m">
13603+
<ref role="3cqZAo" to="lxc5:1zHDQsywvlE" resolve="ASSUMPTION_FAILURE_TEST_PREFIX" />
13604+
<ref role="1PxDUh" to="lxc5:1zHDQsywvgL" resolve="TestEventMessage" />
1360413605
</node>
1360513606
<node concept="2OqwBi" id="56tRMpP_byU" role="37wK5m">
1360613607
<node concept="37vLTw" id="2BHiRxgm8_0" role="2Oq$k0">
@@ -13638,8 +13639,8 @@
1363813639
<node concept="1rXfSq" id="7uaFES0cBo4" role="3clFbG">
1363913640
<ref role="37wK5l" node="56tRMpP_bzv" resolve="printSyncToken" />
1364013641
<node concept="10M0yZ" id="31Rnc32c5jH" role="37wK5m">
13641-
<ref role="1PxDUh" to="tpnd:1zHDQsywvgL" resolve="TestEventMessage" />
13642-
<ref role="3cqZAo" to="tpnd:5d37arGBotJ" resolve="IGNORE_FAILURE_TEST_PREFIX" />
13642+
<ref role="1PxDUh" to="lxc5:1zHDQsywvgL" resolve="TestEventMessage" />
13643+
<ref role="3cqZAo" to="lxc5:5d37arGBotJ" resolve="IGNORE_FAILURE_TEST_PREFIX" />
1364313644
</node>
1364413645
<node concept="37vLTw" id="5d37arGBqgb" role="37wK5m">
1364513646
<ref role="3cqZAo" node="5d37arGBqg2" resolve="description" />
@@ -13700,8 +13701,8 @@
1370013701
<node concept="1rXfSq" id="4hiugqyzhK9" role="3clFbG">
1370113702
<ref role="37wK5l" node="56tRMpP_bzv" resolve="printSyncToken" />
1370213703
<node concept="10M0yZ" id="31Rnc32c5w2" role="37wK5m">
13703-
<ref role="1PxDUh" to="tpnd:1zHDQsywvgL" resolve="TestEventMessage" />
13704-
<ref role="3cqZAo" to="tpnd:1zHDQsywvlq" resolve="START_TEST" />
13704+
<ref role="1PxDUh" to="lxc5:1zHDQsywvgL" resolve="TestEventMessage" />
13705+
<ref role="3cqZAo" to="lxc5:1zHDQsywvlq" resolve="START_TEST" />
1370513706
</node>
1370613707
<node concept="37vLTw" id="2BHiRxgm_5v" role="37wK5m">
1370713708
<ref role="3cqZAo" node="56tRMpP_bzj" resolve="description" />
@@ -13913,7 +13914,7 @@
1391313914
<ref role="3cqZAo" node="56tRMpP_bx_" resolve="myOutput" />
1391413915
</node>
1391513916
<node concept="liA8E" id="56tRMpP_bzU" role="2OqNvi">
13916-
<ref role="37wK5l" to="4l68:56tRMpP_bEb" resolve="writeCommand" />
13917+
<ref role="37wK5l" to="34h4:56tRMpP_bEb" resolve="writeCommand" />
1391713918
<node concept="2OqwBi" id="1zHDQsywvln" role="37wK5m">
1391813919
<node concept="37vLTw" id="3GM_nagTtUS" role="2Oq$k0">
1391913920
<ref role="3cqZAo" node="1zHDQsywvkv" resolve="builder" />
@@ -13931,7 +13932,7 @@
1393113932
<ref role="3cqZAo" node="56tRMpP_bx_" resolve="myOutput" />
1393213933
</node>
1393313934
<node concept="liA8E" id="56tRMpP_bzZ" role="2OqNvi">
13934-
<ref role="37wK5l" to="4l68:56tRMpP_bEL" resolve="flushSafe" />
13935+
<ref role="37wK5l" to="34h4:56tRMpP_bEL" resolve="flushSafe" />
1393513936
</node>
1393613937
</node>
1393713938
</node>
@@ -13998,7 +13999,7 @@
1399813999
<node concept="37vLTG" id="62vWlLjtTGX" role="3clF46">
1399914000
<property role="TrG5h" value="out" />
1400014001
<node concept="3uibUv" id="62vWlLjtTGY" role="1tU5fm">
14001-
<ref role="3uigEE" to="4l68:56tRMpP_bCe" resolve="CommandOutputStream" />
14002+
<ref role="3uigEE" to="34h4:56tRMpP_bCe" resolve="CommandOutputStream" />
1400214003
</node>
1400314004
</node>
1400414005
<node concept="3Tm1VV" id="62vWlLjtTH0" role="1B3o_S" />
@@ -14325,7 +14326,7 @@
1432514326
<node concept="37vLTG" id="62vWlLju9sE" role="3clF46">
1432614327
<property role="TrG5h" value="out" />
1432714328
<node concept="3uibUv" id="62vWlLju9sF" role="1tU5fm">
14328-
<ref role="3uigEE" to="4l68:56tRMpP_bCe" resolve="CommandOutputStream" />
14329+
<ref role="3uigEE" to="34h4:56tRMpP_bCe" resolve="CommandOutputStream" />
1432914330
</node>
1433014331
</node>
1433114332
<node concept="3Tm1VV" id="62vWlLju9sH" role="1B3o_S" />
@@ -14343,7 +14344,7 @@
1434314344
<node concept="37vLTG" id="56tRMpP_bxR" role="3clF46">
1434414345
<property role="TrG5h" value="out" />
1434514346
<node concept="3uibUv" id="56tRMpP_bxS" role="1tU5fm">
14346-
<ref role="3uigEE" to="4l68:56tRMpP_bCe" resolve="CommandOutputStream" />
14347+
<ref role="3uigEE" to="34h4:56tRMpP_bCe" resolve="CommandOutputStream" />
1434714348
</node>
1434814349
</node>
1434914350
<node concept="3clFbS" id="62vWlLjtG_W" role="3clF47" />

0 commit comments

Comments
 (0)