Skip to content

Commit 5609a81

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #269 from mbeddr/merge/MPS-2024.1
Merge maintenance/MPS-2023.2 into maintenance/MPS-2024.1
2 parents 57c8227 + 2e3ee60 commit 5609a81

File tree

34 files changed

+3645
-1000
lines changed

34 files changed

+3645
-1000
lines changed

‎build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,27 +163,27 @@ task build_clones_languages(type: BuildLanguages, dependsOn: [build_base_languag
163163
script scriptFile("build-clones-languages.xml")
164164
}
165165

166-
task build_mutant_languages(type: BuildLanguages, dependsOn: []) {
166+
task build_mutant_languages(type: BuildLanguages, dependsOn: [build_base_languages]) {
167167
script scriptFile("build-mutant-languages.xml")
168168
}
169169

170-
task build_unused_languages(type: BuildLanguages, dependsOn: []) {
170+
task build_unused_languages(type: BuildLanguages, dependsOn: [build_base_languages]) {
171171
script scriptFile("build-unused-languages-analysis.xml")
172172
}
173173

174-
task build_arch_languages(type: BuildLanguages, dependsOn: []) {
174+
task build_arch_languages(type: BuildLanguages, dependsOn: [build_base_languages]) {
175175
script scriptFile("build-arch-analysis-languages.xml")
176176
}
177177

178-
task build_deprecation_analysis_languages(type: BuildLanguages, dependsOn: []) {
178+
task build_deprecation_analysis_languages(type: BuildLanguages, dependsOn: [build_base_languages]) {
179179
script scriptFile("build-deprecated-analysis-languages.xml")
180180
}
181181

182-
task build_lint_analysis_languages(type: BuildLanguages, dependsOn: []) {
182+
task build_lint_analysis_languages(type: BuildLanguages, dependsOn: [build_base_languages]) {
183183
script scriptFile("build-lint-analysis-languages.xml")
184184
}
185185

186-
task build_profile_languages(type: BuildLanguages, dependsOn: []) {
186+
task build_profile_languages(type: BuildLanguages, dependsOn: [build_base_languages]) {
187187
script scriptFile("build-profile-languages.xml")
188188
}
189189

@@ -324,7 +324,7 @@ ext.allProjectDirectoriesInDependencyOrder = [
324324
'org.mpsqa.testing',
325325
'org.mpsqa.unused'
326326
].collect { file("code/languages/$it") }
327-
ext.mpsPluginRoots = ['mps-build', 'mps-console', 'mps-trove', 'mps-modelchecker', 'mps-testing']
327+
ext.mpsPluginRoots = ['mps-build', 'mps-console', 'mps-trove', 'mps-modelchecker', 'mps-tooltips']
328328
.collect { new File(mpsHomeDir, "plugins/$it") }
329329
ext.jbrJavaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
330330

‎build/scripts/build_all_scripts.xml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@
9090

9191
<target name="makeDependents" />
9292

93-
<target name="java.compile.org.mpsqa.build.allScripts" depends="java.compile.org.mpsqa.build">
93+
<target name="java.compile.org.mpsqa.build.allScripts">
9494
<mkdir dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/source_gen" />
9595
<mkdir dir="${build.tmp}/java/out/org.mpsqa.build.allScripts" />
9696
<javac destdir="${build.tmp}/java/out/org.mpsqa.build.allScripts" fork="false" encoding="utf8" includeantruntime="false" debug="true">
9797
<compilerarg value="-Xlint:none" />
9898
<src>
9999
<path location="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/source_gen" />
100100
</src>
101-
<classpath path="${build.tmp}/java/out/org.mpsqa.build" />
101+
<classpath />
102102
</javac>
103103
<copy todir="${build.tmp}/java/out/org.mpsqa.build.allScripts">
104104
<fileset dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/source_gen" excludes="**/*.java" />
@@ -174,15 +174,18 @@
174174
</copy>
175175
</target>
176176

177-
<target name="java.compile.org.mpsqa.lint.build" depends="java.compile.org.mpsqa.build">
177+
<target name="java.compile.org.mpsqa.lint.build" depends="java.compile.org.mpsqa.base.build, java.compile.org.mpsqa.build">
178178
<mkdir dir="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" />
179179
<mkdir dir="${build.tmp}/java/out/org.mpsqa.lint.build" />
180180
<javac destdir="${build.tmp}/java/out/org.mpsqa.lint.build" fork="false" encoding="utf8" includeantruntime="false" debug="true">
181181
<compilerarg value="-Xlint:none" />
182182
<src>
183183
<path location="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" />
184184
</src>
185-
<classpath path="${build.tmp}/java/out/org.mpsqa.build" />
185+
<classpath>
186+
<pathelement path="${build.tmp}/java/out/org.mpsqa.base.build" />
187+
<pathelement path="${build.tmp}/java/out/org.mpsqa.build" />
188+
</classpath>
186189
</javac>
187190
<copy todir="${build.tmp}/java/out/org.mpsqa.lint.build">
188191
<fileset dir="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" excludes="**/*.java" />

‎code/languages/org.mpsqa.arch/.mps/libraries.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project version="4">
3+
<component name="ProjectLibraryManager">
4+
<option name="libraries">
5+
<map>
6+
<entry key="base">
7+
<value>
8+
<Library>
9+
<option name="name" value="base" />
10+
<option name="path" value="${mpsqa.home}/code/languages/org.mpsqa.base" />
11+
</Library>
12+
</value>
13+
</entry>
14+
</map>
15+
</option>
16+
</component>
17+
</project>

‎code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
2626
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
2727
<import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" implicit="true" />
28+
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
2829
</imports>
2930
<registry>
3031
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -79,6 +80,7 @@
7980
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
8081
</concept>
8182
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
83+
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
8284
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
8385
<child id="5680397130376446158" name="type" index="1tU5fm" />
8486
</concept>
@@ -99,6 +101,7 @@
99101
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
100102
<child id="1068581517665" name="statement" index="3cqZAp" />
101103
</concept>
104+
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
102105
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
103106
<child id="1068581517676" name="expression" index="3cqZAk" />
104107
</concept>
@@ -197,6 +200,9 @@
197200
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
198201
<reference id="1138405853777" name="concept" index="ehGHo" />
199202
</concept>
203+
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
204+
<reference id="1138056395725" name="property" index="3TsBF5" />
205+
</concept>
200206
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
201207
<reference id="1138056516764" name="link" index="3Tt5mk" />
202208
</concept>
@@ -2067,6 +2073,59 @@
20672073
<node concept="13hLZK" id="4n1yOK3eHiR" role="13h7CW">
20682074
<node concept="3clFbS" id="4n1yOK3eHiS" role="2VODD2" />
20692075
</node>
2076+
<node concept="13i0hz" id="4p1IWUFLXQy" role="13h7CS">
2077+
<property role="TrG5h" value="getPresentation" />
2078+
<ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
2079+
<node concept="3Tm1VV" id="4p1IWUFLXQX" role="1B3o_S" />
2080+
<node concept="3clFbS" id="4p1IWUFLYmp" role="3clF47">
2081+
<node concept="3clFbF" id="4p1IWUFLYGA" role="3cqZAp">
2082+
<node concept="3cpWs3" id="4p1IWUFM5Ld" role="3clFbG">
2083+
<node concept="Xl_RD" id="4p1IWUFM5NE" role="3uHU7w">
2084+
<property role="Xl_RC" value="'" />
2085+
</node>
2086+
<node concept="3cpWs3" id="4p1IWUFM3g$" role="3uHU7B">
2087+
<node concept="3cpWs3" id="4p1IWUFM2BL" role="3uHU7B">
2088+
<node concept="3cpWs3" id="4p1IWUFM3cF" role="3uHU7B">
2089+
<node concept="Xl_RD" id="4p1IWUFM3dw" role="3uHU7B">
2090+
<property role="Xl_RC" value="'" />
2091+
</node>
2092+
<node concept="2OqwBi" id="4p1IWUFM13S" role="3uHU7w">
2093+
<node concept="2OqwBi" id="4p1IWUFLYRP" role="2Oq$k0">
2094+
<node concept="13iPFW" id="4p1IWUFLYGx" role="2Oq$k0" />
2095+
<node concept="2Xjw5R" id="4p1IWUFM0Lc" role="2OqNvi">
2096+
<node concept="1xMEDy" id="4p1IWUFM0Le" role="1xVPHs">
2097+
<node concept="chp4Y" id="4p1IWUFM0Nz" role="ri$Ld">
2098+
<ref role="cht4Q" to="ryx8:6MUZd5Uj9vB" resolve="ComponentDefinition" />
2099+
</node>
2100+
</node>
2101+
</node>
2102+
</node>
2103+
<node concept="3TrcHB" id="4p1IWUFM1kJ" role="2OqNvi">
2104+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
2105+
</node>
2106+
</node>
2107+
</node>
2108+
<node concept="Xl_RD" id="4p1IWUFM2Cx" role="3uHU7w">
2109+
<property role="Xl_RC" value="' is dependent on '" />
2110+
</node>
2111+
</node>
2112+
<node concept="2OqwBi" id="4p1IWUFM4wK" role="3uHU7w">
2113+
<node concept="2OqwBi" id="4p1IWUFM3Tn" role="2Oq$k0">
2114+
<node concept="13iPFW" id="4p1IWUFM3hC" role="2Oq$k0" />
2115+
<node concept="3TrEf2" id="4p1IWUFM4l2" role="2OqNvi">
2116+
<ref role="3Tt5mk" to="ryx8:6MUZd5Uj9wm" resolve="component" />
2117+
</node>
2118+
</node>
2119+
<node concept="3TrcHB" id="4p1IWUFM4HC" role="2OqNvi">
2120+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
2121+
</node>
2122+
</node>
2123+
</node>
2124+
</node>
2125+
</node>
2126+
</node>
2127+
<node concept="17QB3L" id="4p1IWUFLYmq" role="3clF45" />
2128+
</node>
20702129
</node>
20712130
</model>
20722131

0 commit comments

Comments
 (0)