Skip to content

Commit da7614e

Browse files
Merge maintenance/mps20241 into merge/mps20241
2 parents e8fb818 + 2857d0c commit da7614e

21 files changed

+131
-252
lines changed

code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps

Lines changed: 53 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16219,16 +16219,6 @@
1621916219
</node>
1622016220
</node>
1622116221
</node>
16222-
<node concept="1SiIV0" id="4aAsKjbTJHl" role="3bR37C">
16223-
<node concept="3bR9La" id="4aAsKjbTJHm" role="1SiIV1">
16224-
<ref role="3bR37D" to="ffeo:7Kfy9QB6L4X" resolve="jetbrains.mps.lang.editor" />
16225-
</node>
16226-
</node>
16227-
<node concept="1SiIV0" id="4aAsKjbTNo$" role="3bR37C">
16228-
<node concept="3bR9La" id="4aAsKjbTNo_" role="1SiIV1">
16229-
<ref role="3bR37D" to="90a9:7klUZA6XM5Q" resolve="de.slisson.mps.conditionalEditor" />
16230-
</node>
16231-
</node>
1623216222
<node concept="1SiIV0" id="4aAsKjbTNoS" role="3bR37C">
1623316223
<node concept="1Busua" id="4aAsKjbTNoT" role="1SiIV1">
1623416224
<ref role="1Busuk" to="90a9:7klUZA6XM5Q" resolve="de.slisson.mps.conditionalEditor" />
@@ -16364,6 +16354,7 @@
1636416354
<property role="BnDLt" value="true" />
1636516355
<property role="TrG5h" value="test.components.functional" />
1636616356
<property role="3LESm3" value="339619e2-78b9-4a69-859d-32ce3eea1939" />
16357+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1636716358
<node concept="398BVA" id="277EWw0imxX" role="3LF7KH">
1636816359
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1636916360
<node concept="2Ry0Ak" id="277EWw0imyh" role="iGT6I">
@@ -16486,6 +16477,7 @@
1648616477
<property role="BnDLt" value="true" />
1648716478
<property role="TrG5h" value="test.iets3.components.toplevel.adapter" />
1648816479
<property role="3LESm3" value="e58cb7a2-4782-4210-a236-05de0d75c6b2" />
16480+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1648916481
<node concept="398BVA" id="2i81Z9BQeJ7" role="3LF7KH">
1649016482
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1649116483
<node concept="2Ry0Ak" id="2i81Z9BQeJb" role="iGT6I">
@@ -16541,6 +16533,7 @@
1654116533
<property role="BnDLt" value="true" />
1654216534
<property role="TrG5h" value="test.iets3.core.mapping" />
1654316535
<property role="3LESm3" value="12ae53bc-0d28-4b54-88e3-48a56519294d" />
16536+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1654416537
<node concept="398BVA" id="4dUR79id6QC" role="3LF7KH">
1654516538
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1654616539
<node concept="2Ry0Ak" id="4dUR79id6QG" role="iGT6I">
@@ -16601,11 +16594,17 @@
1660116594
</node>
1660216595
</node>
1660316596
</node>
16597+
<node concept="1SiIV0" id="6MKL$aZ45ja" role="3bR37C">
16598+
<node concept="3bR9La" id="6MKL$aZ45jb" role="1SiIV1">
16599+
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
16600+
</node>
16601+
</node>
1660416602
</node>
1660516603
<node concept="1E1JtA" id="7K$Mm86tjeJ" role="3989C9">
1660616604
<property role="BnDLt" value="true" />
1660716605
<property role="TrG5h" value="test.iets3.core.tracequery" />
1660816606
<property role="3LESm3" value="785e2843-aa64-4743-afec-47634f9d78a4" />
16607+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1660916608
<node concept="398BVA" id="7K$Mm86tjfE" role="3LF7KH">
1661016609
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1661116610
<node concept="2Ry0Ak" id="7K$Mm86tjfW" role="iGT6I">
@@ -16686,6 +16685,7 @@
1668616685
<property role="BnDLt" value="true" />
1668716686
<property role="TrG5h" value="test.iets3.safety.attributes" />
1668816687
<property role="3LESm3" value="e58538db-560d-4e78-b9c3-9ba00ad59397" />
16688+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1668916689
<node concept="398BVA" id="2i81Z9BQeBx" role="3LF7KH">
1669016690
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1669116691
<node concept="2Ry0Ak" id="2i81Z9BQeB_" role="iGT6I">
@@ -17112,6 +17112,7 @@
1711217112
<property role="BnDLt" value="true" />
1711317113
<property role="TrG5h" value="test.org.iets3.protocol.transport" />
1711417114
<property role="3LESm3" value="5d4bc982-a658-41f9-a32e-1221b26a9dae" />
17115+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1711517116
<node concept="398BVA" id="4dUR79iwSk0" role="3LF7KH">
1711617117
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1711717118
<node concept="2Ry0Ak" id="4dUR79iwSk4" role="iGT6I">
@@ -17177,6 +17178,7 @@
1717717178
<property role="BnDLt" value="true" />
1717817179
<property role="TrG5h" value="test.org.iets3.variability.configuration.base" />
1717917180
<property role="3LESm3" value="69c0c18f-9200-46ca-96d1-e564692dce0c" />
17181+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1718017182
<node concept="398BVA" id="7tVUji9MfMe" role="3LF7KH">
1718117183
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1718217184
<node concept="2Ry0Ak" id="7tVUji9MfMh" role="iGT6I">
@@ -17252,6 +17254,7 @@
1725217254
<property role="BnDLt" value="true" />
1725317255
<property role="TrG5h" value="test.org.iets3.variability.featuremodel.base" />
1725417256
<property role="3LESm3" value="d09d86d3-0476-4f57-a9bf-aab3e36e3aee" />
17257+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1725517258
<node concept="398BVA" id="7tVUji9MfSu" role="3LF7KH">
1725617259
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1725717260
<node concept="2Ry0Ak" id="7tVUji9MfSv" role="iGT6I">
@@ -17388,6 +17391,7 @@
1738817391
<property role="BnDLt" value="true" />
1738917392
<property role="TrG5h" value="test.ts.components.hardware" />
1739017393
<property role="3LESm3" value="6992992b-820e-4e23-b697-e246fb887cc9" />
17394+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1739117395
<node concept="398BVA" id="4dUR79id6MD" role="3LF7KH">
1739217396
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1739317397
<node concept="2Ry0Ak" id="4dUR79id6MH" role="iGT6I">
@@ -17629,6 +17633,7 @@
1762917633
<property role="BnDLt" value="true" />
1763017634
<property role="TrG5h" value="test.ts.expr.os.comma" />
1763117635
<property role="3LESm3" value="d4ce91b2-257c-4780-a3fa-98d1f50ce822" />
17636+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1763217637
<node concept="398BVA" id="5CKJX630vhh" role="3LF7KH">
1763317638
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1763417639
<node concept="2Ry0Ak" id="5CKJX630vhk" role="iGT6I">
@@ -17749,6 +17754,33 @@
1774917754
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
1775017755
</node>
1775117756
</node>
17757+
<node concept="22LTRM" id="IJ8MgPZlN9" role="22LTRK">
17758+
<ref role="22LTRN" node="IJ8MgPVKAO" resolve="test.org.iets3.analysis.base" />
17759+
</node>
17760+
<node concept="22LTRM" id="1WrO9kaEJAs" role="22LTRK">
17761+
<ref role="22LTRN" node="4dUR79id6Q_" resolve="test.iets3.core.mapping" />
17762+
</node>
17763+
<node concept="22LTRM" id="1WrO9kaEJAv" role="22LTRK">
17764+
<ref role="22LTRN" node="4dUR79iwSjX" resolve="test.org.iets3.protocol.transport" />
17765+
</node>
17766+
<node concept="22LTRM" id="1WrO9kaEJAy" role="22LTRK">
17767+
<ref role="22LTRN" node="277EWw0imxa" resolve="test.components.functional" />
17768+
</node>
17769+
<node concept="22LTRM" id="1WrO9kaEJA_" role="22LTRK">
17770+
<ref role="22LTRN" node="2i81Z9BQeI$" resolve="test.iets3.components.toplevel.adapter" />
17771+
</node>
17772+
<node concept="22LTRM" id="48ZWgAGrv_8" role="22LTRK">
17773+
<ref role="22LTRN" node="48ZWgAGrsP1" resolve="test.ts.components.core" />
17774+
</node>
17775+
<node concept="22LTRM" id="1WrO9kaEJAC" role="22LTRK">
17776+
<ref role="22LTRN" node="4dUR79id6MA" resolve="test.ts.components.hardware" />
17777+
</node>
17778+
<node concept="22LTRM" id="5kwEgmAh92W" role="22LTRK">
17779+
<ref role="22LTRN" node="5kwEgmAh8J_" resolve="test.org.iets3.core.comments" />
17780+
</node>
17781+
<node concept="22LTRM" id="4ToqgmJmYtN" role="22LTRK">
17782+
<ref role="22LTRN" node="6xvglc6Du8w" resolve="test.ex.core.expr.genjava" />
17783+
</node>
1775217784
<node concept="22LTRM" id="OJuIQp_hdf" role="22LTRK">
1775317785
<ref role="22LTRN" node="OJuIQp$d7j" resolve="test.in.expr.os" />
1775417786
</node>
@@ -17758,17 +17790,20 @@
1775817790
<node concept="22LTRM" id="5IOlOc8vuMy" role="22LTRK">
1775917791
<ref role="22LTRN" node="5IOlOc8uq2z" resolve="test.ts.expr.os" />
1776017792
</node>
17761-
<node concept="22LTRM" id="5kwEgmAh92W" role="22LTRK">
17762-
<ref role="22LTRN" node="5kwEgmAh8J_" resolve="test.org.iets3.core.comments" />
17793+
<node concept="22LTRM" id="1WrO9kaEJRE" role="22LTRK">
17794+
<ref role="22LTRN" node="5CKJX630vfX" resolve="test.ts.expr.os.comma" />
1776317795
</node>
17764-
<node concept="22LTRM" id="48ZWgAGrv_8" role="22LTRK">
17765-
<ref role="22LTRN" node="48ZWgAGrsP1" resolve="test.ts.components.core" />
17796+
<node concept="22LTRM" id="1WrO9kaEJRH" role="22LTRK">
17797+
<ref role="22LTRN" node="2i81Z9BQeAe" resolve="test.iets3.safety.attributes" />
1776617798
</node>
17767-
<node concept="22LTRM" id="4ToqgmJmYtN" role="22LTRK">
17768-
<ref role="22LTRN" node="6xvglc6Du8w" resolve="test.ex.core.expr.genjava" />
17799+
<node concept="22LTRM" id="1WrO9kaEJRK" role="22LTRK">
17800+
<ref role="22LTRN" node="7K$Mm86tjeJ" resolve="test.iets3.core.tracequery" />
1776917801
</node>
17770-
<node concept="22LTRM" id="IJ8MgPZlN9" role="22LTRK">
17771-
<ref role="22LTRN" node="IJ8MgPVKAO" resolve="test.org.iets3.analysis.base" />
17802+
<node concept="22LTRM" id="1WrO9kaEJAm" role="22LTRK">
17803+
<ref role="22LTRN" node="7tVUji9MfMb" resolve="test.org.iets3.variability.configuration.base" />
17804+
</node>
17805+
<node concept="22LTRM" id="1WrO9kaEJAp" role="22LTRK">
17806+
<ref role="22LTRN" node="7tVUji9MfSt" resolve="test.org.iets3.variability.featuremodel.base" />
1777217807
</node>
1777317808
</node>
1777417809
<node concept="2vP9LM" id="3ZBI8Awdbww" role="1hWBAP">

0 commit comments

Comments
 (0)