Skip to content

Commit 875dc41

Browse files
arimerarimer
authored
Merge pull request #1382 from IETS3/merge/mps20241
Merge maintenance/mps20241 into maintenance/mps20251
2 parents c85f182 + 3292a1a commit 875dc41

File tree

11 files changed

+1
-49
lines changed

11 files changed

+1
-49
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ classes_gen
4545
source_gen
4646
source_gen.caches
4747
test_gen
48+
doc_gen
4849
test_gen.caches
4950
code/languages/*/*.iws
5051
code/languages/*/build.properties

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/doc_gen/images/README.txt‎

Whitespace-only changes.

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/doc_gen/images/README.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎code/languages/org.iets3.opensource/tests/test.components.functional/models/mpinterface@tests.mps‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
</concept>
3838
<concept id="428590876651279930" name="jetbrains.mps.lang.test.structure.NodeTypeSystemErrorCheckOperation" flags="ng" index="2DdRWr" />
3939
<concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
40-
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
41-
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
42-
</concept>
4340
<concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
4441
<property id="2616911529524314943" name="accessMode" index="3DII0k" />
4542
<child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
@@ -932,8 +929,5 @@
932929
</node>
933930
</node>
934931
</node>
935-
<node concept="2XOHcx" id="4rZeNQ6M9GV">
936-
<property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
937-
</node>
938932
</model>
939933

‎code/languages/org.iets3.opensource/tests/test.iets3.components.toplevel.adapter/models/scopetest@tests.mps‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<reference id="5449224527592117654" name="checkingReference" index="1BTHP0" />
1717
<child id="3655334166513314307" name="nodes" index="3KTr4d" />
1818
</concept>
19-
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
20-
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
21-
</concept>
2219
<concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
2320
<property id="2616911529524314943" name="accessMode" index="3DII0k" />
2421
<child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
@@ -163,8 +160,5 @@
163160
</node>
164161
</node>
165162
</node>
166-
<node concept="2XOHcx" id="4rZeNQ6M9GV">
167-
<property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
168-
</node>
169163
</model>
170164

‎code/languages/org.iets3.opensource/tests/test.iets3.core.mapping/models/test/iets3/core/mapping/tests@completeness.mps‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
<reference id="8333855927540250453" name="declaration" index="39XzEq" />
3737
</concept>
3838
<concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
39-
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
40-
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
41-
</concept>
4239
<concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
4340
<concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
4441
<property id="2616911529524314943" name="accessMode" index="3DII0k" />
@@ -1598,9 +1595,6 @@
15981595
</node>
15991596
</node>
16001597
</node>
1601-
<node concept="2XOHcx" id="JbnHRloz9F">
1602-
<property role="2XOHcw" value="${iets3.github.core.home}/code/languages/org.iets3.core" />
1603-
</node>
16041598
<node concept="1lH9Xt" id="5am5hXlPRKC">
16051599
<property role="TrG5h" value="TreeConstruction" />
16061600
<property role="3DII0k" value="2hh8MJdVwqX/command" />

‎code/languages/org.iets3.opensource/tests/test.iets3.safety.attributes/models/test/iets3/safety/attributes/asil@tests.mps‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
</imports>
1818
<registry>
1919
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
20-
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
21-
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
22-
</concept>
2320
<concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
2421
<property id="2616911529524314943" name="accessMode" index="3DII0k" />
2522
<child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
@@ -1169,8 +1166,5 @@
11691166
</node>
11701167
</node>
11711168
</node>
1172-
<node concept="2XOHcx" id="4rZeNQ6M9GV">
1173-
<property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
1174-
</node>
11751169
</model>
11761170

‎code/languages/org.iets3.opensource/tests/test.org.iets3.protocol.transport/models/checks@tests.mps‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
<reference id="8333855927540250453" name="declaration" index="39XzEq" />
2323
</concept>
2424
<concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
25-
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
26-
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
27-
</concept>
2825
<concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
2926
<property id="2616911529524314943" name="accessMode" index="3DII0k" />
3027
<child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
@@ -78,8 +75,5 @@
7875
</node>
7976
</node>
8077
</node>
81-
<node concept="2XOHcx" id="4rZeNQ6M9GV">
82-
<property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
83-
</node>
8478
</model>
8579

‎code/languages/org.iets3.opensource/tests/test.org.iets3.protocol.transport/models/test/org/iets3/protocol/transport/bh@tests.mps‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
</imports>
1818
<registry>
1919
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
20-
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
21-
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
22-
</concept>
2320
<concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
2421
<property id="2616911529524314943" name="accessMode" index="3DII0k" />
2522
<child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
@@ -738,8 +735,5 @@
738735
</node>
739736
</node>
740737
</node>
741-
<node concept="2XOHcx" id="4rZeNQ6M9GV">
742-
<property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
743-
</node>
744738
</model>
745739

‎code/languages/org.iets3.opensource/tests/test.org.iets3.protocol.transport/models/test/org/iets3/protocol/transport/ts@tests.mps‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<reference id="8333855927540250453" name="declaration" index="39XzEq" />
2727
</concept>
2828
<concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
29-
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
30-
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
31-
</concept>
3229
<concept id="8333855927540283103" name="jetbrains.mps.lang.test.structure.NodeConstraintsErrorCheckOperation" flags="ng" index="39XrGg">
3330
<child id="8333855927548182241" name="errorRef" index="39rjcI" />
3431
</concept>
@@ -183,8 +180,5 @@
183180
</node>
184181
</node>
185182
</node>
186-
<node concept="2XOHcx" id="4rZeNQ6M9GV">
187-
<property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
188-
</node>
189183
</model>
190184

0 commit comments

Comments
 (0)