DataObjects/Core_domain.php

[Pman.Core] / JsCompile.php

diff --git a/JsCompile.php b/JsCompile.php
index f81bd67..e7f8587 100644 (file)
--- a/JsCompile.php
+++ b/JsCompile.php
@@ -256,9 +256,15 @@ class Pman_Core_JsCompile  extends Pman
     function pack($files, $output, $translation_base=false)
     {
         
-         
-        $o = HTML_FlexyFramework::get()->Pman_Core;
+        if (empty($files)) {
+            return false;
+        }
         
+        $o = HTML_FlexyFramework::get()->Pman_Core;
+        if (isset($o['packseed'])) {
+            return $this->packSeed($files,$output,$translation_base);
+        }
+    
         
         require_once 'System.php';
         $packer = System::which('roojspacker');
@@ -280,7 +286,12 @@ class Pman_Core_JsCompile  extends Pman
             echo '<!--  use cached compile. -->';
             return true;
         }
-        //var_dump($output);
+        
+        if (file_exists($output)) {
+            unlink($output);
+        }
+        
+         
         if (!file_exists(dirname($output))) {
             mkdir(dirname($output), 0755, true);
         }
@@ -317,12 +328,15 @@ class Pman_Core_JsCompile  extends Pman
         echo "<!-- Compiled javascript
             " . htmlspecialchars($res) . "
             -->";
-            
+        clearstatcache();
         // we should do more checking.. return val etc..
-        if (file_exists($output) && ($max < filemtime($output) ) ) {
-            
+        if (file_exists($output) && filesize($output) && ($max < filemtime($output) ) ) {
+            echo "<!-- file looks like its been generated -->\n";
             return true;
         }
+        echo '<script type="text/javascript"> alert('. json_encode("Error: Javascript Compile failed\n" . $res) .');</script>';
+     
+        
         echo "<!-- JS COMPILE ERROR: packed file did not exist  -->";
         return false;
         
@@ -335,7 +349,7 @@ class Pman_Core_JsCompile  extends Pman
          
         $o = HTML_FlexyFramework::get()->Pman_Core;
         
-        if (empty($o['jspacker']) || !file_exists($o['jspacker'].'/pack.js')) {
+        if (empty($o['packseed']) || !file_exists($o['jspacker'].'/pack.js')) {
             echo '<!-- JS COMPILE ERROR: option: Pman_Core[jspacker] not set to directory -->';
             return false;
             
@@ -378,8 +392,8 @@ class Pman_Core_JsCompile  extends Pman
         
         
         $cmd = ($seed ?
-             "$seed {$o['jspacker']}/pack.js " :
-             "$gjs -I {$o['jspacker']} -I {$o['jspacker']}/JSDOC  {$o['jspacker']}/pack.js -- -- " 
+             "$seed {$o['packseed']}/pack.js " :
+             "$gjs -I {$o['packseed']} -I {$o['packseed']}/JSDOC  {$o['packseed']}/pack.js -- -- " 
               
              ) . " $eoutput  $toutput " . implode($ofiles, ' ') . ' 2>&1';
         //echo "<PRE>$cmd\n";
@@ -406,7 +420,9 @@ class Pman_Core_JsCompile  extends Pman
             
             return true;
         }
-        echo "<!-- JS COMPILE ERROR: packed file did not exist  -->";
+        
+         
+        echo "\n<!-- JS COMPILE ERROR: packed file did not exist  -->\n";
         return false;
         
     }
@@ -448,8 +464,8 @@ class Pman_Core_JsCompile  extends Pman
         
         $o = HTML_FlexyFramework::get()->Pman_Core;
         
-        if (empty($o['jspacker']) || !file_exists($o['jspacker'].'/pack.js')) {
-            $this->err ="no jstoolkit path set [Pman_Core][jspacker] to the
+        if (empty($o['packseed']) || !file_exists($o['packseed'].'/pack.js')) {
+            $this->err ="no jstoolkit path set [Pman_Core][packseed] to the
                     introspection documentation directory where pack.js is located.";
             if ($this->cli) echo $this->err;
             return false;
@@ -457,7 +473,7 @@ class Pman_Core_JsCompile  extends Pman
         
         // should we be more specirfic!??!?!?
          
-        $cmd = "$seed {$o['jspacker']}/pack.js -m $proj  -a  $src/*.js";
+        $cmd = "$seed {$o['packseed']}/pack.js -m $proj  -a  $src/*.js";
         echo "$cmd\n";
         passthru($cmd);
         // technically we should trash old compiled files..