Extracted common code to build module repository (#18)

mbeddr · Aug 29, 2023 · 7650c9b · 7650c9b
1 parent 6099e20
commit 7650c9b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/...n/plugin/src/main/groovy/org/mps_cli/gradle/plugin/AbstractDependenciesBuilderTask.groovy b/...n/plugin/src/main/groovy/org/mps_cli/gradle/plugin/AbstractDependenciesBuilderTask.groovy
@@ -2,8 +2,8 @@ package org.mps_cli.gradle.plugin
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 import org.mps_cli.model.SRepository
-import org.mps_cli.model.builder.SLanguageBuilder
 import org.mps_cli.model.builder.SModulesRepositoryBuilder
 
 abstract class AbstractDependenciesBuilderTask extends DefaultTask {
@@ -13,21 +13,19 @@ abstract class AbstractDependenciesBuilderTask extends DefaultTask {
     @Input
     List<String> sourcesDir;
 
+    @Internal
+    SRepository repository;
+
     abstract List<Object> allEntities();
     abstract List<Object> directDependencies(Object entity);
 
     def buildEntityDependencies(Map<?, Set<?>> entity2AllUpstreamDependencies,
                                 Map<?, Set<?>> entity2AllDownstreamDependencies) {
-        SLanguageBuilder.clear()
-        sourcesDir.each {
-            def dir = new File(it).getAbsoluteFile().canonicalPath
-            println("loading models from directory: " + dir)
-            builder.build(dir)
-        }
+        repository = builder.buildAll(sourcesDir)
 
         for (Object entity : allEntities()) {
             Set<Object> dependencies = [].toSet()
-            collectUpstreamDependencies(builder.repo, entity, dependencies)
+            collectUpstreamDependencies(repository, entity, dependencies)
             entity2AllUpstreamDependencies[entity] = dependencies
         }
 

diff --git a/...li-gradle-plugin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ModelBuilderTask.groovy b/...li-gradle-plugin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ModelBuilderTask.groovy
@@ -5,7 +5,6 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import org.mps_cli.model.SRepository
-import org.mps_cli.model.builder.SLanguageBuilder
 import org.mps_cli.model.builder.SModulesRepositoryBuilder
 
 class ModelBuilderTask extends DefaultTask {
@@ -24,15 +23,8 @@ class ModelBuilderTask extends DefaultTask {
     @TaskAction
     def buildModel() {
         def builder = new SModulesRepositoryBuilder()
-        SLanguageBuilder.clear()
-        sourcesDir.each {
-            def dir = new File(it).getAbsoluteFile().canonicalPath
-            println("loading models from directory: " + dir)
-            builder.build(dir)
-        }
-        //setProperty("repository", repository)
-        repository = builder.repo
 
+        repository = builder.buildAll(sourcesDir)
         println("number of solutions: " + repository.modules.size)
     }
 

diff --git a/...ugin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ModelDependenciesBuilderTask.groovy b/...ugin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ModelDependenciesBuilderTask.groovy
@@ -28,7 +28,7 @@ class ModelDependenciesBuilderTask extends AbstractDependenciesBuilderTask {
 
     @Override
     List<Object> allEntities() {
-        builder.repo.allModels()
+        repository.allModels()
     }
 
     @Override

diff --git a/...gin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ModuleDependenciesBuilderTask.groovy b/...gin/plugin/src/main/groovy/org/mps_cli/gradle/plugin/ModuleDependenciesBuilderTask.groovy
@@ -29,7 +29,7 @@ class ModuleDependenciesBuilderTask extends AbstractDependenciesBuilderTask {
 
     @Override
     List<Object> allEntities() {
-        builder.repo.modules
+        repository.modules
     }
 
     @Override

diff --git a/...-plugin/plugin/src/main/groovy/org/mps_cli/model/builder/SModulesRepositoryBuilder.groovy b/...-plugin/plugin/src/main/groovy/org/mps_cli/model/builder/SModulesRepositoryBuilder.groovy
@@ -16,6 +16,16 @@ class SModulesRepositoryBuilder {
 
     def repo = new SRepository()
 
+    def buildAll(List<String> sourcesDir) {
+        SLanguageBuilder.clear()
+        sourcesDir.each {
+            def dir = Paths.get(it).toAbsolutePath().normalize().toString()
+            println("loading models from directory: " + dir)
+            build(dir)
+        }
+        repo
+    }
+
     def build(String pathString) {
         Date start = new Date()