Fix compile gradle task reports sucess although errors were reported …

…(Ma2JSim)
MontiCore · Nov 29, 2024 · ac8c2f1 · ac8c2f1
1 parent e2734c4
commit ac8c2f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tooling/gradle-plugins/ma2jsim/main/kotlin/CDOut2MAInPlugin.kt b/tooling/gradle-plugins/ma2jsim/main/kotlin/CDOut2MAInPlugin.kt
@@ -46,7 +46,6 @@ class CDOut2MAInPlugin : Plugin<Project> {
       it.symbolImportDir.from(
         provider { cdCompile.get().symbolOutputDir() }
       )
-      it.setIgnoreExitValue(true)
     }
   }
 

diff --git a/tooling/gradle-plugins/ma2jsim/main/kotlin/MA2JSimPlugin.kt b/tooling/gradle-plugins/ma2jsim/main/kotlin/MA2JSimPlugin.kt
@@ -215,7 +215,6 @@ class Ma2JavaPlugin : Plugin<Project> {
         sourceSet.allJava.sourceDirectories.files
         .filter { !it.startsWith(buildDir)}
       })
-      genTask.setIgnoreExitValue(true)
     }
 
     sourceSet.montiarc.get().compiledBy(generateTask, MontiArcCompile::outputDir)

diff --git a/tooling/gradle-plugins/ma2jsim/main/kotlin/MontiArcCompile.kt b/tooling/gradle-plugins/ma2jsim/main/kotlin/MontiArcCompile.kt
@@ -51,6 +51,8 @@ abstract class MontiArcCompile : JavaExec() {
     classpath(project.configurations.getByName(GENERATOR_DEPENDENCY_CONFIG_NAME))
     mainClass.convention(MA_TOOL_CLASS)
 
+    this.setIgnoreExitValue(true)
+
     useClass2Mc.convention(false)
     checkVariability.convention(false)
   }
@@ -98,7 +100,7 @@ abstract class MontiArcCompile : JavaExec() {
     } else {
       super.exec()
 
-      if (executionResult.get().exitValue == -1) {
+      if (executionResult.get().exitValue != 0) {
         throw GradleException("There are compile errors.")
       }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,6 @@ class CDOut2MAInPlugin : Plugin<Project> { @@
           it.symbolImportDir.from(
             provider { cdCompile.get().symbolOutputDir() }
           )
-          it.setIgnoreExitValue(true)
         }
       }
@@ Expand Down @@