Skip to content

Commit ebf74b0

Browse files
authored
Merge pull request #1375 from IETS3/merge/mps20251
Merge maintenance/mps20251 into master
2 parents 312679c + d183add commit ebf74b0

File tree

109 files changed

+722073
-1581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+722073
-1581
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ The project does _not_ follow Semantic Versioning and the changes are documented
77

88
## June 2025
99

10+
### Added
11+
12+
- Added languages and solution for basic variability, moved from IETS3-Core project. The following modules were added:
13+
- variability: `org.iets3.variability.*` (6 languages, 2 solutions)
14+
- variability devkit: `org.iets3.variability.base.devkit`
15+
- analysis support: `org.iets3.analysis.logic.operator`, `org.iets3.analysis.solversupport.util`
16+
- contextfilter for UI: `org.iets3.contextfilter`, `org.iets3.contextfilter.plugin`
17+
1018
### Changed
1119

1220
- Published SBOM contains dependencies only from runtime configurations

README.md

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,26 @@ The project is separated into the following virtual packages:
6262

6363
### analysis
6464

65-
| Name | Description |
65+
| Name | Description |
6666
| ------------- | ------------- |
67-
| org.iets3.analysis.base | This language contains basic concepts and interfaces and a plugin solution related to solvers. |
67+
| test.org.iets3.analysis.base | Test for solver supoprt. |
68+
| test.org.iets3.analysis.base.solvable | Language used in the tests. |
69+
| org.iets3.analysis.solversupport.util | Supporting classes for analysis with solver. |
70+
| org.iets3.analysis.base |  This language contains basic concepts and interfaces and a plugin solution related to solvers. |
71+
| org.iets3.analysis.logic.operator | This language provide operators to build model checking rules. |
6872

6973
### assessment
7074
| Name | Description |
7175
| ------------- | ------------- |
7276
| org.iets3.core.assessment | It contains an [AssessmentQuery](http://127.0.0.1:63320/node?ref=r%3Af7764ca4-8c75-4049-922b-08516400a727%28com.mbeddr.core.base.structure%29%2F865293814733115675) to find [untraced elements](http://127.0.0.1:63320/node?ref=r%3A23d7e401-548b-485c-bdf1-c060e259073c%28org.iets3.core.assessment.structure%29%2F3587241503657463099). It can be used inside an instance of [Assessment](http://127.0.0.1:63320/node?ref=r%3Af7764ca4-8c75-4049-922b-08516400a727%28com.mbeddr.core.base.structure%29%2F865293814733114044) inside an [AssessmentContainer](http://127.0.0.1:63320/node?ref=r%3Af7764ca4-8c75-4049-922b-08516400a727%28com.mbeddr.core.base.structure%29%2F865293814733114043). It also contains a [generic trace query](http://127.0.0.1:63320/node?ref=r%3A23d7e401-548b-485c-bdf1-c060e259073c%28org.iets3.core.assessment.structure%29%2F6913547888673489335) to find traced elements. |
7377

78+
### contextfilter
79+
80+
| Name | Description |
81+
| ------------- | ------------- |
82+
| org.iets3.contextfilter.plugin | This solution provide the plugin suport for the context filtering. |
83+
| org.iets3.contextfilter | This language allows for selecting references (aka instances) of selected nodes in a projection . |
84+
7485
### comp (component)
7586

7687
| Name | Description |
@@ -188,7 +199,17 @@ This package includes all things related to tracing ([KernelF reference: page 27
188199
### variability
189200
| Name | Description |
190201
| ------------- | ------------- |
191-
| org.iets3.variability.artifacts.base | This language contains basic concepts and interfaces related to variability. |
202+
| org.iets3.variability.artifacts.typesystem.runtime | Runtime classes and interfaces to support org.iets3.variability.artifacts.typesystem. |
203+
| org.iets3.variability.artifacts.base | This language contains basic concepts and interfaces related to variation point in artifacts. |
204+
| org.iets3.variability.artifacts.baseline | This language allows for removing variability from artifacts (baselining). |
205+
| org.iets3.variability.artifacts.typesystem | This language provide support for verification of artifact with variability. |
206+
| org.iets3.variability.artifacts.vanguard | This language contains basic concepts and interfaces related to variation point in artifacts. NOTE: It will be merged into org.iets3.variability.artifacts.base. |
207+
| org.iets3.variability.base.ide | This solution provides contribution to the IDE, e.g the visualisation of SkeletonTree used by variability algorithms as datas structure. |
208+
| org.iets3.variability.base | This language contains common concepts to support feature models, configuraions and artifacts. |
209+
| org.iets3.variability.configuration.base | This language allows for defining configurations of feature models. |
210+
| org.iets3.variability.featuremodel.base | This language allows for modeling feature models. |
211+
| org.iets3.variability.os.sandbox | This sandbox contains some variability modeling examples. |
212+
| org.iets3.variability.base.devkit | This devkit exposes all basic variability functionalities. |
192213

193214
## Devkits
194215

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@
1919
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.repl.devkit/org.iets3.core.expr.repl.devkit.devkit" folder="expr.lang-core" />
2020
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.stateful.devkit/org.iets3.core.expr.stateful.devkit.devkit" folder="expr.lang-stateful" />
2121
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.req/org.iets3.req.devkit" folder="req" />
22+
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.variability.base.devkit/org.iets3.variability.base.devkit.devkit" folder="variability" />
2223
<modulePath path="$PROJECT_DIR$/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl" folder="analysis" />
24+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.analysis.logic.operator/org.iets3.analysis.logic.operator.mpl" folder="analysis" />
2325
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.core/org.iets3.components.core.mpl" folder="comp" />
2426
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.functional/org.iets3.components.functional.mpl" folder="comp" />
2527
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.hardware/org.iets3.components.hardware.mpl" folder="comp" />
2628
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.plugin/org.iets3.components.plugin.msd" folder="comp" />
2729
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.req/org.iets3.components.req.mpl" folder="comp" />
2830
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.toplevel.adapter/org.iets3.components.toplevel.adapter.mpl" folder="comp" />
31+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.contextfilter/org.iets3.contextfilter.mpl" folder="contextfilter" />
2932
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.assessment/org.iets3.core.assessment.mpl" folder="assessmt" />
3033
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl" folder="core" />
3134
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.base/org.iets3.core.base.mpl" folder="core" />
@@ -86,15 +89,23 @@
8689
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.core/org.iets3.req.core.mpl" folder="req" />
8790
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd" folder="req" />
8891
<modulePath path="$PROJECT_DIR$/languages/org.iets3.safety.attributes/org.iets3.safety.attributes.mpl" folder="safety" />
89-
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.vanguard/org.iets3.variability.artifacts.vanguard.mpl" folder="variability" />
92+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.base/org.iets3.variability.artifacts.base.mpl" folder="variability.artifacts" />
93+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.baseline/org.iets3.variability.artifacts.baseline.mpl" folder="variability.artifacts" />
94+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.typesystem/org.iets3.variability.artifacts.typesystem.mpl" folder="variability.artifacts" />
95+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.vanguard/org.iets3.variability.artifacts.vanguard.mpl" folder="variability.artifacts" />
96+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.base/org.iets3.variability.base.mpl" folder="variability.modeling" />
97+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.configuration.base/org.iets3.variability.configuration.base.mpl" folder="variability.modeling" />
98+
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.featuremodel.base/org.iets3.variability.featuremodel.base.mpl" folder="variability.modeling" />
9099
<modulePath path="$PROJECT_DIR$/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl" folder="comp" />
91100
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.analysis.base.solvable/test.org.iets3.analysis.base.solvable.mpl" folder="analysis.tests" />
92101
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.core.trace/test.org.iets3.core.trace.mpl" folder="trace" />
93102
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.nix/test.ts.expr.os.nix.mpl" folder="expr.tests" />
94103
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl" folder="expr.tests" />
95104
<modulePath path="$PROJECT_DIR$/solutions/InterpreterTestExecutor/InterpreterTestExecutor.msd" folder="_build" />
105+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.analysis.solversupport.util/org.iets3.analysis.solversupport.util.msd" folder="analysis" />
96106
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.components.core.interpreter/org.iets3.components.core.interpreter.msd" folder="comp" />
97107
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.components.core.sandbox/org.iets3.components.core.sandbox.msd" folder="comp" />
108+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.contextfilter.plugin/org.iets3.contextfilter.plugin.msd" folder="contextfilter" />
98109
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.adt.interpreter/org.iets3.core.expr.adt.interpreter.msd" folder="expr.lang-advanced" />
99110
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd" folder="expr.lang-core" />
100111
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.interpreter/org.iets3.core.expr.base.interpreter.msd" folder="expr.lang-core" />
@@ -152,6 +163,9 @@
152163
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.build/org.iets3.opensource.build.msd" folder="_build" />
153164
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd" folder="_build" />
154165
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd" folder="linters" />
166+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.variability.artifacts.typesystem.runtime/org.iets3.variability.artifacts.typesystem.runtime.msd" folder="variability.artifacts" />
167+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.variability.base.ide/org.iets3.variability.base.ide.msd" folder="variability.ide" />
168+
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.variability.os.sandbox/org.iets3.variability.os.sandbox.msd" folder="variability" />
155169
<modulePath path="$PROJECT_DIR$/solutions/playground/playground.msd" folder="expr.tests" />
156170
<modulePath path="$PROJECT_DIR$/tests/test.components.functional/test.components.functional.msd" folder="comp.tests" />
157171
<modulePath path="$PROJECT_DIR$/tests/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.tests" />
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<dev-kit name="org.iets3.variability.base.devkit" uuid="30ece186-fcb4-43d3-ac47-0764d3d00f5d">
3+
<exported-language name="2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)" />
4+
<exported-language name="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" />
5+
<exported-language name="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" />
6+
<exported-language name="6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)" />
7+
<exported-language name="9b66c5c9-38bf-4315-a96f-9f4e212c69cb(org.iets3.variability.base)" />
8+
<exported-language name="165f1d05-2506-4544-895e-1424f54166ec(org.iets3.variability.featuremodel.base)" />
9+
<exported-language name="71226ee2-bbc4-45d2-a41d-20b97237156c(org.iets3.variability.configuration.base)" />
10+
<exported-language name="f0883503-8eaa-4bc8-8846-eb63220ab1dd(org.iets3.variability.artifacts.base)" />
11+
<exported-language name="9914d82b-ab8a-44d1-9c65-9f2954c3b4df(org.iets3.variability.artifacts.typesystem)" />
12+
<exported-language name="bad8e421-fc94-4104-8c1e-6fc9d2dccf07(org.iets3.variability.artifacts.baseline)" />
13+
<exported-language name="c6ff3b3b-aff6-455e-9637-7955ccbfec22(org.iets3.variability.artifacts.vanguard)" />
14+
<exported-solutions>
15+
<exported-solution>332e8d5e-8c0f-4177-b870-cc27072befb9(org.iets3.variability.base.ide)</exported-solution>
16+
<exported-solution>f7909506-a68f-4575-8f79-ef5e0e0ae091(org.iets3.variability.artifacts.typesystem.runtime)</exported-solution>
17+
</exported-solutions>
18+
</dev-kit>
19+

0 commit comments

Comments
 (0)