I18n.php

[Pman.Core] / JsCompile.php

diff --git a/JsCompile.php b/JsCompile.php
index 17de726..c53bf6c 100644 (file)
--- a/JsCompile.php
+++ b/JsCompile.php
@@ -37,7 +37,7 @@ class Pman_Core_JsCompile  extends Pman
     }
     
     
-    function get($proj, $args)
+    function get($proj, $args=array())
     {
         if (empty($args)) {
             die("missing action : eg. build or install");
@@ -124,7 +124,7 @@ class Pman_Core_JsCompile  extends Pman
         }
         $tf = 
         // sort exc. the .js
-        usort($ofiles,create_function('$a,$b', 'return Pman_Core_JsCompile::jsSort($a,$b);'));
+        usort($ofiles,function($a,$b) { return Pman_Core_JsCompile::jsSort($a,$b); });
         
         //print_R($ofiles);
         
@@ -199,50 +199,18 @@ class Pman_Core_JsCompile  extends Pman
     function packCssCore($files, $output)
     {
         
-         
-        $o = HTML_FlexyFramework::get()->Pman_Core;
-        
-        if (empty($o['cssminify']) || !file_exists($o['cssminify'])) {
-            echo '<!-- cssminify not set -->';
-            return false;
-        }
-        require_once 'System.php';
+
         
-        $seed= System::which('seed');
-        $gjs = System::which('gjs');
+        echo '<!-- JSCOMPILE - should not be used for CSS packing ?? -->';
+        return false;
+        // if we did.. use this?
         
-        if (!$seed && !$gjs) {
-            echo '<!-- seed or gjs are  not installed -->';
-            return false;
+        //require_once 'HTML/CSS/Minify.php';
+        //$x = new HTML_CSS_Minify(substr($relpath,0,-1), $dir, $relfiles);
             
-        }
-        $targetm = file_exists($output) ? filemtime($output) : 0;
-        $max = 0;
-        $ofiles = array();
-        foreach($files as $f => $mt) {
-            $max = max($max,$mt);
-            $ofiles[] = escapeshellarg($f);
-        }
-        if ($max < $targetm)  {
-            return true;
-        }
-        if (!file_exists(dirname($output))) {
-            mkdir(dirname($output), 0755, true);
-        }
-        $eoutput = escapeshellarg($output);
-        $cmd = $seed ?
-            ("$seed {$o['cssminify']}  $eoutput " . implode($ofiles, ' ')) :
-            ("$gjs {$o['cssminify']} -- -- $eoutput " . implode($ofiles, ' ')); 
-        //echo "<PRE>$cmd\n"; echo `$cmd`; exit;
-        `$cmd`;
+          //  file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.$asset));
         
         
-        // we should do more checking.. return val etc..
-        if (file_exists($output) && ($max < filemtime($output) ) ) {
-            return true;
-        }
-        return false;
-        
     }
     /**
      * wrapper arround packer...
@@ -256,8 +224,10 @@ class Pman_Core_JsCompile  extends Pman
     function pack($files, $output, $translation_base=false)
     {
         
-         
-        $o = HTML_FlexyFramework::get()->Pman_Core;
+        if (empty($files)) {
+            return false;
+        }
+        
         
         
         require_once 'System.php';
@@ -280,12 +250,17 @@ 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);
         }
-        $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
-        usort($ofiles, $lsort);
+        
+        usort($ofiles, function($a,$b)  { return strlen($a) > strlen($b) ? 1 : -1; });
         
         //$eoutput = " -k  -o " . escapeshellarg($output) ; // with whitespace..
         $eoutput = "  -t " . escapeshellarg($output) ;
@@ -297,12 +272,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 -- -- " 
-              
-             ) . " $eoutput  $toutput " . implode($ofiles, ' ') . ' 2>&1';
+    
+        $cmd = "$packer  $eoutput  -f " . implode(' -f ', $ofiles) . ' 2>&1';
         //echo "<PRE>$cmd\n";
         //echo `$cmd`;
         
@@ -321,12 +292,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;
         
@@ -339,7 +313,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;
             
@@ -382,8 +356,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";
@@ -410,7 +384,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;
         
     }
@@ -452,8 +428,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;
@@ -461,7 +437,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..