Changeset 57198

Timestamp:

01/07/08 21:52:53 (2 months ago)

Author:

sminnee

Message:

Improved task execution from CLI

Location:

modules/sapphire/branches/roa

Files:

• cli-script.php (modified) (2 diffs)
• core/Core.php (modified) (1 diff)
• core/ManifestBuilder.php (modified) (1 diff)
• dev/TaskRunner.php (modified) (2 diffs)

modules/sapphire/branches/roa/cli-script.php

@@ -106 +106 @@
 if(isset($_GET['debugmanifest'])) Debug::show(file_get_contents(MANIFEST_FILE));
 
-if(!isset(Director::$environment_type) && $envType) Director::set_environment_type($envType);
+//if(!isset(Director::$environment_type) && $envType) Director::set_environment_type($envType);
 
 // Load error handlers
@@ -124 +124 @@
         parse_str($_SERVER['argv'][2], $_GET);
         $_REQUEST = $_GET;
-        print_r($_GET);
-        
 }
 

modules/sapphire/branches/roa/core/Core.php

@@ -12 +12 @@
  */
 function getTempFolder() {
-        $cachefolder = "silverstripe-cache" . str_replace(array("/",":", "\\"),"-", substr($_SERVER['SCRIPT_FILENAME'], 0, strlen($_SERVER['SCRIPT_FILENAME']) - strlen('/sapphire/main.php')));
+        if(preg_match('/^(.*)\/sapphire\/[^\/]+$/', $_SERVER['SCRIPT_FILENAME'], $matches)) {
+                $cachefolder = "silverstripe-cache" . str_replace(array("/",":", "\\"),"-", $matches[1]);
+        } else {
+                $cachefolder = "silverstripe-cache";
+        }
+        
         $ssTmp = dirname(dirname($_SERVER['SCRIPT_FILENAME'])) . "/silverstripe-cache";
     if(@file_exists($ssTmp)) {

modules/sapphire/branches/roa/core/ManifestBuilder.php

@@ -9 +9 @@
  * Name of the manifest file
  */
-define("MANIFEST_FILE", TEMP_FOLDER . "/manifest" . str_replace(array("/",":", "\\"),"_", $_SERVER['SCRIPT_FILENAME']));
+define("MANIFEST_FILE", TEMP_FOLDER . "/manifest-" . str_replace('.php','',basename($_SERVER['SCRIPT_FILENAME'])));
 
 /**

modules/sapphire/branches/roa/dev/TaskRunner.php

@@ -10 +10 @@
         function index() {
                 $tasks = ClassInfo::subclassesFor('BuildTask');
-                echo "<ul>";
-                foreach($tasks as $task) {
-                        echo "<li><a href=\"$task\">$task</a></li>";
+                if(Director::is_cli()) {
+                        echo "Tasks available:\n\n";
+                        foreach($tasks as $task) echo " * $task: sake dev/tasks/$task\n";
+                } else {
+                        echo "<h1>Tasks available</h1>\n";
+                        echo "<ul>";
+                        foreach($tasks as $task) {
+                                echo "<li><a href=\"$task\">$task</a></li>\n";
+                        }
+                        echo "</ul>";
                 }
-                echo "</ul>";
         }
         
@@ -27 +33 @@
                 } else {
                         echo "Build task '$TaskName' not found.";
+                        if(class_exists($TaskName)) echo "  It isn't a subclass of BuildTask.";
+                        echo "\n";
                 }
         }