Skip to content

Merge maintenance/mps20241 into maintenance/mps20251 #1623

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
mps-ci-buildbot merged 1 commit into from
Oct 14, 2025
Merged

Merge maintenance/mps20241 into maintenance/mps20251 #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions code/.mps/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
workspace.xml
product-workspace.xml

inspectionProfiles/
shelf/
2 changes: 2 additions & 0 deletions code/.mps/modules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
<modulePath path="$PROJECT_DIR$/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/solutions/de.slisson.mps.hacks.editor/de.slisson.mps.hacks.editor.msd" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hacks/solutions/de.slisson.mps.reflection.runtime/de.slisson.mps.reflection.runtime.msd" folder="hacks" />
<modulePath path="$PROJECT_DIR$/hasher/solutions/nl.f1re.mpsutil.hasher.tests/nl.f1re.mpsutil.hasher.tests.msd" folder="hasher" />
<modulePath path="$PROJECT_DIR$/hasher/solutions/nl.f1re.mpsutil.hasher/nl.f1re.mpsutil.hasher.msd" folder="hasher" />
<modulePath path="$PROJECT_DIR$/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl" folder="widgets" />
<modulePath path="$PROJECT_DIR$/htmlcell/languages/de.itemis.mps.editor.htmlcell/de.itemis.mps.editor.htmlcell.mpl" folder="widgets" />
<modulePath path="$PROJECT_DIR$/htmlcell/languages/de.itemis.mps.editor.htmlcell/sandbox/de.itemis.mps.editor.htmlcell.sandbox.msd" folder="widgets" />
Expand Down
342 changes: 283 additions & 59 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Open in desktop

Large diffs are not rendered by default.

5,353 changes: 5,353 additions & 0 deletions ...sher/solutions/nl.f1re.mpsutil.hasher.tests/models/[email protected]
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 44 additions & 0 deletions code/hasher/solutions/nl.f1re.mpsutil.hasher.tests/nl.f1re.mpsutil.hasher.tests.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="nl.f1re.mpsutil.hasher.tests" uuid="35200322-041d-4e55-91d7-024e0b119604" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/classes_gen" />
</facet>
<facet type="tests" />
</facets>
<dependencies>
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
<dependency reexport="false">078723b2-ab7f-48d1-b9bb-5f643b60d08e(nl.f1re.mpsutil.hasher)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
<language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="078723b2-ab7f-48d1-b9bb-5f643b60d08e(nl.f1re.mpsutil.hasher)" version="0" />
<module reference="35200322-041d-4e55-91d7-024e0b119604(nl.f1re.mpsutil.hasher.tests)" version="0" />
</dependencyVersions>
</solution>

3,128 changes: 3,128 additions & 0 deletions code/hasher/solutions/nl.f1re.mpsutil.hasher/models/nl.f1re.mpsutil.hasher.mps
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 40 additions & 0 deletions code/hasher/solutions/nl.f1re.mpsutil.hasher/nl.f1re.mpsutil.hasher.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="nl.f1re.mpsutil.hasher" uuid="078723b2-ab7f-48d1-b9bb-5f643b60d08e" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
<dependencies>
<dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="078723b2-ab7f-48d1-b9bb-5f643b60d08e(nl.f1re.mpsutil.hasher)" version="0" />
</dependencyVersions>
</solution>

29 changes: 29 additions & 0 deletions ...olutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,35 @@
<property role="3oM_SC" value="components." />
</node>
</node>
<node concept="2DRihI" id="3s41kb3Q2x$" role="15bAlk">
<property role="2RT3bR" value="0" />
<node concept="15Ami3" id="3s41kb3Q2y3" role="1PaTwD">
<node concept="37shsh" id="3s41kb3Q2y5" role="15Aodc">
<node concept="1dCxOk" id="3s41kb3Q2yb" role="37shsm">
<property role="1XweGW" value="078723b2-ab7f-48d1-b9bb-5f643b60d08e" />
<property role="1XxBO9" value="nl.f1re.mpsutil.hasher" />
</node>
</node>
</node>
<node concept="3oM_SD" id="3s41kb3Q2y2" role="1PaTwD">
<property role="3oM_SC" value="Added" />
</node>
<node concept="3oM_SD" id="3s41kb3Q2yj" role="1PaTwD">
<property role="3oM_SC" value="efficient," />
</node>
<node concept="3oM_SD" id="3s41kb3Q2yq" role="1PaTwD">
<property role="3oM_SC" value="configurable" />
</node>
<node concept="3oM_SD" id="3s41kb3Q2yk" role="1PaTwD">
<property role="3oM_SC" value="hashing" />
</node>
<node concept="3oM_SD" id="3s41kb3Q2yl" role="1PaTwD">
<property role="3oM_SC" value="of" />
</node>
<node concept="3oM_SD" id="3s41kb3Q2yr" role="1PaTwD">
<property role="3oM_SC" value="subtrees." />
</node>
</node>
</node>
<node concept="15bAme" id="iyWIxrRh41" role="15bAlL">
<node concept="2DRihI" id="iyWIxrRh42" role="15bAlk">
Expand Down
2 changes: 2 additions & 0 deletions scripts/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,10 @@
<echo message="generating" />
<generate fork="true" targetJavaVersion="1.8" logLevel="${mps.ant.log}">
<settings refid="m2m-0" />
<plugin path="${artifacts.mps}/lib/mps-workbench.jar" id="com.intellij.modules.mps" />
<plugin path="${artifacts.mps}/plugins/mps-build" id="jetbrains.mps.build" />
<plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
<chunk>
<module file="${extensions.code}/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd" />
</chunk>
Expand Down