Merge pull request #1700 from JetBrains/merge/mps20251

Merge maintenance/mps20241 into maintenance/mps20251

Author: mps-ci-buildbot

build.gradle.kts

@@ -2,7 +2,9 @@ import com.specificlanguages.mps.MainBuild
 import com.specificlanguages.mps.MpsBuild
 import com.specificlanguages.mps.RunAnt
 import com.specificlanguages.mps.TestBuild
+import de.itemis.mps.gradle.EnvironmentKind
 import de.itemis.mps.gradle.GitBasedVersioning
+import de.itemis.mps.gradle.tasks.MpsGenerate
 import de.itemis.mps.gradle.tasks.MpsMigrate
 import de.itemis.mps.gradle.tasks.Remigrate
 import groovy.xml.XmlSlurper
@@ -188,39 +190,37 @@ bundledDependencies {
 
 }
 
-mpsBuilds {
-    val languages by creating(MainBuild::class) {
-        mpsProjectDirectory = codeDir
-        buildArtifactsDirectory = layout.buildDirectory.dir("artifacts/de.itemis.mps.extensions")
-        buildSolutionDescriptor = codeDir.file("build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd")
-        buildFile = layout.buildDirectory.file("generated/languages/build.xml")
-    }
-
-    val tests by creating(TestBuild::class) {
-        dependsOn(languages)
-        mpsProjectDirectory = codeDir
-        buildArtifactsDirectory = layout.buildDirectory.dir("artifacts/de.itemis.mps.extensions.tests")
-        buildSolutionDescriptor = codeDir.file("build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd")
-        buildFile = layout.buildDirectory.file("generated/tests/build.xml")
-
-        assembleAndCheckTask {
-            finalizedBy("failOnTestError")
+val languages by mpsBuilds.creating(MainBuild::class) {
+    mpsProjectDirectory = codeDir
+    buildArtifactsDirectory = layout.buildDirectory.dir("artifacts/de.itemis.mps.extensions")
+    buildSolutionDescriptor = codeDir.file("build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd")
+    buildFile = layout.buildDirectory.file("generated/languages/build.xml")
+}
 
-            doLast {
-                val reportDir = layout.buildDirectory.dir("junitreport").get()
-                ant.withGroovyBuilder {
-                    "taskdef"(
-                        "name" to "junitreport",
-                        "classname" to "org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator",
-                        "classpath" to mpsDefaults.antClasspath.asPath
-                    )
-                    "junitreport" {
-                        "fileset"("dir" to "$buildDir", "includes" to "**/TEST*.xml")
-                        "report"("format" to "frames", "todir" to reportDir)
-                    }
+val tests by mpsBuilds.creating(TestBuild::class) {
+    dependsOn(languages)
+    mpsProjectDirectory = codeDir
+    buildArtifactsDirectory = layout.buildDirectory.dir("artifacts/de.itemis.mps.extensions.tests")
+    buildSolutionDescriptor = codeDir.file("build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd")
+    buildFile = layout.buildDirectory.file("generated/tests/build.xml")
+
+    assembleAndCheckTask {
+        finalizedBy("failOnTestError")
+
+        doLast {
+            val reportDir = layout.buildDirectory.dir("junitreport").get()
+            ant.withGroovyBuilder {
+                "taskdef"(
+                    "name" to "junitreport",
+                    "classname" to "org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator",
+                    "classpath" to mpsDefaults.antClasspath.asPath
+                )
+                "junitreport" {
+                    "fileset"("dir" to "$buildDir", "includes" to "**/TEST*.xml")
+                    "report"("format" to "frames", "todir" to reportDir)
                 }
-                println("JUnit report placed into file://$reportDir/index.html")
             }
+            println("JUnit report placed into file://$reportDir/index.html")
         }
     }
 }
@@ -234,12 +234,6 @@ tasks.withType<RunAnt>().configureEach {
 }
 
 // ___________________ utilities ___________________
-tasks.register<Copy>("copyChangelog") {
-    from(codeDir.dir("solutions/de.itemis.mps.extensions.changelog/source_gen/de/itemis/mps/extensions/changelog"))
-    into(layout.settingsDirectory)
-    include("*.md")
-}
-
 tasks.register("failOnTestError") {
     description = "evaluate junit result and fail on error"
     doLast {
@@ -448,3 +442,36 @@ tasks.register<Remigrate>("remigrate") {
     // diagram migration from version 0 is currently not rerunnable, although it claims to be
     excludeModuleMigration("de.itemis.mps.editor.diagram", 0)
 }
+
+val generateChangelog by tasks.registering(MpsGenerate::class) {
+    dependsOn(languages.generateTask)
+
+    javaLauncher = jbrToolchain.javaLauncher
+    mpsHome = mpsDefaults.mpsHome
+
+    environmentKind = EnvironmentKind.MPS
+
+    projectLocation = codeDir
+    pluginRoots.from(usedPluginRoots)
+
+    modules = listOf("de.itemis.mps.extensions.changelog")
+}
+
+val copyChangelog by tasks.registering {
+    dependsOn(generateChangelog)
+
+    doLast {
+        // Using a copy action here instead of making this task a Copy. Otherwise Gradle considers the entire project to
+        // be the output of this task (because the destination directory is the project root) and complains about
+        // implicit dependencies.
+        copy {
+            from(codeDir.dir("solutions/de.itemis.mps.extensions.changelog/source_gen/de/itemis/mps/extensions/changelog"))
+            into(layout.settingsDirectory)
+            include("*.md")
+        }
+    }
+}
+
+tasks.build {
+    dependsOn(copyChangelog)
+}

code/.mps/modules.xml

@@ -17,7 +17,6 @@
       <modulePath path="$PROJECT_DIR$/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd" folder="blutil" />
       <modulePath path="$PROJECT_DIR$/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd" folder="blutil" />
       <modulePath path="$PROJECT_DIR$/blutil/tests/test.ts.match/match.msd" folder="blutil" />
-      <modulePath path="$PROJECT_DIR$/build/solutions/allScripts/allScripts.msd" folder="build" />
       <modulePath path="$PROJECT_DIR$/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd" folder="build" />
       <modulePath path="$PROJECT_DIR$/celllayout/languages/de.itemis.mps.celllayout/de.itemis.mps.editor.celllayout.styles.mpl" folder="celllayout" />
       <modulePath path="$PROJECT_DIR$/celllayout/languages/de.itemis.mps.editor.celllayout.sandboxlang/de.itemis.mps.editor.celllayout.sandboxlang.mpl" folder="celllayout" />