Skip to content

Commit 8e2ef90

Browse files
author
Alexander Pann
authored
Merge pull request #2864 from mbeddr/merge/master
Merge maintenance/mps20243 into master
2 parents 71e370b + 2a2a3c1 commit 8e2ef90

File tree

453 files changed

+4993
-39840
lines changed

Some content is hidden

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

453 files changed

+4993
-39840
lines changed

‎CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,35 @@ All notable changes to this project will be documented in this file.
55
The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow
66
Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month.
77

8+
# April 2025
9+
10+
## com.mbeddr.doc
11+
12+
- 🚨 Stubs for POI and other libraries were moved from language `com.mbeddr.spreadsheat`
13+
to solution `com.mbeddr.spreadsheet.libs`.
14+
- During generation non-root Document nodes will be kept even if they are not referenced by any other document. This
15+
enables using Document nodes in tests, for example.
16+
17+
## com.mbeddr.mpsutil.conceptdiagram
18+
19+
### Added
20+
21+
- A new flag was added to make concept diagrams read-only, so that they can't edit the structure of languages.
22+
23+
## com.mbeddr:platform languages
24+
25+
### Changed
26+
27+
- Replaced used bundled jars stored in the source code repo by Gradle dependencies
28+
29+
### Added
30+
31+
- SBOM file with the description of all used components (libraries) and their dependencies
32+
33+
### Removed
34+
35+
- The disabled language `com.mbeddr.mpsutil.ccmenu` was removed. To customize the code completion menu, please use [completion stylings](https://www.jetbrains.com/help/mps/editor.html#-bdbley_15).
36+
837
# February 2025
938

1039
## com.mbeddr.doc

‎about.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ http://easymock.org
2020
Java3D
2121
https://java3d.java.net/
2222

23-
Jboss
24-
http://jboss-javassist.github.io/
25-
2623
Glassfish
2724
https://glassfish.java.net/
2825

‎build.gradle

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ ext.additionalPomInfo = {
4848
}
4949
}
5050

51+
var isFirstSubproject = true
52+
5153
subprojects {
5254
ext.mbeddrMajor = mpsMajor.replaceFirst(/(\d{4})\.(\d)/) { all, major, minor -> major }
5355
ext.mbeddrMinor = mpsMajor.replaceFirst(/(\d{4})\.(\d)/) { all, major, minor -> minor }
@@ -80,11 +82,14 @@ subprojects {
8082
// as well as mbeddr to be built against a specified existing mbeddr platform version
8183
ext.mbeddrPlatformBuildNumber = findNonEmptyProperty('mbeddrPlatformVersion') ?: mbeddrBuildNumber
8284

83-
if (ciBuild) {
84-
// Coerce TeamCity build number to mbeddrBuildNumber by default
85-
// (see https://octopus.com/blog/teamcity-version-numbers-based-on-branches for details)
86-
println "##teamcity[buildNumber '${mbeddrBuildNumber}']"
87-
} else {
88-
println "Local build detected. mbeddr version $ext.mbeddrBuildNumber, mbeddr platform version $ext.mbeddrPlatformBuildNumber"
89-
}
85+
if(isFirstSubproject) {
86+
if (ciBuild) {
87+
// Coerce TeamCity build number to mbeddrBuildNumber by default
88+
// (see https://octopus.com/blog/teamcity-version-numbers-based-on-branches for details)
89+
println "##teamcity[buildNumber '${mbeddrBuildNumber}']"
90+
} else {
91+
println "Local build detected. mbeddr version $ext.mbeddrBuildNumber, mbeddr platform version $ext.mbeddrPlatformBuildNumber"
92+
}
93+
}
94+
isFirstSubproject = false
9095
}

‎code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps

Lines changed: 44 additions & 113 deletions
Large diffs are not rendered by default.

‎code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/models/com/mbeddr/cc/tests/dev/build/build.mps

Lines changed: 69 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
</imports>
1515
<registry>
1616
<language id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests">
17+
<concept id="4560297596904469355" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModuleGroup" flags="ng" index="22LTRF">
18+
<reference id="4560297596904469356" name="group" index="22LTRG" />
19+
</concept>
1720
<concept id="4560297596904469357" name="jetbrains.mps.build.mps.tests.structure.BuildAspect_MpsTestModules" flags="nn" index="22LTRH">
1821
<child id="4560297596904469360" name="modules" index="22LTRK" />
1922
<child id="6593674873639474544" name="options" index="24cAkG" />
2023
</concept>
21-
<concept id="4560297596904469362" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModule" flags="nn" index="22LTRM">
22-
<reference id="4560297596904469363" name="module" index="22LTRN" />
23-
</concept>
2424
<concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW" />
2525
<concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
2626
</language>
@@ -250,26 +250,8 @@
250250
<node concept="L2wRC" id="352CMsvKMMs" role="39821P">
251251
<ref role="L2wRA" node="352CMsvKMzF" resolve="test.ts.cc.var.composition" />
252252
</node>
253-
</node>
254-
<node concept="m$_wf" id="7eF9rfAnzV5" role="3989C9">
255-
<property role="m$_wk" value="dummy" />
256-
<node concept="3_J27D" id="7eF9rfAnzV6" role="m$_yQ">
257-
<node concept="3Mxwew" id="7eF9rfAnzV7" role="3MwsjC">
258-
<property role="3MwjfP" value="dummy" />
259-
</node>
260-
</node>
261-
<node concept="3_J27D" id="7eF9rfAnzV8" role="m_cZH">
262-
<node concept="3Mxwew" id="7eF9rfAnzV9" role="3MwsjC">
263-
<property role="3MwjfP" value="dummy" />
264-
</node>
265-
</node>
266-
<node concept="3_J27D" id="7eF9rfAnzVa" role="m$_w8">
267-
<node concept="3Mxwew" id="7eF9rfAnzVb" role="3MwsjC">
268-
<property role="3MwjfP" value="1.0" />
269-
</node>
270-
</node>
271-
<node concept="m$_yC" id="7eF9rfAnzVc" role="m$_yJ">
272-
<ref role="m$_y1" to="ffeo:5CFKsRWRuFN" resolve="jetbrains.mps.debugger.api" />
253+
<node concept="L2wRC" id="WD9jaanOij" role="39821P">
254+
<ref role="L2wRA" node="WD9jaanOgz" resolve="tests.ts.doc" />
273255
</node>
274256
</node>
275257
<node concept="2G$12M" id="7eF9rfAnzVd" role="3989C9">
@@ -502,19 +484,74 @@
502484
</node>
503485
</node>
504486
</node>
487+
<node concept="1E1JtA" id="WD9jaanOgz" role="2G$12L">
488+
<property role="BnDLt" value="true" />
489+
<property role="TrG5h" value="tests.ts.doc" />
490+
<property role="3LESm3" value="fdf8949f-50fd-4f1a-ba07-726db58b6214" />
491+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
492+
<node concept="398BVA" id="WD9jaanOgB" role="3LF7KH">
493+
<ref role="398BVh" node="7eF9rfAnzUi" resolve="mbeddr.cc" />
494+
<node concept="2Ry0Ak" id="WD9jaanOgF" role="iGT6I">
495+
<property role="2Ry0Am" value="tests" />
496+
<node concept="2Ry0Ak" id="WD9jaanOgI" role="2Ry0An">
497+
<property role="2Ry0Am" value="tests.ts.doc" />
498+
<node concept="2Ry0Ak" id="WD9jaanOgL" role="2Ry0An">
499+
<property role="2Ry0Am" value="tests.ts.doc.msd" />
500+
</node>
501+
</node>
502+
</node>
503+
</node>
504+
<node concept="1SiIV0" id="WD9jaanOhU" role="3bR37C">
505+
<node concept="3bR9La" id="WD9jaanOhV" role="1SiIV1">
506+
<ref role="3bR37D" to="al5i:1YMM4SJ2m0" resolve="com.mbeddr.doc" />
507+
</node>
508+
</node>
509+
<node concept="1BupzO" id="WD9jaanOie" role="3bR31x">
510+
<property role="3ZfqAx" value="models" />
511+
<property role="1Hdu6h" value="true" />
512+
<property role="1HemKv" value="true" />
513+
<node concept="3LXTmp" id="WD9jaanOif" role="1HemKq">
514+
<node concept="398BVA" id="WD9jaanOhW" role="3LXTmr">
515+
<ref role="398BVh" node="7eF9rfAnzUi" resolve="mbeddr.cc" />
516+
<node concept="2Ry0Ak" id="WD9jaanOhX" role="iGT6I">
517+
<property role="2Ry0Am" value="tests" />
518+
<node concept="2Ry0Ak" id="WD9jaanOhY" role="2Ry0An">
519+
<property role="2Ry0Am" value="tests.ts.doc" />
520+
<node concept="2Ry0Ak" id="WD9jaanOhZ" role="2Ry0An">
521+
<property role="2Ry0Am" value="models" />
522+
</node>
523+
</node>
524+
</node>
525+
</node>
526+
<node concept="3qWCbU" id="WD9jaanOig" role="3LXTna">
527+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
528+
</node>
529+
</node>
530+
</node>
531+
<node concept="3rtmxn" id="D2wbO5CO$k" role="3bR31x">
532+
<node concept="3LXTmp" id="D2wbO5CO$l" role="3rtmxm">
533+
<node concept="3qWCbU" id="D2wbO5CO$m" role="3LXTna">
534+
<property role="3qWCbO" value="icons/**, resources/**" />
535+
</node>
536+
<node concept="398BVA" id="D2wbO5CO$n" role="3LXTmr">
537+
<ref role="398BVh" node="7eF9rfAnzUi" resolve="mbeddr.cc" />
538+
<node concept="2Ry0Ak" id="D2wbO5CO$o" role="iGT6I">
539+
<property role="2Ry0Am" value="tests" />
540+
<node concept="2Ry0Ak" id="D2wbO5CO$p" role="2Ry0An">
541+
<property role="2Ry0Am" value="tests.ts.doc" />
542+
</node>
543+
</node>
544+
</node>
545+
</node>
546+
</node>
547+
</node>
505548
</node>
506549
<node concept="22LTRH" id="7eF9rfAnzVt" role="1hWBAP">
507550
<property role="TrG5h" value="com.mbeddr.cc.tests" />
508-
<node concept="22LTRM" id="7eF9rfAnzVu" role="22LTRK">
509-
<ref role="22LTRN" node="7eF9rfAnzVo" resolve="test.ts.cc.var.c" />
510-
</node>
511-
<node concept="22LTRM" id="7eF9rfAnzVw" role="22LTRK">
512-
<ref role="22LTRN" node="7eF9rfAnzVe" resolve="test.ts.requirements" />
513-
</node>
514-
<node concept="22LTRM" id="352CMsvKMSn" role="22LTRK">
515-
<ref role="22LTRN" node="352CMsvKMzF" resolve="test.ts.cc.var.composition" />
516-
</node>
517551
<node concept="24cAiW" id="76N1O$Kj6vp" role="24cAkG" />
552+
<node concept="22LTRF" id="WD9jaanOih" role="22LTRK">
553+
<ref role="22LTRG" node="7eF9rfAnzVd" resolve="com.mbeddr.cc.test" />
554+
</node>
518555
</node>
519556
</node>
520557
<node concept="1l3spW" id="7eF9rfAnzVx">

‎code/languages/com.mbeddr.cc/.mps/libraries.xml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,35 @@
33
<component name="ProjectLibraryManager">
44
<option name="libraries">
55
<map>
6-
<entry key="mbeddr">
6+
<entry key="core">
77
<value>
88
<Library>
9-
<option name="name" value="mbeddr" />
10-
<option name="path" value="${mbeddr.github.core.home}/code" />
9+
<option name="name" value="core" />
10+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.core" />
11+
</Library>
12+
</value>
13+
</entry>
14+
<entry key="doc">
15+
<value>
16+
<Library>
17+
<option name="name" value="doc" />
18+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.doc" />
19+
</Library>
20+
</value>
21+
</entry>
22+
<entry key="ext">
23+
<value>
24+
<Library>
25+
<option name="name" value="ext" />
26+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.ext" />
27+
</Library>
28+
</value>
29+
</entry>
30+
<entry key="mpsutil">
31+
<value>
32+
<Library>
33+
<option name="name" value="mpsutil" />
34+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.mpsutil" />
1135
</Library>
1236
</value>
1337
</entry>

‎code/languages/com.mbeddr.cc/.mps/migration.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
2424
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
2525
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
26+
<entry key="jetbrains.mps.ide.mpsmigration.v_2024_3.LangResourceImport4Migration" value="executed" />
2627
<entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
2728
<entry key="jetbrains.mps.mps33.resaveModules" value="executed" />
2829
<entry key="jetbrains.mps.name2id_gen" value="executed" />
@@ -31,6 +32,6 @@
3132
<entry key="jetbrains.mps.projectJavaVersionMigration" value="executed" />
3233
<entry key="jetbrains.mps.resaveModules" value="executed" />
3334
<entry key="jetbrains.mps.v8_elimination" value="executed" />
34-
<entry key="project.migrated.version" value="241" />
35+
<entry key="project.migrated.version" value="251" />
3536
</component>
3637
</project>

‎code/languages/com.mbeddr.cc/.mps/modules.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.cc.var.fm/fm.mpl" folder="ple_var" />
2828
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.cc.var.rt.comp/comp.mpl" folder="ple_var" />
2929
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.cc.var.rt/rt.mpl" folder="ple_var" />
30+
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl" folder="doc" />
3031
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd" folder="requirements" />
3132
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd" folder="ple_var" />
3233
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd" folder="ple_var" />
34+
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd" folder="doc" />
3335
<modulePath path="$PROJECT_DIR$/tests/test.ex.cc.fm/fm.msd" folder="tests" />
3436
<modulePath path="$PROJECT_DIR$/tests/test.ex.cc.fmrt/fmrt.msd" folder="tests" />
3537
<modulePath path="$PROJECT_DIR$/tests/test.ex.cc.requirements.c/c.msd" folder="tests" />
@@ -40,6 +42,7 @@
4042
<modulePath path="$PROJECT_DIR$/tests/test.ts.cc.requirements/requirements.msd" folder="tests" />
4143
<modulePath path="$PROJECT_DIR$/tests/test.ts.cc.var.c/c.msd" folder="tests" />
4244
<modulePath path="$PROJECT_DIR$/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd" folder="tests" />
45+
<modulePath path="$PROJECT_DIR$/tests/tests.ts.doc/tests.ts.doc.msd" folder="tests.doc" />
4346
</projectModules>
4447
</component>
4548
</project>

‎code/languages/com.mbeddr.cc/.mps/vcs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project version="4">
33
<component name="VcsDirectoryMappings">
4-
<mapping directory="$mbeddr.github.core.home$" vcs="Git" />
4+
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
55
</component>
66
</project>

‎code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/c.mpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,13 @@
183183
<language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
184184
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
185185
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
186-
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
186+
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
187187
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
188188
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
189189
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
190190
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
191191
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
192-
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
192+
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
193193
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
194194
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
195195
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />

‎code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/editor.mps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
99
<use id="b8bb702e-43ed-4090-a902-d180d3e5f292" name="de.slisson.mps.conditionalEditor" version="0" />
1010
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
11-
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
11+
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="15" />
1212
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
1313
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
1414
</languages>

‎code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/plugin.mps

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
1717
<import index="2ahs" ref="r:ea6cf71d-29d2-478d-8027-a9f4a4de53c4(com.mbeddr.mpsutil.interpreter.rt)" />
1818
<import index="rcia" ref="r:bae7addc-e10d-4f29-a8ac-0448d3c5daaf(com.mbeddr.core.expressions.plugin)" />
19-
<import index="jtst" ref="r:94684e53-e178-4b85-9402-d0df7f2c7994(com.mbeddr.core.util.plugin)" />
2019
<import index="xxlk" ref="r:e88b9cc0-93c9-4fa2-bb83-758d8dd56fb7(com.mbeddr.core.expressions.interpreter.plugin)" />
2120
<import index="dpzy" ref="r:7b666de7-002f-4492-b5bd-942c41bb2387(com.mbeddr.core.util.interpreter.plugin)" />
2221
</imports>

‎code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/structure.mps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<model ref="r:1c91fcc2-cf14-47f5-a4d4-3b424626f0d4(com.mbeddr.cc.requirements.c.structure)">
33
<persistence version="9" />
44
<languages>
5-
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
5+
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="3" />
66
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
77
</languages>
88
<imports>

0 commit comments

Comments
 (0)