Merge pull request #200 from modelix/issue/MODELIX-467

MODELIX-467 Caching in model-api-gen does not add new concepts on rebuild

Author: Oleksandr Dzhychko

model-api-gen-gradle/src/main/kotlin/org/modelix/metamodel/gradle/GenerateAntScriptForMpsMetaModelExport.kt

@@ -1,31 +1,28 @@
 package org.modelix.metamodel.gradle
 
 import org.gradle.api.DefaultTask
-import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.*
 import org.gradle.api.tasks.Optional
+import java.io.File
 import java.util.*
 import javax.inject.Inject
 
 @CacheableTask
 abstract class GenerateAntScriptForMpsMetaModelExport @Inject constructor(of: ObjectFactory) : DefaultTask() {
-    @get:InputDirectory
-    @PathSensitive(PathSensitivity.RELATIVE)
-    val mpsHome: DirectoryProperty = of.directoryProperty()
+    @Input
+    val mpsHome: Property<String> = of.property(String::class.java)
 
     @get:OutputFile
     val antScriptFile: RegularFileProperty = of.fileProperty()
 
-    @InputDirectory
-    @PathSensitive(PathSensitivity.RELATIVE)
+    @Input
     val exporterDir: Property<String> = of.property(String::class.java)
 
-    @InputFiles
-    @PathSensitive(PathSensitivity.RELATIVE)
+    @Input
     val moduleFolders: ListProperty<String> = of.listProperty(String::class.java)
 
     @Input
@@ -75,7 +72,7 @@ abstract class GenerateAntScriptForMpsMetaModelExport @Inject constructor(of: Ob
                     <taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="path.mps.ant.path" />
                 </target>
 
-                <target name="export-languages" depends="declare-mps-tasks">
+                <target name="export-languages" depends="clean,declare-mps-tasks">
                     <echo message="Running export of languages" />
                     <runMPS solution="e52a4421-48a2-4de1-8327-d9414e799c67(org.modelix.metamodel.export)" startClass="org.modelix.metamodel.export.CommandlineExporter" startMethod="${if (exportModulesFilter.isPresent) "exportBoth" else "exportLanguages"}">
                         <library file="${getMpsLanguagesDir().absolutePath}" />
@@ -101,8 +98,8 @@ abstract class GenerateAntScriptForMpsMetaModelExport @Inject constructor(of: Ob
         """.trimIndent())
     }
 
-    private fun getMpsBuildPropertiesFile() = mpsHome.get().asFile.resolve("build.properties")
-    private fun getMpsLanguagesDir() = mpsHome.get().asFile.resolve("languages")
+    private fun getMpsBuildPropertiesFile() = File(mpsHome.get()).resolve("build.properties")
+    private fun getMpsLanguagesDir() = File(mpsHome.get()).resolve("languages")
 
     private fun getMpsVersion(): String {
         val buildPropertiesFile = getMpsBuildPropertiesFile()

model-api-gen-gradle/src/main/kotlin/org/modelix/metamodel/gradle/MetaModelGradlePlugin.kt

@@ -32,7 +32,7 @@ class MetaModelGradlePlugin: Plugin<Project> {
             task.enabled = settings.jsonDir == null
             task.dependsOn(downloadExporterDependencies)
             task.dependsOn(*settings.taskDependencies.toTypedArray())
-            task.mpsHome.set(getMpsHome())
+            task.mpsHome.set(getMpsHome()?.absolutePath)
             task.heapSize.set(settings.mpsHeapSize)
             if (settings.includedModules.isNotEmpty()) task.exportModulesFilter.set(settings.includedModules.joinToString(","))
             task.antScriptFile.set(getAntScriptFile())