Merge pull request #274 from mbeddr/merge/MPS-2024.3

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

Author: mps-ci-buildbot

build.gradle

@@ -161,27 +161,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")
 }
 
@@ -322,7 +322,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', 'mps-testing']
         .collect { new File(mpsHomeDir, "plugins/$it") }
 ext.jbrJavaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
 

build/scripts/build_all_scripts.xml

@@ -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" />
@@ -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" />

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

@@ -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>