Skip to content

Commit fcde08f

Browse files
mfsoliveiramfsoliveira
authored
Merge pull request #1420 from IETS3/merge/mps20251
Merge maintenance/mps20251 into master
2 parents 2e62a53 + e8dc638 commit fcde08f

File tree

25 files changed

+31602
-0
lines changed

25 files changed

+31602
-0
lines changed

‎code/languages/org.iets3.opensource/.mps/modules.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,11 @@
176176
<modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
177177
<modulePath path="$PROJECT_DIR$/tests/test.node.expr.os/test.node.expr.os.msd" folder="expr.tests" />
178178
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.analysis.base/test.org.iets3.analysis.base.msd" folder="analysis.tests" />
179+
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.common.base/test.org.iets3.common.base.msd" folder="variability.tests" />
179180
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
180181
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.protocol.transport/test.org.iets3.protocol.transport.msd" folder="comp.protocols" />
182+
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.variability.configuration.base/test.org.iets3.variability.configuration.base.msd" folder="variability.tests" />
183+
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.variability.featuremodel.base/test.org.iets3.variability.featuremodel.base.msd" folder="variability.tests" />
181184
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.core/test.ts.components.core.msd" folder="comp.tests" />
182185
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.hardware/test.ts.components.hardware.msd" folder="comp.tests" />
183186
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os.comma/test.ts.expr.os.comma.msd" folder="expr.tests" />

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

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,6 +1226,101 @@
12261226
</node>
12271227
<node concept="2G$12M" id="7B3y$vlfXUD" role="3989C9">
12281228
<property role="TrG5h" value="org.iets3.variability.os" />
1229+
<node concept="1E1JtA" id="7tVUji9Mfda" role="2G$12L">
1230+
<property role="BnDLt" value="true" />
1231+
<property role="TrG5h" value="test.org.iets3.common.base" />
1232+
<property role="3LESm3" value="c1fcd3e0-0603-4035-834f-14c6337eec24" />
1233+
<node concept="398BVA" id="7tVUji9MfeQ" role="3LF7KH">
1234+
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
1235+
<node concept="2Ry0Ak" id="7tVUji9MffH" role="iGT6I">
1236+
<property role="2Ry0Am" value="tests" />
1237+
<node concept="2Ry0Ak" id="7tVUji9Mfj0" role="2Ry0An">
1238+
<property role="2Ry0Am" value="test.org.iets3.common.base" />
1239+
<node concept="2Ry0Ak" id="7tVUji9MfkF" role="2Ry0An">
1240+
<property role="2Ry0Am" value="test.org.iets3.common.base.msd" />
1241+
</node>
1242+
</node>
1243+
</node>
1244+
</node>
1245+
<node concept="1SiIV0" id="7tVUji9MflQ" role="3bR37C">
1246+
<node concept="3bR9La" id="7tVUji9MflR" role="1SiIV1">
1247+
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
1248+
</node>
1249+
</node>
1250+
<node concept="1SiIV0" id="7tVUji9MflS" role="3bR37C">
1251+
<node concept="3bR9La" id="7tVUji9MflT" role="1SiIV1">
1252+
<ref role="3bR37D" node="49WTic8jAaa" resolve="org.iets3.analysis.base" />
1253+
</node>
1254+
</node>
1255+
<node concept="1SiIV0" id="7tVUji9MflU" role="3bR37C">
1256+
<node concept="3bR9La" id="7tVUji9MflV" role="1SiIV1">
1257+
<ref role="3bR37D" to="90a9:77YfcvOLBqQ" resolve="de.itemis.mps.comparator" />
1258+
</node>
1259+
</node>
1260+
<node concept="1SiIV0" id="7tVUji9MflW" role="3bR37C">
1261+
<node concept="3bR9La" id="7tVUji9MflX" role="1SiIV1">
1262+
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
1263+
</node>
1264+
</node>
1265+
<node concept="1SiIV0" id="7tVUji9MflY" role="3bR37C">
1266+
<node concept="3bR9La" id="7tVUji9MflZ" role="1SiIV1">
1267+
<ref role="3bR37D" node="7yHH$DDpB4c" resolve="org.iets3.variability.configuration.base" />
1268+
</node>
1269+
</node>
1270+
<node concept="1SiIV0" id="7tVUji9Mfm0" role="3bR37C">
1271+
<node concept="3bR9La" id="7tVUji9Mfm1" role="1SiIV1">
1272+
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
1273+
</node>
1274+
</node>
1275+
<node concept="1SiIV0" id="7tVUji9Mfm2" role="3bR37C">
1276+
<node concept="3bR9La" id="7tVUji9Mfm3" role="1SiIV1">
1277+
<ref role="3bR37D" node="7yHH$DDpBOh" resolve="org.iets3.variability.featuremodel.base" />
1278+
</node>
1279+
</node>
1280+
<node concept="1SiIV0" id="7tVUji9Mfm4" role="3bR37C">
1281+
<node concept="3bR9La" id="7tVUji9Mfm5" role="1SiIV1">
1282+
<ref role="3bR37D" node="5wLtKNeSRRB" resolve="org.iets3.core.base" />
1283+
</node>
1284+
</node>
1285+
<node concept="1BupzO" id="7tVUji9Mfmh" role="3bR31x">
1286+
<property role="3ZfqAx" value="models" />
1287+
<property role="1Hdu6h" value="true" />
1288+
<property role="1HemKv" value="true" />
1289+
<node concept="3LXTmp" id="7tVUji9Mfmi" role="1HemKq">
1290+
<node concept="398BVA" id="7tVUji9Mfm6" role="3LXTmr">
1291+
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
1292+
<node concept="2Ry0Ak" id="7tVUji9Mfm7" role="iGT6I">
1293+
<property role="2Ry0Am" value="tests" />
1294+
<node concept="2Ry0Ak" id="7tVUji9Mfm8" role="2Ry0An">
1295+
<property role="2Ry0Am" value="test.org.iets3.common.base" />
1296+
<node concept="2Ry0Ak" id="7tVUji9Mfm9" role="2Ry0An">
1297+
<property role="2Ry0Am" value="models" />
1298+
</node>
1299+
</node>
1300+
</node>
1301+
</node>
1302+
<node concept="3qWCbU" id="7tVUji9Mfmj" role="3LXTna">
1303+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
1304+
</node>
1305+
</node>
1306+
</node>
1307+
<node concept="3rtmxn" id="5YDe1LrT3Bv" role="3bR31x">
1308+
<node concept="3LXTmp" id="5YDe1LrT3Bw" role="3rtmxm">
1309+
<node concept="3qWCbU" id="5YDe1LrT3Bx" role="3LXTna">
1310+
<property role="3qWCbO" value="icons/**, resources/**" />
1311+
</node>
1312+
<node concept="398BVA" id="5YDe1LrT3By" role="3LXTmr">
1313+
<ref role="398BVh" node="5wLtKNeTaqD" resolve="iets3.lang.opensource" />
1314+
<node concept="2Ry0Ak" id="5YDe1LrT3Bz" role="iGT6I">
1315+
<property role="2Ry0Am" value="tests" />
1316+
<node concept="2Ry0Ak" id="5YDe1LrT3B$" role="2Ry0An">
1317+
<property role="2Ry0Am" value="test.org.iets3.common.base" />
1318+
</node>
1319+
</node>
1320+
</node>
1321+
</node>
1322+
</node>
1323+
</node>
12291324
<node concept="1E1JtD" id="7yHH$DDpyJJ" role="2G$12L">
12301325
<property role="BnDLt" value="true" />
12311326
<property role="TrG5h" value="org.iets3.variability.artifacts.base" />
@@ -15902,6 +15997,12 @@
1590215997
<node concept="L2wRC" id="4dUR79iwSox" role="39821P">
1590315998
<ref role="L2wRA" node="4dUR79iwSjX" resolve="test.org.iets3.protocol.transport" />
1590415999
</node>
16000+
<node concept="L2wRC" id="7fniE1Ut5xi" role="39821P">
16001+
<ref role="L2wRA" node="7tVUji9MfMb" resolve="test.org.iets3.variability.configuration.base" />
16002+
</node>
16003+
<node concept="L2wRC" id="7fniE1Ut5xl" role="39821P">
16004+
<ref role="L2wRA" node="7tVUji9MfSt" resolve="test.org.iets3.variability.featuremodel.base" />
16005+
</node>
1590516006
<node concept="L2wRC" id="48ZWgAGrvuG" role="39821P">
1590616007
<ref role="L2wRA" node="48ZWgAGrsP1" resolve="test.ts.components.core" />
1590716008
</node>
@@ -17072,6 +17173,156 @@
1707217173
</node>
1707317174
</node>
1707417175
</node>
17176+
<node concept="1E1JtA" id="7tVUji9MfMb" role="3989C9">
17177+
<property role="BnDLt" value="true" />
17178+
<property role="TrG5h" value="test.org.iets3.variability.configuration.base" />
17179+
<property role="3LESm3" value="69c0c18f-9200-46ca-96d1-e564692dce0c" />
17180+
<node concept="398BVA" id="7tVUji9MfMe" role="3LF7KH">
17181+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17182+
<node concept="2Ry0Ak" id="7tVUji9MfMh" role="iGT6I">
17183+
<property role="2Ry0Am" value="tests" />
17184+
<node concept="2Ry0Ak" id="7tVUji9MfMk" role="2Ry0An">
17185+
<property role="2Ry0Am" value="test.org.iets3.variability.configuration.base" />
17186+
<node concept="2Ry0Ak" id="7tVUji9MfMn" role="2Ry0An">
17187+
<property role="2Ry0Am" value="test.org.iets3.variability.configuration.base.msd" />
17188+
</node>
17189+
</node>
17190+
</node>
17191+
</node>
17192+
<node concept="1SiIV0" id="7tVUji9MfQS" role="3bR37C">
17193+
<node concept="3bR9La" id="7tVUji9MfQT" role="1SiIV1">
17194+
<ref role="3bR37D" node="7yHH$DDpB4c" resolve="org.iets3.variability.configuration.base" />
17195+
</node>
17196+
</node>
17197+
<node concept="1SiIV0" id="7tVUji9MfQU" role="3bR37C">
17198+
<node concept="3bR9La" id="7tVUji9MfQV" role="1SiIV1">
17199+
<ref role="3bR37D" to="90a9:77YfcvOLBqQ" resolve="de.itemis.mps.comparator" />
17200+
</node>
17201+
</node>
17202+
<node concept="1SiIV0" id="7tVUji9MfQW" role="3bR37C">
17203+
<node concept="3bR9La" id="7tVUji9MfQX" role="1SiIV1">
17204+
<ref role="3bR37D" node="5wLtKNeSRQd" resolve="org.iets3.core.expr.simpleTypes" />
17205+
</node>
17206+
</node>
17207+
<node concept="1SiIV0" id="7tVUji9MfQY" role="3bR37C">
17208+
<node concept="3bR9La" id="7tVUji9MfQZ" role="1SiIV1">
17209+
<ref role="3bR37D" node="7tVUji9Mfda" resolve="test.org.iets3.common.base" />
17210+
</node>
17211+
</node>
17212+
<node concept="1BupzO" id="7tVUji9MfRi" role="3bR31x">
17213+
<property role="3ZfqAx" value="models" />
17214+
<property role="1Hdu6h" value="true" />
17215+
<property role="1HemKv" value="true" />
17216+
<node concept="3LXTmp" id="7tVUji9MfRj" role="1HemKq">
17217+
<node concept="398BVA" id="7tVUji9MfR0" role="3LXTmr">
17218+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17219+
<node concept="2Ry0Ak" id="7tVUji9MfR1" role="iGT6I">
17220+
<property role="2Ry0Am" value="tests" />
17221+
<node concept="2Ry0Ak" id="7tVUji9MfR2" role="2Ry0An">
17222+
<property role="2Ry0Am" value="test.org.iets3.variability.configuration.base" />
17223+
<node concept="2Ry0Ak" id="7tVUji9MfR3" role="2Ry0An">
17224+
<property role="2Ry0Am" value="models" />
17225+
</node>
17226+
</node>
17227+
</node>
17228+
</node>
17229+
<node concept="3qWCbU" id="7tVUji9MfRk" role="3LXTna">
17230+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
17231+
</node>
17232+
</node>
17233+
</node>
17234+
<node concept="3rtmxn" id="5YDe1LrT3BA" role="3bR31x">
17235+
<node concept="3LXTmp" id="5YDe1LrT3BB" role="3rtmxm">
17236+
<node concept="3qWCbU" id="5YDe1LrT3BC" role="3LXTna">
17237+
<property role="3qWCbO" value="icons/**, resources/**" />
17238+
</node>
17239+
<node concept="398BVA" id="5YDe1LrT3BD" role="3LXTmr">
17240+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17241+
<node concept="2Ry0Ak" id="5YDe1LrT3BE" role="iGT6I">
17242+
<property role="2Ry0Am" value="tests" />
17243+
<node concept="2Ry0Ak" id="5YDe1LrT3BF" role="2Ry0An">
17244+
<property role="2Ry0Am" value="test.org.iets3.variability.configuration.base" />
17245+
</node>
17246+
</node>
17247+
</node>
17248+
</node>
17249+
</node>
17250+
</node>
17251+
<node concept="1E1JtA" id="7tVUji9MfSt" role="3989C9">
17252+
<property role="BnDLt" value="true" />
17253+
<property role="TrG5h" value="test.org.iets3.variability.featuremodel.base" />
17254+
<property role="3LESm3" value="d09d86d3-0476-4f57-a9bf-aab3e36e3aee" />
17255+
<node concept="398BVA" id="7tVUji9MfSu" role="3LF7KH">
17256+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17257+
<node concept="2Ry0Ak" id="7tVUji9MfSv" role="iGT6I">
17258+
<property role="2Ry0Am" value="tests" />
17259+
<node concept="2Ry0Ak" id="7tVUji9MfSw" role="2Ry0An">
17260+
<property role="2Ry0Am" value="test.org.iets3.variability.featuremodel.base" />
17261+
<node concept="2Ry0Ak" id="7tVUji9MfSL" role="2Ry0An">
17262+
<property role="2Ry0Am" value="test.org.iets3.variability.featuremodel.base.msd" />
17263+
</node>
17264+
</node>
17265+
</node>
17266+
</node>
17267+
<node concept="1SiIV0" id="7tVUji9MfSy" role="3bR37C">
17268+
<node concept="3bR9La" id="7tVUji9MfSz" role="1SiIV1">
17269+
<ref role="3bR37D" node="7yHH$DDpB4c" resolve="org.iets3.variability.configuration.base" />
17270+
</node>
17271+
</node>
17272+
<node concept="1SiIV0" id="7tVUji9MfSC" role="3bR37C">
17273+
<node concept="3bR9La" id="7tVUji9MfSD" role="1SiIV1">
17274+
<ref role="3bR37D" node="7tVUji9Mfda" resolve="test.org.iets3.common.base" />
17275+
</node>
17276+
</node>
17277+
<node concept="1BupzO" id="7tVUji9MfSE" role="3bR31x">
17278+
<property role="3ZfqAx" value="models" />
17279+
<property role="1Hdu6h" value="true" />
17280+
<property role="1HemKv" value="true" />
17281+
<node concept="3LXTmp" id="7tVUji9MfXU" role="1HemKq">
17282+
<node concept="398BVA" id="7tVUji9MfXC" role="3LXTmr">
17283+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17284+
<node concept="2Ry0Ak" id="7tVUji9MfXD" role="iGT6I">
17285+
<property role="2Ry0Am" value="tests" />
17286+
<node concept="2Ry0Ak" id="7tVUji9MfXE" role="2Ry0An">
17287+
<property role="2Ry0Am" value="test.org.iets3.variability.featuremodel.base" />
17288+
<node concept="2Ry0Ak" id="7tVUji9MfXF" role="2Ry0An">
17289+
<property role="2Ry0Am" value="models" />
17290+
</node>
17291+
</node>
17292+
</node>
17293+
</node>
17294+
<node concept="3qWCbU" id="7tVUji9MfXV" role="3LXTna">
17295+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
17296+
</node>
17297+
</node>
17298+
</node>
17299+
<node concept="1SiIV0" id="7tVUji9MfX$" role="3bR37C">
17300+
<node concept="3bR9La" id="7tVUji9MfX_" role="1SiIV1">
17301+
<ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
17302+
</node>
17303+
</node>
17304+
<node concept="1SiIV0" id="7tVUji9MfXA" role="3bR37C">
17305+
<node concept="3bR9La" id="7tVUji9MfXB" role="1SiIV1">
17306+
<ref role="3bR37D" node="7yHH$DDpBOh" resolve="org.iets3.variability.featuremodel.base" />
17307+
</node>
17308+
</node>
17309+
<node concept="3rtmxn" id="5YDe1LrT3BH" role="3bR31x">
17310+
<node concept="3LXTmp" id="5YDe1LrT3BI" role="3rtmxm">
17311+
<node concept="3qWCbU" id="5YDe1LrT3BJ" role="3LXTna">
17312+
<property role="3qWCbO" value="icons/**, resources/**" />
17313+
</node>
17314+
<node concept="398BVA" id="5YDe1LrT3BK" role="3LXTmr">
17315+
<ref role="398BVh" node="OJuIQp$deE" resolve="iets3.lang.opensource" />
17316+
<node concept="2Ry0Ak" id="5YDe1LrT3BL" role="iGT6I">
17317+
<property role="2Ry0Am" value="tests" />
17318+
<node concept="2Ry0Ak" id="5YDe1LrT3BM" role="2Ry0An">
17319+
<property role="2Ry0Am" value="test.org.iets3.variability.featuremodel.base" />
17320+
</node>
17321+
</node>
17322+
</node>
17323+
</node>
17324+
</node>
17325+
</node>
1707517326
<node concept="1E1JtA" id="48ZWgAGrsP1" role="3989C9">
1707617327
<property role="BnDLt" value="true" />
1707717328
<property role="TrG5h" value="test.ts.components.core" />

0 commit comments

Comments
 (0)