Skip to content
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

Merge maintenance/MPS-2024.1 into maintenance/MPS-2024.3 #274

Open
wants to merge 18 commits into
base: maintenance/MPS-2024.3
Choose a base branch
from
Open

Merge maintenance/MPS-2024.1 into maintenance/MPS-2024.3 #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
18f65ea
Remove location in modules_in_project_directory_on_harddisk_but_not_a…
lukewoodcock Nov 27, 2024
a291e4c
meta/uninstantiated concepts and languages (#254)
lukewoodcock Dec 3, 2024
d7fe7dc
Improve usability of modules_in_project_directory_on_harddisk_but_not…
lukewoodcock Dec 4, 2024
bd1af14
arch: improvements to speedup the checks by avoiding not necessary st…
danielratiu Dec 4, 2024
974d55e
Improve linter empty_migration_scripts (#258)
danielratiu Dec 5, 2024
8ddb125
gradle: updated mps version
Dec 10, 2024
3317900
Merge pull request #260 from mbeddr/feature/arimer/updateMPS2023.2.2
arimer Dec 10, 2024
dafdd87
fix model level linters error reporting to achieve stable whitelists …
danielratiu Dec 17, 2024
4234691
arch: quickfix for adding dependencies + tooltip to display the ances…
danielratiu Dec 23, 2024
a0f0843
enhance arch editor (#267)
danielratiu Jan 9, 2025
c22f22f
arch: enhance architecture description with whitelists for models not…
danielratiu Jan 12, 2025
a186e20
enhance architecture description with the possibility to specify whit…
danielratiu Jan 14, 2025
2687ea0
Merge remote-tracking branch 'refs/remotes/origin/maintenance/MPS-202…
danielratiu Jan 14, 2025
1b2effc
testcov: mini fix to enable tests running on Windows
danielratiu Jan 14, 2025
0f24e74
build.gradle: when performing migrations, load all plugins
danielratiu Jan 14, 2025
a117951
overall: ran "gradle migrate"
danielratiu Jan 14, 2025
2e3ee60
build.gradle: load only necessary plugins
danielratiu Jan 14, 2025
5609a81
Merge pull request #269 from mbeddr/merge/MPS-2024.1
mps-ci-buildbot Jan 14, 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
14 changes: 7 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,27 +163,27 @@ task build_clones_languages(type: BuildLanguages, dependsOn: [build_base_languag
script scriptFile("build-clones-languages.xml")
}

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

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

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

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

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

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

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

Expand Down
11 changes: 7 additions & 4 deletions build/scripts/build_all_scripts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@

<target name="makeDependents" />

<target name="java.compile.org.mpsqa.build.allScripts" depends="java.compile.org.mpsqa.build">
<target name="java.compile.org.mpsqa.build.allScripts">
<mkdir dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/source_gen" />
<mkdir dir="${build.tmp}/java/out/org.mpsqa.build.allScripts" />
<javac destdir="${build.tmp}/java/out/org.mpsqa.build.allScripts" fork="false" encoding="utf8" includeantruntime="false" debug="true">
<compilerarg value="-Xlint:none" />
<src>
<path location="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/source_gen" />
</src>
<classpath path="${build.tmp}/java/out/org.mpsqa.build" />
<classpath />
</javac>
<copy todir="${build.tmp}/java/out/org.mpsqa.build.allScripts">
<fileset dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/source_gen" excludes="**/*.java" />
Expand Down Expand Up @@ -174,15 +174,18 @@
</copy>
</target>

<target name="java.compile.org.mpsqa.lint.build" depends="java.compile.org.mpsqa.build">
<target name="java.compile.org.mpsqa.lint.build" depends="java.compile.org.mpsqa.base.build, java.compile.org.mpsqa.build">
<mkdir dir="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" />
<mkdir dir="${build.tmp}/java/out/org.mpsqa.lint.build" />
<javac destdir="${build.tmp}/java/out/org.mpsqa.lint.build" fork="false" encoding="utf8" includeantruntime="false" debug="true">
<compilerarg value="-Xlint:none" />
<src>
<path location="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" />
</src>
<classpath path="${build.tmp}/java/out/org.mpsqa.build" />
<classpath>
<pathelement path="${build.tmp}/java/out/org.mpsqa.base.build" />
<pathelement path="${build.tmp}/java/out/org.mpsqa.build" />
</classpath>
</javac>
<copy todir="${build.tmp}/java/out/org.mpsqa.lint.build">
<fileset dir="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" excludes="**/*.java" />
Expand Down
17 changes: 17 additions & 0 deletions code/languages/org.mpsqa.arch/.mps/libraries.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectLibraryManager">
<option name="libraries">
<map>
<entry key="base">
<value>
<Library>
<option name="name" value="base" />
<option name="path" value="${mpsqa.home}/code/languages/org.mpsqa.base" />
</Library>
</value>
</entry>
</map>
</option>
</component>
</project>
59 changes: 59 additions & 0 deletions code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
<import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" implicit="true" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
</imports>
<registry>
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
Expand Down Expand Up @@ -79,6 +80,7 @@
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
Expand All @@ -99,6 +101,7 @@
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
<child id="1068581517676" name="expression" index="3cqZAk" />
</concept>
Expand Down Expand Up @@ -197,6 +200,9 @@
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
<reference id="1138056395725" name="property" index="3TsBF5" />
</concept>
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
<reference id="1138056516764" name="link" index="3Tt5mk" />
</concept>
Expand Down Expand Up @@ -2067,6 +2073,59 @@
<node concept="13hLZK" id="4n1yOK3eHiR" role="13h7CW">
<node concept="3clFbS" id="4n1yOK3eHiS" role="2VODD2" />
</node>
<node concept="13i0hz" id="4p1IWUFLXQy" role="13h7CS">
<property role="TrG5h" value="getPresentation" />
<ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
<node concept="3Tm1VV" id="4p1IWUFLXQX" role="1B3o_S" />
<node concept="3clFbS" id="4p1IWUFLYmp" role="3clF47">
<node concept="3clFbF" id="4p1IWUFLYGA" role="3cqZAp">
<node concept="3cpWs3" id="4p1IWUFM5Ld" role="3clFbG">
<node concept="Xl_RD" id="4p1IWUFM5NE" role="3uHU7w">
<property role="Xl_RC" value="'" />
</node>
<node concept="3cpWs3" id="4p1IWUFM3g$" role="3uHU7B">
<node concept="3cpWs3" id="4p1IWUFM2BL" role="3uHU7B">
<node concept="3cpWs3" id="4p1IWUFM3cF" role="3uHU7B">
<node concept="Xl_RD" id="4p1IWUFM3dw" role="3uHU7B">
<property role="Xl_RC" value="'" />
</node>
<node concept="2OqwBi" id="4p1IWUFM13S" role="3uHU7w">
<node concept="2OqwBi" id="4p1IWUFLYRP" role="2Oq$k0">
<node concept="13iPFW" id="4p1IWUFLYGx" role="2Oq$k0" />
<node concept="2Xjw5R" id="4p1IWUFM0Lc" role="2OqNvi">
<node concept="1xMEDy" id="4p1IWUFM0Le" role="1xVPHs">
<node concept="chp4Y" id="4p1IWUFM0Nz" role="ri$Ld">
<ref role="cht4Q" to="ryx8:6MUZd5Uj9vB" resolve="ComponentDefinition" />
</node>
</node>
</node>
</node>
<node concept="3TrcHB" id="4p1IWUFM1kJ" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
<node concept="Xl_RD" id="4p1IWUFM2Cx" role="3uHU7w">
<property role="Xl_RC" value="' is dependent on '" />
</node>
</node>
<node concept="2OqwBi" id="4p1IWUFM4wK" role="3uHU7w">
<node concept="2OqwBi" id="4p1IWUFM3Tn" role="2Oq$k0">
<node concept="13iPFW" id="4p1IWUFM3hC" role="2Oq$k0" />
<node concept="3TrEf2" id="4p1IWUFM4l2" role="2OqNvi">
<ref role="3Tt5mk" to="ryx8:6MUZd5Uj9wm" resolve="component" />
</node>
</node>
<node concept="3TrcHB" id="4p1IWUFM4HC" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="17QB3L" id="4p1IWUFLYmq" role="3clF45" />
</node>
</node>
</model>

Loading
Loading