Changeset 55

Timestamp:

04/20/06 15:16:59 (3 years ago)

Author:

mrook

Message:

Apply patch to detect and act on failing builds (Matthias Pigulla)

Files:

• trunk/classes/phing/tasks/system/PhingTask.php (modified) (4 diffs)

trunk/classes/phing/tasks/system/PhingTask.php

@@ -74 +74 @@
-    private $newProject;
-
+    /** Fail the build process when the called build fails? */
+    private $haltOnFailure = false;
+
+    /**
+     *  If true, abort the build process if there is a problem with or in the target build file.
+     *  Defaults to false.
+     *
+     *  @param boolean new value
+     */
+    public function setHaltOnFailure($hof) {
+        $this->haltOnFailure = (boolean) $hof;
+    }
+
-    /**
-     * Creates a Project instance for the project to call.
@@ -147 +160 @@
-        $savedPhingFile = $this->phingFile;
-        $savedTarget = $this->newTarget;
+        $buildFailed = false;
-
-        // set no specific target for files in filesets
@@ -241 +255 @@
-            
-        } catch (Exception $e) {
+            $buildFailed = true;
-            $this->log($e->getMessage(), PROJECT_MSG_ERR);
-            
@@ -263 +278 @@
-            chdir($this->dir->getAbsolutePath());
-        }
+
+        if ($this->haltOnFailure == true && $buildFailed == true)
+            throw new BuildException("Execution of the target buildfile failed. Aborting.");
-    }
-