Skip to content

Merge maintenance/mps20232 into master #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexanderpann merged 16 commits into from
Mar 20, 2025
Merged

Merge maintenance/mps20232 into master #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5249958
Move languages, solutions, and related tests and devkits from iets3.c…
mfsoliveira Feb 12, 2025
8d79714
Merge branch 'maintenance/mps20232' into feature/MigrateLanguagesFrom…
mfsoliveira Feb 17, 2025
b3c9de0
Rename devkits and move mapping and protocols to comp virtual folder
mfsoliveira Feb 19, 2025
aebd14e
Merge branch 'maintenance/mps20232' into feature/MigrateLanguagesFrom…
mfsoliveira Feb 21, 2025
564eaba
Move test solutions into test folder
mfsoliveira Feb 24, 2025
c9bd1e0
Merge branch 'maintenance/mps20232' into feature/MigrateLanguagesFrom…
mfsoliveira Feb 25, 2025
5be98f4
Remove .iml files and ignore them
mfsoliveira Feb 25, 2025
11a28ae
Remove missing iml file from last commit
mfsoliveira Feb 25, 2025
05a33ce
Delete empty models
mfsoliveira Feb 25, 2025
2a626fc
Reload build script
mfsoliveira Feb 25, 2025
7f6e028
Fix name of virtual folders
mfsoliveira Feb 25, 2025
b56dc79
Remove empty module and migration
mfsoliveira Feb 25, 2025
eb89a8b
Merge branch 'maintenance/mps20232' into feature/MigrateLanguagesFrom…
mfsoliveira Mar 10, 2025
6c41583
Merge pull request #1214 from IETS3/feature/MigrateLanguagesFromIets3…
mfsoliveira Mar 10, 2025
f5a902b
Merge remote-tracking branch 'refs/remotes/origin/master' into merge/…
Mar 20, 2025
1dd55a2
fix some build scripts
Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ code/languages/*/build.properties
code/languages/*/TEST*.xml
code/languages/org.iets3.core/build/tmp
.mps-caches
*.iml

# -----------------------------------------------------------
# GRADLE
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ The project does _not_ follow Semantic Versioning and the changes are documented

### Added

- Move languages org.iets3.protocol.transport, org.iets3.components.functional, org.iets3.components.hardware, org.iets3.components.toplevel.adapter, org.iets3.core.mapping, and org.iets3.safety.attributes from iets3.core to iets3.os

- a new approach to run interpreter test case from command line (and inside MPS) directly without invoking JUnit code generation
- Added EmptyType to Pluggable Type Facade (PTF). If your language has some kind of _NixType_, you should override `PrimitiveTypeMapper.isEmptyType()` to recognize your _NixType_.


### Fixed

- Strings are not comparable with strings with constraints.
Expand Down
1 change: 1 addition & 0 deletions build/scripts/build-allScripts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<uses>
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
<language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
<language id="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" />
<language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
<language id="l:9d000fbd-bdca-4a46-b39b-c5ba9e79b38c:org.iets3.opensource.build.gentests" />
</uses>
Expand Down
29 changes: 22 additions & 7 deletions code/languages/org.iets3.opensource/.mps/modules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<projectModules>
<modulePath path="$PROJECT_DIR$/_spreferences/CodeReviewPreferences/module.msd" folder="_spreferences" />
<modulePath path="$PROJECT_DIR$/_spreferences/TestExecutionPreferences/module.msd" folder="_spreferences" />
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.components.devkit/org.iets3.components.devkit.devkit" folder="comp" />
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.components.functional.devkit/org.iets3.components.functional.devkit.devkit" folder="comp" />
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.components.hardware.devkit/org.iets3.components.hardware.devkit.devkit" folder="comp" />
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.advanced.devkit/org.iets3.core.expr.advanced.devkit.devkit" folder="expr.lang-advanced" />
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.base.devkit/org.iets3.core.expr.base.devkit.devkit" folder="expr.lang-core" />
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.core.expr.core.devkit/org.iets3.core.expr.core.devkit.devkit" folder="expr.lang-core" />
Expand All @@ -18,8 +21,11 @@
<modulePath path="$PROJECT_DIR$/devkits/org.iets3.req/org.iets3.req.devkit" folder="req" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl" folder="analysis" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.core/org.iets3.components.core.mpl" folder="comp" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.functional/org.iets3.components.functional.mpl" folder="comp" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.hardware/org.iets3.components.hardware.mpl" folder="comp" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.plugin/org.iets3.components.plugin.msd" folder="comp" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.req/org.iets3.components.req.mpl" folder="comp" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.components.toplevel.adapter/org.iets3.components.toplevel.adapter.mpl" folder="comp" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.assessment/org.iets3.core.assessment.mpl" folder="assessmt" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.attributes/org.iets3.core.attributes.mpl" folder="core" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.base/org.iets3.core.base.mpl" folder="core" />
Expand Down Expand Up @@ -71,17 +77,20 @@
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags.units/org.iets3.core.expr.typetags.units.mpl" folder="expr.lang-advanced" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl" folder="expr.lang-advanced" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl" folder="expr.lang-advanced" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.mapping/org.iets3.core.mapping.mpl" folder="comp.mapping" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.plugin/org.iets3.core.plugin.msd" folder="core" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.trace.sandbox/org.iets3.core.trace.test.mpl" folder="trace" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.trace/org.iets3.core.trace.mpl" folder="trace" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.core.users/org.iets3.core.users.mpl" folder="core" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.glossary/org.iets3.glossary.mpl" folder="req" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.opensource.build.gentests/org.iets3.opensource.build.gentests.mpl" folder="_build" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.protocol.transport/org.iets3.protocol.transport.mpl" folder="comp.protocols" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.core/org.iets3.req.core.mpl" folder="req" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.req.plugin/org.iets3.req.plugin.msd" folder="req" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.safety.attributes/org.iets3.safety.attributes.mpl" folder="safety" />
<modulePath path="$PROJECT_DIR$/languages/org.iets3.variability.artifacts.base/org.iets3.variability.artifacts.base.mpl" folder="variability" />
<modulePath path="$PROJECT_DIR$/languages/test.iest3.component.attribute/test.iest3.component.attribute.mpl" folder="comp" />
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.analysis.base.solvable/test.org.iets3.analysis.base.solvable.mpl" folder="analysis.test" />
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.analysis.base.solvable/test.org.iets3.analysis.base.solvable.mpl" folder="analysis.tests" />
<modulePath path="$PROJECT_DIR$/languages/test.org.iets3.core.trace/test.org.iets3.core.trace.mpl" folder="trace" />
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.nix/test.ts.expr.os.nix.mpl" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/solutions/InterpreterTestExecutor/InterpreterTestExecutor.msd" folder="_build" />
Expand Down Expand Up @@ -146,13 +155,19 @@
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.interpreterExecutor/org.iets3.opensource.interpreterExecutor.msd" folder="_build" />
<modulePath path="$PROJECT_DIR$/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd" folder="linters" />
<modulePath path="$PROJECT_DIR$/solutions/playground/playground.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/solutions/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.genjava" />
<modulePath path="$PROJECT_DIR$/solutions/test.iets3.core.assessment/test.iets3.core.tracequery.msd" folder="trace" />
<modulePath path="$PROJECT_DIR$/solutions/test.org.iets3.analysis.base/test.org.iets3.analysis.base.msd" folder="analysis.test" />
<modulePath path="$PROJECT_DIR$/solutions/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
<modulePath path="$PROJECT_DIR$/solutions/test.ts.components.core/test.ts.components.core.msd" folder="comp" />
<modulePath path="$PROJECT_DIR$/tests/test.components.functional/test.components.functional.msd" folder="comp.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.ex.core.expr.genjava/test.ex.core.expr.genjava.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.iets3.components.toplevel.adapter/test.iets3.components.toplevel.adapter.msd" folder="comp.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.iets3.core.mapping/test.iets3.core.mapping.msd" folder="comp.mapping" />
<modulePath path="$PROJECT_DIR$/tests/test.iets3.core.tracequery/test.iets3.core.tracequery.msd" folder="trace" />
<modulePath path="$PROJECT_DIR$/tests/test.iets3.safety.attributes/test.iets3.safety.attributes.msd" folder="safety" />
<modulePath path="$PROJECT_DIR$/tests/test.in.expr.os/test.in.expr.os.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.node.expr.os/test.node.expr.os.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.analysis.base/test.org.iets3.analysis.base.msd" folder="analysis.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.core.comments/test.org.iets3.core.comments.msd" folder="core" />
<modulePath path="$PROJECT_DIR$/tests/test.org.iets3.protocol.transport/test.org.iets3.protocol.transport.msd" folder="comp.protocols" />
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.core/test.ts.components.core.msd" folder="comp.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.ts.components.hardware/test.ts.components.hardware.msd" folder="comp.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os.comma/test.ts.expr.os.comma.msd" folder="expr.tests" />
<modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os/test.ts.expr.os.msd" folder="expr.tests" />
</projectModules>
Expand Down
10 changes: 10 additions & 0 deletions ...g.iets3.opensource/devkits/org.iets3.components.devkit/org.iets3.components.devkit.devkit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<dev-kit name="org.iets3.components.devkit" uuid="903db50e-99bf-4552-9b9f-0c8c5d7a9d09">
<exported-language name="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" />
<exported-language name="f0fd486f-8577-43e9-b671-3d118449c6e7(org.iets3.components.core)" />
<exported-language name="1eafb1ad-d782-45f3-97a2-dcc9e9e9e152(org.iets3.components.toplevel.adapter)" />
<exported-language name="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" />
<exported-language name="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" />
<exported-language name="8bb1251e-eae5-47ab-9843-33adfae8edaa(org.iets3.core.expr.util)" />
</dev-kit>

9 changes: 9 additions & 0 deletions ...kits/org.iets3.components.functional.devkit/org.iets3.components.functional.devkit.devkit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<dev-kit name="org.iets3.components.functional.devkit" uuid="14b54709-6e21-4520-8f63-0e7cc8084a7d">
<exported-language name="25797606-3fb6-47b8-bc3c-b4384df7da44(org.iets3.components.functional)" />
<exported-language name="6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)" />
<extendedDevKits>
<extendedDevKit>903db50e-99bf-4552-9b9f-0c8c5d7a9d09(org.iets3.components.devkit)</extendedDevKit>
</extendedDevKits>
</dev-kit>

8 changes: 8 additions & 0 deletions .../devkits/org.iets3.components.hardware.devkit/org.iets3.components.hardware.devkit.devkit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<dev-kit name="org.iets3.components.hardware.devkit" uuid="81923f47-8fdd-4466-bb24-6346a8ef0a42">
<exported-language name="c35abfa8-0db0-4d42-bb3f-f46112aeb888(org.iets3.components.hardware)" />
<extendedDevKits>
<extendedDevKit>903db50e-99bf-4552-9b9f-0c8c5d7a9d09(org.iets3.components.devkit)</extendedDevKit>
</extendedDevKits>
</dev-kit>

Binary file added ...ts3.opensource/languages/org.iets3.components.functional/icons/consumesPort.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...g.iets3.opensource/languages/org.iets3.components.functional/icons/dataPort.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...iets3.opensource/languages/org.iets3.components.functional/icons/databundle.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...g.iets3.opensource/languages/org.iets3.components.functional/icons/dataitem.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ts3.opensource/languages/org.iets3.components.functional/icons/producesPort.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ts3.opensource/languages/org.iets3.components.functional/icons/providesPort.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...rg.iets3.opensource/languages/org.iets3.components.functional/icons/service.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ets3.opensource/languages/org.iets3.components.functional/icons/servicePort.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...g.iets3.opensource/languages/org.iets3.components.functional/icons/usesPort.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions ...nguages/org.iets3.opensource/languages/org.iets3.components.functional/models/actions.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:d7f0dec8-ab07-4f98-8d8d-4166120610cc(org.iets3.components.functional.actions)">
<persistence version="9" />
<languages>
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
</languages>
<imports />
<registry />
</model>

Loading
Loading