Skip to content

Commit 6830db9

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #341 from mbeddr/merge/MPS-2024.3
Merge maintenance/MPS-2024.1 into maintenance/MPS-2024.3
2 parents a54cf05 + 8f46199 commit 6830db9

File tree

5 files changed

+339
-0
lines changed

5 files changed

+339
-0
lines changed

‎code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,15 @@
128128
<child id="3189788309731917348" name="runtime" index="1E1XAP" />
129129
<child id="9200313594498201639" name="generator" index="1TViLv" />
130130
</concept>
131+
<concept id="322010710375794190" name="jetbrains.mps.build.mps.structure.BuildMps_DevKit" flags="ng" index="3LEwk6">
132+
<child id="322010710375832962" name="exports" index="3LEDUa" />
133+
</concept>
134+
<concept id="322010710375832938" name="jetbrains.mps.build.mps.structure.BuildMps_DevKitExportLanguage" flags="ng" index="3LEDTy">
135+
<reference id="322010710375832947" name="language" index="3LEDTV" />
136+
</concept>
137+
<concept id="322010710375832954" name="jetbrains.mps.build.mps.structure.BuildMps_DevKitExportSolution" flags="ng" index="3LEDTM">
138+
<reference id="322010710375832955" name="solution" index="3LEDTN" />
139+
</concept>
131140
<concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
132141
<property id="8369506495128725901" name="compact" index="BnDLt" />
133142
<property id="322010710375892619" name="uuid" index="3LESm3" />
@@ -875,6 +884,50 @@
875884
</node>
876885
</node>
877886
</node>
887+
<node concept="3LEwk6" id="NzCohCfYuI" role="2G$12L">
888+
<property role="BnDLt" value="true" />
889+
<property role="TrG5h" value="org.mpsqa.lint.devkit" />
890+
<property role="3LESm3" value="ce47f8ae-2ba9-435c-99ef-44dc38731951" />
891+
<node concept="398BVA" id="NzCohCfYuM" role="3LF7KH">
892+
<ref role="398BVh" node="3dqUbgQmcyv" resolve="mpsqa.lint.home" />
893+
<node concept="2Ry0Ak" id="NzCohCfYuQ" role="iGT6I">
894+
<property role="2Ry0Am" value="devkits" />
895+
<node concept="2Ry0Ak" id="NzCohCfYuT" role="2Ry0An">
896+
<property role="2Ry0Am" value="org.mpsqa.lint.devkit" />
897+
<node concept="2Ry0Ak" id="NzCohCfYuW" role="2Ry0An">
898+
<property role="2Ry0Am" value="org.mpsqa.lint.devkit.devkit" />
899+
</node>
900+
</node>
901+
</node>
902+
</node>
903+
<node concept="3LEDTy" id="NzCohCfYw1" role="3LEDUa">
904+
<ref role="3LEDTV" node="3dqUbgQmcyL" resolve="org.mpsqa.lint.generic" />
905+
</node>
906+
<node concept="3LEDTy" id="NzCohCfYw2" role="3LEDUa">
907+
<ref role="3LEDTV" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
908+
</node>
909+
<node concept="3LEDTy" id="NzCohCfYw3" role="3LEDUa">
910+
<ref role="3LEDTV" to="ffeo:568PkTlPWgX" resolve="jetbrains.mps.baseLanguage.collections.trove" />
911+
</node>
912+
<node concept="3LEDTy" id="NzCohCfYw4" role="3LEDUa">
913+
<ref role="3LEDTV" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
914+
</node>
915+
<node concept="3LEDTM" id="NzCohCfYw5" role="3LEDUa">
916+
<ref role="3LEDTN" to="ffeo:mXGwHwhVPj" resolve="JDK" />
917+
</node>
918+
<node concept="3LEDTM" id="NzCohCfYw6" role="3LEDUa">
919+
<ref role="3LEDTN" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
920+
</node>
921+
<node concept="3LEDTy" id="NzCohCgCrh" role="3LEDUa">
922+
<ref role="3LEDTV" to="ffeo:14x5$qAUbkb" resolve="jetbrains.mps.lang.access" />
923+
</node>
924+
<node concept="3LEDTy" id="NzCohCgCri" role="3LEDUa">
925+
<ref role="3LEDTV" to="ffeo:3ZgZ1njKuFL" resolve="jetbrains.mps.lang.smodel.query" />
926+
</node>
927+
<node concept="3LEDTM" id="NzCohCgCrj" role="3LEDUa">
928+
<ref role="3LEDTN" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
929+
</node>
930+
</node>
878931
</node>
879932
<node concept="55IIr" id="3dqUbgQmcy$" role="auvoZ" />
880933
<node concept="2igEWh" id="3dqUbgQmcy_" role="1hWBAP">

‎code/languages/org.mpsqa.lint/.mps/modules.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<project version="4">
33
<component name="MPSProject">
44
<projectModules>
5+
<modulePath path="$PROJECT_DIR$/devkits/org.mpsqa.lint.devkit/org.mpsqa.lint.devkit.devkit" folder="" />
56
<modulePath path="$PROJECT_DIR$/languages/org.mpsqa.lint.generic.linters_library.quickfixes/org.mpsqa.lint.generic.linters_library.quickfixes.mpl" folder="" />
67
<modulePath path="$PROJECT_DIR$/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl" folder="" />
78
<modulePath path="$PROJECT_DIR$/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd" folder="build" />

‎code/languages/org.mpsqa.lint/devkits/org.mpsqa.lint.devkit/org.mpsqa.lint.devkit.devkit

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<dev-kit name="org.mpsqa.lint.devkit" uuid="ce47f8ae-2ba9-435c-99ef-44dc38731951">
3+
<exported-language name="40ab19e9-751a-4433-b645-0e65160e58a0(org.mpsqa.lint.generic)" />
4+
<exported-language name="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" />
5+
<exported-language name="73736c50-f124-433b-b789-2828a15a0adc(jetbrains.mps.baseLanguage.collections.trove)" />
6+
<exported-language name="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" />
7+
<exported-language name="63650c59-16c8-498a-99c8-005c7ee9515d(jetbrains.mps.lang.access)" />
8+
<exported-language name="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)" />
9+
<exported-solutions>
10+
<exported-solution>6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</exported-solution>
11+
<exported-solution>8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</exported-solution>
12+
<exported-solution>498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</exported-solution>
13+
</exported-solutions>
14+
</dev-kit>
15+

0 commit comments

Comments
 (0)