Skip to content

Commit 12481b3

Browse files
kbirkenkbirken
authored
Merge branch 'maintenance/mps20241' into bugfix/Confusing-solver-warning#1521-Open-
2 parents aee7037 + ff26fe5 commit 12481b3

File tree

11 files changed

+447
-984
lines changed

11 files changed

+447
-984
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1515

1616
- Variability: The propagation of configuration updates to referencing configurations has been improved. Due to this optimization, it needs much less CPU time now.
1717

18+
### Changed
19+
20+
- Variability: Remove deprecated concepts `VariabilityModelChunk_old`, and some related concepts.
21+
1822

1923
## November 2025
2024

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.structure.mps‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
88
</languages>
99
<imports>
10-
<import index="s6b7" ref="r:a7e2f963-3e46-49e0-a385-e8c7f33c91b7(org.iets3.variability.featuremodel.base.structure)" />
1110
<import index="l80j" ref="r:9e71c0de-f9ab-4b67-96cc-7d9c857513f6(org.iets3.analysis.base.structure)" />
1211
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
1312
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />
@@ -73,7 +72,7 @@
7372
<property role="TrG5h" value="EmptyVariabilityContent" />
7473
<property role="3GE5qa" value="container" />
7574
<property role="EcuMT" value="3989254429232912648" />
76-
<ref role="1TJDcQ" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
75+
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
7776
<node concept="PrWs8" id="3tsFshP5d$9" role="PzmwI">
7877
<ref role="PrY4T" node="3tsFshP5cTx" resolve="IVariabilityContent" />
7978
</node>
@@ -88,24 +87,18 @@
8887
<node concept="PrWs8" id="22kx7U4Kqjy" role="PrDN$">
8988
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
9089
</node>
91-
<node concept="PrWs8" id="51M$6hf3mdw" role="PrDN$">
92-
<ref role="PrY4T" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
93-
</node>
9490
</node>
9591
<node concept="PlHQZ" id="3tsFshP5cTx">
9692
<property role="TrG5h" value="IVariabilityContent" />
9793
<property role="3GE5qa" value="container" />
9894
<property role="EcuMT" value="3989254429232909921" />
99-
<node concept="PrWs8" id="51M$6hf3mdH" role="PrDN$">
100-
<ref role="PrY4T" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
101-
</node>
10295
</node>
10396
<node concept="1TIwiD" id="3tsFshP56tQ">
10497
<property role="TrG5h" value="VariabilityModelChunk" />
10598
<property role="19KtqR" value="true" />
10699
<property role="3GE5qa" value="container" />
107100
<property role="EcuMT" value="3989254429232883574" />
108-
<ref role="1TJDcQ" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
101+
<ref role="1TJDcQ" to="vs0r:6clJcrJYOUA" resolve="Chunk" />
109102
<node concept="PrWs8" id="22kx7U49GUo" role="PzmwI">
110103
<ref role="PrY4T" node="22kx7U49GUn" resolve="IVariabilityContainer" />
111104
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.base/models/org.iets3.variability.base.typesystem.mps‎

Lines changed: 420 additions & 2 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.base/org.iets3.variability.base.mpl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<dependencies>
1515
<dependency reexport="false">5186c6ce-428c-4f09-a9df-73d9e86c27d3(org.iets3.core.expr.typetags)</dependency>
1616
<dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
17+
<dependency reexport="false">165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)</dependency>
1718
</dependencies>
1819
<languageVersions>
1920
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -101,7 +102,8 @@
101102
<module reference="165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)" version="36" />
102103
</dependencyVersions>
103104
<extendedLanguages>
104-
<extendedLanguage>165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)</extendedLanguage>
105+
<extendedLanguage>d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</extendedLanguage>
106+
<extendedLanguage>db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)</extendedLanguage>
105107
</extendedLanguages>
106108
</language>
107109

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.behavior.mps‎

Lines changed: 0 additions & 718 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps‎

Lines changed: 2 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@
102102
<child id="1140524464360" name="cellLayout" index="2czzBx" />
103103
<child id="1140524464359" name="emptyCellModel" index="2czzBI" />
104104
</concept>
105-
<concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
106-
<child id="1176795024817" name="cellProvider" index="3YsKMw" />
107-
</concept>
108105
<concept id="1196434649611" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_SimpleString" flags="ng" index="2h3Zct">
109106
<property id="1196434851095" name="text" index="2h4Kg1" />
110107
</concept>
@@ -354,7 +351,6 @@
354351
</concept>
355352
<concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
356353
<concept id="2722384699544370949" name="jetbrains.mps.lang.editor.structure.SubstituteMenuPart_Placeholder" flags="ng" index="3VyMlK" />
357-
<concept id="1176749715029" name="jetbrains.mps.lang.editor.structure.QueryFunction_CellProvider" flags="in" index="3VJUX4" />
358354
<concept id="4307758654696938365" name="jetbrains.mps.lang.editor.structure.QueryFunction_SubstituteMenu_RefPresentation" flags="ig" index="1WAQ3h" />
359355
<concept id="4307758654696952957" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_SubstituteMenu_ReferencedNode" flags="ng" index="1WAUZh" />
360356
<concept id="1950447826681509042" name="jetbrains.mps.lang.editor.structure.ApplyStyleClass" flags="lg" index="3Xmtl4">
@@ -625,7 +621,7 @@
625621
</language>
626622
<language id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell">
627623
<concept id="1161622981231" name="de.slisson.mps.richtext.customcell.structure.ConceptFunctionParameter_cell" flags="nn" index="1Q80Hy" />
628-
<concept id="1176749715029" name="de.slisson.mps.richtext.customcell.structure.QueryFunction_Cell" flags="in" index="3VJUX5" />
624+
<concept id="1176749715029" name="de.slisson.mps.richtext.customcell.structure.QueryFunction_Cell" flags="in" index="3VJUX4" />
629625
<concept id="2490242408670732052" name="de.slisson.mps.richtext.customcell.structure.CellModel_CustomFactory" flags="ng" index="3ZSo5i">
630626
<child id="1073389446424" name="childCellModel" index="3EZMny" />
631627
<child id="2490242408670937967" name="factoryMethod" index="3ZZHOD" />
@@ -950,104 +946,6 @@
950946
</concept>
951947
</language>
952948
</registry>
953-
<node concept="24kQdi" id="3tsFshP5cTU">
954-
<property role="3GE5qa" value="_deprecated.chunk" />
955-
<ref role="1XX52x" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
956-
<node concept="3EZMnI" id="4tXyFaWwywa" role="2wV5jI">
957-
<node concept="3EZMnI" id="7nsgDAXznLJ" role="3EZMnx">
958-
<node concept="2iRfu4" id="7nsgDAXznLK" role="2iSdaV" />
959-
<node concept="3EZMnI" id="4tXyFaWwywk" role="3EZMnx">
960-
<node concept="l2Vlx" id="4tXyFaWwywl" role="2iSdaV" />
961-
<node concept="3F0ifn" id="4tXyFaWwywh" role="3EZMnx">
962-
<property role="3F0ifm" value="variability" />
963-
<ref role="1k5W1q" to="s7nz:16fFHQCfB3d" resolve="VariabilityHeader" />
964-
</node>
965-
<node concept="3F0A7n" id="4tXyFaWwywt" role="3EZMnx">
966-
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
967-
<ref role="1k5W1q" to="s7nz:16fFHQCfB3d" resolve="VariabilityHeader" />
968-
</node>
969-
</node>
970-
<node concept="3XFhqQ" id="7nsgDAXznVR" role="3EZMnx" />
971-
<node concept="3XFhqQ" id="7nsgDAXznWo" role="3EZMnx" />
972-
<node concept="3XFhqQ" id="7nsgDAXznWT" role="3EZMnx" />
973-
<node concept="3XFhqQ" id="7nsgDAXznXr" role="3EZMnx" />
974-
<node concept="3XFhqQ" id="7nsgDAXznXY" role="3EZMnx" />
975-
<node concept="3XFhqQ" id="7nsgDAX$QF1" role="3EZMnx" />
976-
<node concept="3XFhqQ" id="7nsgDAX$QFF" role="3EZMnx" />
977-
<node concept="3XFhqQ" id="7nsgDAX$QGm" role="3EZMnx" />
978-
<node concept="3EZMnI" id="7nsgDAX$QE7" role="3EZMnx">
979-
<node concept="2iRfu4" id="7nsgDAX$QE8" role="2iSdaV" />
980-
<node concept="3F0ifn" id="7nsgDAX$QEW" role="3EZMnx">
981-
<property role="3F0ifm" value="imports" />
982-
</node>
983-
<node concept="3F2HdR" id="7nsgDAXznZ7" role="3EZMnx">
984-
<ref role="1NtTu8" to="s6b7:7nsgDAXznlY" resolve="imports_old" />
985-
<node concept="2iRkQZ" id="7nsgDAXznZJ" role="2czzBx" />
986-
</node>
987-
</node>
988-
</node>
989-
<node concept="2iRkQZ" id="4tXyFaWwywd" role="2iSdaV" />
990-
<node concept="gc7cB" id="4tXyFaWwywB" role="3EZMnx">
991-
<node concept="3VJUX4" id="4tXyFaWwywD" role="3YsKMw">
992-
<node concept="3clFbS" id="4tXyFaWwywF" role="2VODD2">
993-
<node concept="3clFbF" id="4tXyFaWwyxe" role="3cqZAp">
994-
<node concept="2ShNRf" id="4tXyFaWwyxc" role="3clFbG">
995-
<node concept="1pGfFk" id="4tXyFaWwzSe" role="2ShVmc">
996-
<ref role="37wK5l" to="r4b4:5gTlpakvelx" resolve="HorizLineCell" />
997-
<node concept="pncrf" id="4tXyFaWwzSS" role="37wK5m" />
998-
<node concept="10M0yZ" id="4tXyFaWw$6n" role="37wK5m">
999-
<ref role="3cqZAo" to="lzb2:~JBColor.BLACK" resolve="BLACK" />
1000-
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
1001-
</node>
1002-
<node concept="3cmrfG" id="4tXyFaWw$bx" role="37wK5m">
1003-
<property role="3cmrfH" value="2" />
1004-
</node>
1005-
</node>
1006-
</node>
1007-
</node>
1008-
</node>
1009-
</node>
1010-
</node>
1011-
<node concept="3F0ifn" id="4tXyFaWwBfP" role="3EZMnx">
1012-
<node concept="VPM3Z" id="4tXyFaWwBiM" role="3F10Kt">
1013-
<property role="VOm3f" value="false" />
1014-
</node>
1015-
</node>
1016-
<node concept="3F2HdR" id="4tXyFaWwBeE" role="3EZMnx">
1017-
<ref role="1NtTu8" to="s6b7:3tsFshP58gT" resolve="contents_old" />
1018-
<node concept="2iRkQZ" id="4tXyFaWwBeG" role="2czzBx" />
1019-
<node concept="4$FPG" id="6LfBX8YivEt" role="4_6I_">
1020-
<node concept="3clFbS" id="6LfBX8YivEu" role="2VODD2">
1021-
<node concept="3clFbF" id="6LfBX8YivF8" role="3cqZAp">
1022-
<node concept="2ShNRf" id="6LfBX8YivF6" role="3clFbG">
1023-
<node concept="3zrR0B" id="6LfBX8YiFHF" role="2ShVmc">
1024-
<node concept="3Tqbb2" id="6LfBX8YiFHH" role="3zrR0E">
1025-
<ref role="ehGHo" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
1026-
</node>
1027-
</node>
1028-
</node>
1029-
</node>
1030-
</node>
1031-
</node>
1032-
<node concept="3F0ifn" id="6LfBX8YiNlo" role="2czzBI">
1033-
<property role="3F0ifm" value="" />
1034-
<node concept="VPxyj" id="6LfBX8YiNn4" role="3F10Kt">
1035-
<property role="VOm3f" value="true" />
1036-
</node>
1037-
</node>
1038-
</node>
1039-
</node>
1040-
</node>
1041-
<node concept="24kQdi" id="3tsFshP5e60">
1042-
<property role="3GE5qa" value="_deprecated.chunk" />
1043-
<ref role="1XX52x" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
1044-
<node concept="3F0ifn" id="3tsFshP5e62" role="2wV5jI">
1045-
<property role="3F0ifm" value="" />
1046-
<node concept="VPxyj" id="3tsFshP5e7H" role="3F10Kt">
1047-
<property role="VOm3f" value="true" />
1048-
</node>
1049-
</node>
1050-
</node>
1051949
<node concept="24kQdi" id="3tsFshP5EcA">
1052950
<property role="3GE5qa" value="treenodes" />
1053951
<ref role="1XX52x" to="s6b7:3tsFshP5E8h" resolve="FeatureModel" />
@@ -8341,12 +8239,6 @@
83418239
</node>
83428240
<node concept="382kZG" id="7cBI1LfYpEY" role="lGtFl" />
83438241
</node>
8344-
<node concept="22mcaB" id="cEt5uj8NHA">
8345-
<property role="3GE5qa" value="_deprecated.chunk" />
8346-
<ref role="aqKnT" to="s6b7:3tsFshP5d$8" resolve="EmptyVariabilityContent_old" />
8347-
<node concept="22hDWj" id="24LQtH$d1Vk" role="22hAXT" />
8348-
<node concept="2VfDsV" id="51M$6hf3mdh" role="3ft7WO" />
8349-
</node>
83508242
<node concept="22mcaB" id="7cBI1LfYpEZ">
83518243
<ref role="aqKnT" to="s6b7:5NPKd17BG$l" resolve="FeatureModelConfiguration_old" />
83528244
<node concept="22hDWj" id="24LQtH$d1Vl" role="22hAXT" />
@@ -9036,7 +8928,7 @@
90368928
</node>
90378929
</node>
90388930
</node>
9039-
<node concept="3VJUX5" id="zMzE_uJNI3" role="3ZZHOD">
8931+
<node concept="3VJUX4" id="zMzE_uJNI3" role="3ZZHOD">
90408932
<node concept="3clFbS" id="zMzE_uJNI4" role="2VODD2">
90418933
<node concept="3cpWs8" id="zMzE_uJNI5" role="3cqZAp">
90428934
<node concept="3cpWsn" id="zMzE_uJNI6" role="3cpWs9">
@@ -12801,24 +12693,6 @@
1280112693
</node>
1280212694
</node>
1280312695
</node>
12804-
<node concept="22mcaB" id="51M$6hf3mdt">
12805-
<property role="3GE5qa" value="_deprecated.chunk" />
12806-
<ref role="aqKnT" to="s6b7:22kx7U49GUn" resolve="IVariabilityContainer_old" />
12807-
<node concept="22hDWj" id="51M$6hf3mdu" role="22hAXT" />
12808-
<node concept="2VfDsV" id="51M$6hf3mdv" role="3ft7WO" />
12809-
</node>
12810-
<node concept="22mcaB" id="51M$6hf3mdE">
12811-
<property role="3GE5qa" value="_deprecated.chunk" />
12812-
<ref role="aqKnT" to="s6b7:3tsFshP5cTx" resolve="IVariabilityContent_old" />
12813-
<node concept="22hDWj" id="51M$6hf3mdF" role="22hAXT" />
12814-
<node concept="2VfDsV" id="51M$6hf3mdG" role="3ft7WO" />
12815-
</node>
12816-
<node concept="22mcaB" id="51M$6hf3mdR">
12817-
<property role="3GE5qa" value="_deprecated.chunk" />
12818-
<ref role="aqKnT" to="s6b7:3tsFshP56tQ" resolve="VariabilityModelChunk_old" />
12819-
<node concept="22hDWj" id="51M$6hf3mdS" role="22hAXT" />
12820-
<node concept="2VfDsV" id="51M$6hf3mdT" role="3ft7WO" />
12821-
</node>
1282212696
<node concept="22mcaB" id="367j$Y_CgaN">
1282312697
<ref role="aqKnT" to="s6b7:30ECcbtES_0" resolve="AbstractFeatureConfiguration_old" />
1282412698
<node concept="22hDWj" id="367j$Y_CgaO" role="22hAXT" />

0 commit comments

Comments
 (0)