Fix merge issues, run migrations and adapt code to new MPS version

mbeddr · Jan 31, 2024 · 1c27066 · 1c27066
1 parent b9c0e3d
commit 1c27066
Show file tree

Hide file tree

Showing 76 changed files with 578 additions and 574 deletions.
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
@@ -1,11 +1,9 @@
-<project name="org.mpsqa.allScripts" default="build">
+<project name="org.mpsqa.allScripts" default="build" basedir="../..">
   <!-- Generated by MPS -->
   <property name="build.dir" location="build" />
   <property name="build.tmp" location="${build.dir}/tmp/org.mpsqa.allScripts" />
   <property name="build.layout" location="${build.dir}/artifacts/org.mpsqa.allScripts" />
   <property name="mps.home" location="" />
-  <property name="mpsqa.home" location="${basedir}/../.." />
-  <property name="mpsqa.build.home" location="${mpsqa.home}/code/languages/org.mpsqa.build" />
   <property name="artifacts.mps" location="${mps.home}" />
   <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
   <property name="mps.build.number" value="${import.mps.mps.build.number}" />
@@ -37,74 +35,7 @@
   <generator-settings id="m2m-defaults" strictMode="true" parallelThreads="8" inplaceTransform="false" warnWrongChild="true" createStaticRefs="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}" />
 
   <target name="assemble" depends="classes, declare-mps-tasks">
-    <mkdir dir="${build.layout}/org.mpsqa.build" />
-    <mkdir dir="${build.layout}/org.mpsqa.build/META-INF" />
-    <echoxml file="${build.layout}/org.mpsqa.build/META-INF/plugin.xml">
-      <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-        <id>org.mpsqa.build</id>
-        <name>org.mpsqa.build</name>
-        <version>0.1</version>
-        <depends>jetbrains.mps.build</depends>
-
-        <extensions defaultExtensionNs="com.intellij">
-          <mps.LanguageLibrary dir="/languages" />
-        </extensions>
-      </idea-plugin>
-    </echoxml>
-    <mkdir dir="${build.layout}/org.mpsqa.build/lib" />
-    <mkdir dir="${build.tmp}/default/org.mpsqa.build.jar" />
-    <mkdir dir="${build.tmp}/default/org.mpsqa.build.jar/META-INF" />
-    <echoxml file="${build.tmp}/default/org.mpsqa.build.jar/META-INF/plugin.xml">
-      <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-        <id>org.mpsqa.build</id>
-        <name>org.mpsqa.build</name>
-        <version>0.1</version>
-        <depends>jetbrains.mps.build</depends>
-
-        <extensions defaultExtensionNs="com.intellij">
-          <mps.LanguageLibrary dir="/languages" />
-        </extensions>
-      </idea-plugin>
-    </echoxml>
-    <jar destfile="${build.layout}/org.mpsqa.build/lib/org.mpsqa.build.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/default/org.mpsqa.build.jar" />
-    </jar>
-    <mkdir dir="${build.layout}/org.mpsqa.build/languages" />
-    <mkdir dir="${build.tmp}/default/org.mpsqa.build.jar1" />
-    <mkdir dir="${build.tmp}/default/org.mpsqa.build.jar1/META-INF" />
-    <echoxml file="${build.tmp}/default/org.mpsqa.build.jar1/META-INF/module.xml">
-      <module namespace="org.mpsqa.build" type="solution" uuid="11d4368a-a7e8-4dd9-bfc6-c2de268d1994">
-        <dependencies>
-          <module ref="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" kind="cl" />
-        </dependencies>
-        <uses>
-          <language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
-          <language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
-        </uses>
-        <classpath>
-          <entry path="." />
-        </classpath>
-        <sources jar="org.mpsqa.build-src.jar" descriptor="org.mpsqa.build.msd" />
-      </module>
-    </echoxml>
-    <jar destfile="${build.layout}/org.mpsqa.build/languages/org.mpsqa.build.jar" duplicate="preserve">
-      <fileset dir="${build.tmp}/java/out/org.mpsqa.build" />
-      <fileset dir="${mpsqa.build.home}/solutions/org.mpsqa.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
-      <fileset dir="${build.tmp}/default/org.mpsqa.build.jar1" />
-    </jar>
-    <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-org.mpsqa.build-models">
-      <fileset dir="${mpsqa.build.home}/solutions/org.mpsqa.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
-    </copyModels>
-    <jar destfile="${build.layout}/org.mpsqa.build/languages/org.mpsqa.build-src.jar" duplicate="preserve">
-      <fileset dir="${mpsqa.build.home}/solutions/org.mpsqa.build/source_gen">
-        <exclude name="**/trace.info" />
-        <exclude name="**/exports" />
-        <exclude name="**/checkpoints" />
-        <exclude name="**/*.mps" />
-      </fileset>
-      <zipfileset file="${mpsqa.build.home}/solutions/org.mpsqa.build/org.mpsqa.build.msd" prefix="module" />
-      <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-org.mpsqa.build-models" prefix="module/models" />
-    </jar>
+    <mkdir dir="${build.layout}" />
     <echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
   </target>
 
@@ -119,7 +50,7 @@
     <delete dir="${build.layout}" />
   </target>
 
-  <target name="compileJava" depends="java.compile.org.mpsqa.build, java.compile.org.mpsqa.lint.build, java.compile.org.mpsqa.clones.build" />
+  <target name="compileJava" depends="java.compile.org.mpsqa.build.allScripts, java.compile.org.mpsqa.build, java.compile.org.mpsqa.clones.build, java.compile.org.mpsqa.lint.build" />
 
   <target name="processResources" />
 
@@ -224,64 +155,90 @@
       <library file="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
       <library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
       <chunk>
-        <module file="${mpsqa.build.home}/solutions/org.mpsqa.build/org.mpsqa.build.msd" />
-        <module file="${mpsqa.home}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd" />
-        <module file="${mpsqa.home}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd" />
+        <module file="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd" />
+        <module file="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/org.mpsqa.build.allScripts.msd" />
+        <module file="${basedir}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd" />
+        <module file="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd" />
+        <module file="${basedir}/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/org.mpsqa.testing.tests.build.msd" />
       </chunk>
       <jvmargs>
         <arg value="-ea" />
         <arg value="-Xmx1024m" />
         <arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
       </jvmargs>
       <macro name="mps.home" path="${mps.home}" />
-      <macro name="mpsqa.home" path="${mpsqa.home}" />
-      <macro name="mpsqa.build.home" path="${mpsqa.build.home}" />
     </generate>
   </target>
 
   <target name="declare-mps-tasks" />
 
   <target name="makeDependents" />
 
+  <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 />
+    </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" />
+    </copy>
+  </target>
+
   <target name="java.compile.org.mpsqa.build">
-    <mkdir dir="${mpsqa.build.home}/solutions/org.mpsqa.build/source_gen" />
+    <mkdir dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/source_gen" />
     <mkdir dir="${build.tmp}/java/out/org.mpsqa.build" />
-    <javac destdir="${build.tmp}/java/out/org.mpsqa.build" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+    <javac destdir="${build.tmp}/java/out/org.mpsqa.build" fork="false" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mpsqa.build.home}/solutions/org.mpsqa.build/source_gen" />
+        <path location="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/source_gen" />
       </src>
       <classpath />
     </javac>
+    <copy todir="${build.tmp}/java/out/org.mpsqa.build">
+      <fileset dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/source_gen" excludes="**/*.java" />
+    </copy>
   </target>
 
-  <target name="java.compile.org.mpsqa.lint.build" depends="java.compile.org.mpsqa.build">
-    <mkdir dir="${mpsqa.home}/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="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.org.mpsqa.clones.build" depends="java.compile.org.mpsqa.build">
+    <mkdir dir="${basedir}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/org.mpsqa.clones.build" />
+    <javac destdir="${build.tmp}/java/out/org.mpsqa.clones.build" fork="false" encoding="utf8" includeantruntime="false" debug="true">
       <compilerarg value="-Xlint:none" />
       <src>
-        <path location="${mpsqa.home}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" />
+        <path location="${basedir}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
       </src>
       <classpath path="${build.tmp}/java/out/org.mpsqa.build" />
     </javac>
+    <copy todir="${build.tmp}/java/out/org.mpsqa.clones.build">
+      <fileset dir="${basedir}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" excludes="**/*.java" />
+    </copy>
   </target>
 
-  <target name="java.compile.org.mpsqa.clones.build" depends="java.compile.org.mpsqa.build">
-    <mkdir dir="${mpsqa.home}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
-    <mkdir dir="${build.tmp}/java/out/org.mpsqa.clones.build" />
-    <javac destdir="${build.tmp}/java/out/org.mpsqa.clones.build" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+  <target name="java.compile.org.mpsqa.lint.build" depends="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="${mpsqa.home}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
+        <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" />
     </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" />
+    </copy>
   </target>
 
   <target name="cleanSources">
-    <delete dir="${mpsqa.build.home}/solutions/org.mpsqa.build/source_gen" />
-    <delete dir="${mpsqa.home}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
-    <delete dir="${mpsqa.home}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" />
+    <delete dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/source_gen" />
+    <delete dir="${basedir}/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/source_gen" />
+    <delete dir="${basedir}/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/source_gen" />
+    <delete dir="${basedir}/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/source_gen" />
+    <delete dir="${basedir}/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/source_gen" />
   </target>
 </project>
diff --git a/.../org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd b/.../org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="org.mpsqa.arch.pluginSolution" uuid="96212ac2-423f-4cfb-b211-b58d0546b6bf" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
-    <modelRoot contentPath="${module}/lib/plantuml-1.2022.6.jar!/" type="java_classes">
-      <sourceRoot location="." />
-    </modelRoot>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
+    <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="plantuml-asl-1.2023.13.jar" />
     </modelRoot>
   </models>
   <facets>
     <facet type="java" compile="mps" classes="mps" ext="yes">
       <classes generated="true" path="${module}/classes_gen" />
-      <library location="${module}/lib/plantuml-1.2022.6.jar" />
+      <library location="${module}/lib/plantuml-asl-1.2023.13.jar" />
+      <library location="${module}/lib/plantuml-asl-1.2023.13.jar" />
     </facet>
   </facets>
   <stubModelEntries>
     <stubModelEntry path="${module}/lib/plantuml-asl-1.2023.13.jar" />
   </stubModelEntries>
-  <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)</dependency>

diff --git a/...es/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps b/...es/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
@@ -102,17 +102,14 @@
       <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
         <child id="763829979718664967" name="files" index="3rtmxm" />
       </concept>
-      <concept id="5507251971038816436" name="jetbrains.mps.build.mps.structure.BuildMps_Generator" flags="ng" index="1yeLz9" />
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
         <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
         <property id="8137134783396676838" name="extracted" index="1HemKv" />
         <property id="2889113830911481881" name="deployFolderName" index="3ZfqAx" />
         <child id="8137134783396676835" name="location" index="1HemKq" />
       </concept>
       <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
-      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD">
-        <child id="9200313594498201639" name="generator" index="1TViLv" />
-      </concept>
+      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD" />
       <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
         <property id="8369506495128725901" name="compact" index="BnDLt" />
         <property id="322010710375892619" name="uuid" index="3LESm3" />
@@ -553,35 +550,6 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
           </node>
         </node>
-        <node concept="1yeLz9" id="2JVMSZMFXiy" role="1TViLv">
-          <property role="TrG5h" value="org.mpsqa.clones.config#01" />
-          <property role="3LESm3" value="652ee78b-a037-4640-8f3d-b20c9bc39b99" />
-          <node concept="1BupzO" id="5DtatEIcVZg" role="3bR31x">
-            <property role="3ZfqAx" value="generator/template" />
-            <property role="1Hdu6h" value="true" />
-            <property role="1HemKv" value="true" />
-            <node concept="3LXTmp" id="5DtatEIcVZh" role="1HemKq">
-              <node concept="398BVA" id="5DtatEIcVZ3" role="3LXTmr">
-                <ref role="398BVh" node="2JVMSZMFXgq" resolve="mpsqa.clones.home" />
-                <node concept="2Ry0Ak" id="5DtatEIcVZ4" role="iGT6I">
-                  <property role="2Ry0Am" value="languages" />
-                  <node concept="2Ry0Ak" id="5DtatEIcVZ5" role="2Ry0An">
-                    <property role="2Ry0Am" value="org.mpsqa.clones.config" />
-                    <node concept="2Ry0Ak" id="5DtatEIcVZ6" role="2Ry0An">
-                      <property role="2Ry0Am" value="generator" />
-                      <node concept="2Ry0Ak" id="5DtatEIcVZ7" role="2Ry0An">
-                        <property role="2Ry0Am" value="template" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3qWCbU" id="5DtatEIcVZi" role="3LXTna">
-                <property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3rtmxn" id="2JVMSZMFXCE" role="3bR31x">
           <node concept="3LXTmp" id="2JVMSZMFXCF" role="3rtmxm">
             <node concept="398BVA" id="2JVMSZMFXCG" role="3LXTmr">

diff --git a/...ages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps b/...ages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
@@ -52,7 +52,7 @@
       <concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
         <property id="8654221991637384184" name="pattern" index="3qWCbO" />
       </concept>
-      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
+      <concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
         <child id="7389400916848037006" name="children" index="39821P" />
       </concept>
       <concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
@@ -65,7 +65,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -676,6 +676,11 @@
             <ref role="3bR37D" to="ffeo:7pdFgzxlDoP" resolve="jetbrains.mps.build.mps" />
           </node>
         </node>
+        <node concept="1SiIV0" id="x5N8BMMJ9t" role="3bR37C">
+          <node concept="3bR9La" id="x5N8BMMJ9u" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="55IIr" id="3dqUbgQmcy$" role="auvoZ" />