Skip to content

Commit f783de6

Browse files
danielratiulukewoodcockratiudjbellearimer
authored
merge/mps 2023.2 to 2024.1 (#286)
* Remove location in modules_in_project_directory_on_harddisk_but_not_added_to_project linter (#251) * modules_in_project_directory_on_harddisk_but_not_added_to_project: -handle empty parameter -update documentation * meta/uninstantiated concepts and languages (#254) * outline parameters and scope of unused_languages linter * uninstantiated languages linter without configurable paramters * remove instantiationScopeRegex select language scope for search * Update documentation text * arch: implement getPresentation for SingleComponentDependency * lint: cosmetic improvements for the naming and documentation of "languages_with_no_instantiated_concepts" --------- Co-authored-by: Daniel Ratiu <ratiud@mail.google.com> * Improve usability of modules_in_project_directory_on_harddisk_but_not_added_to_project linter (#256) * -remove root directory name entirely from linter -improve usability with path regex pattern to include * update documentation * arch: improvements to speedup the checks by avoiding not necessary steps (#257) Co-authored-by: Daniel Ratiu <ratiud@mail.google.com> * Improve linter empty_migration_scripts (#258) The linter now also detects migrations which only contain empty lines, comments or commented out code Co-authored-by: Jan Belle <jan.belle@protos.de> * gradle: updated mps version * fix model level linters error reporting to achieve stable whitelists (#262) * lint: improvements of error messages to enable stable whitelists * lint: added a linter for "not_used_classes" --------- Co-authored-by: Daniel Ratiu <ratiud@mail.google.com> * arch: quickfix for adding dependencies + tooltip to display the ances… (#263) * arch: quickfix for adding dependencies + tooltip to display the ancestors of a component definition --------- Co-authored-by: Daniel Ratiu <ratiud@mail.google.com> * enhance arch editor (#267) * base.utils: added easy centralized access to currently opened project * deprecated, lint: use the centralized project access utilities * arch: improved the editor * build.gradle: added dependencies from build-subprojects task to "build_base_languages" * build: fixed dependency from test.lint to mpsqa.base * lint.build: add artifact location for org.mpsqa.base * added mpsqa.base as project library to arch, deprecated, profile, unused * lint: project library added dependency to base * arch: enhance architecture description with whitelists for models not considered in the architecture spec (#268) * lint: mini fix of "mandatory_virtual_method_override" * arch: allow specification of whitelists for modules not considered in the architecture * enhance architecture description with the possibility to specify whitelists for modules to be considered (#273) * lint: mini fix of "mandatory_virtual_method_override" * arch: allow specification of whitelists for modules not considered in the architecture * testcov: mini fix to enable tests running on Windows * build.gradle: when performing migrations, load all plugins * overall: ran "gradle migrate" * build.gradle: load only necessary plugins * mpsqa.arch: collapse cells by default * mpsqa.arch: create a new interface ICommentable * mpsqa.arch: add support for commenting single component dependencies * architecture checking enhancements (#276) * arch: fix ModuleComponent_Behavior.getAllModels by considering also models of generators owned by a language * arch: mini cleanup and improvements * lint: added linter "no_alias_defined_for_non_abstract_non_smart_reference_concept" * arch: detect redundantly declared dependencies --------- Co-authored-by: Daniel Ratiu <ratiud@mail.google.com> * arch: support for change impact analysis (#279) * arch: initial implementation for impact analysis * arch: mark impacted regions based on impact analysis results * improve arch editor and linters (#283) * arch: add possibility to set-unset the default collapsing of component definitions * lint: improvements and fixes in the performance linters on the typesystem aspect * lint: added a linter for detecting slow scopes computation * lint,arch: enhance linters and architecture (#285) * lint: make the linter "slow_scope_computation" more robust * arch: implemented simple timed caching to speedup checks of large architectures * ran migration * build.gradle: added 'mps-testing' to the plugins on which migration task depends * lint: File -> Force Save All --------- Co-authored-by: lukewoodcock <lukewoodcock@users.noreply.github.com> Co-authored-by: Daniel Ratiu <ratiud@mail.google.com> Co-authored-by: Jan Belle <jan.belle@protos.de> Co-authored-by: Alexander Rimer <--> Co-authored-by: Alexander Rimer <rimer@itemis.de> Co-authored-by: mps-ci-buildbot <mps-ci@itemis.de> Co-authored-by: Alexander Pann <apann@itemis.com>
1 parent 3e1dc07 commit f783de6

File tree

44 files changed

+7575
-1344
lines changed

Some content is hidden

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

44 files changed

+7575
-1344
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', 'mps-testing']
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" />
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>

0 commit comments

Comments
 (0)