DataObjects/Core_watch.php

[Pman.Core] / JsCompile.php

diff --git a/JsCompile.php b/JsCompile.php
index d8b54b8..84a609e 100644 (file)
--- a/JsCompile.php
+++ b/JsCompile.php
@@ -17,7 +17,10 @@ require_once 'Pman.php';
 class Pman_Core_JsCompile  extends Pman
 {
     
-    static $cli_desc = "Wrapper around Javascript compression tools";
+    static $cli_desc = "Wrapper around Javascript compression tools
+                        Runs the javascript compiler - merging all the JS files so the load faster.
+                        Note: cfg option Pman_Builder['jspacker'] must be set to location of jstoolkit code 
+";
     
     var $cli = false;
     function getAuth()
@@ -78,6 +81,16 @@ class Pman_Core_JsCompile  extends Pman
      *
      */
     
+    static function jsSort($a,$b)
+    {
+        $a = substr($a, 0, -3);
+        $b=  substr($b, 0, -3);
+        if ($a == $b) {
+            return 0;
+        }
+        return ($a > $b) ? +1 : -1;
+    }
+    
     
     function packScript($basedir, $files,  $output_url, $compile=true)
     {
@@ -86,6 +99,8 @@ class Pman_Core_JsCompile  extends Pman
         // or the compressed version.
         // first expand files..
         
+        echo "<!-- compiling   $basedir  -->\n";
+        
         $arfiles = array();
         $ofiles = array();
         foreach($files as $f) {
@@ -95,14 +110,21 @@ class Pman_Core_JsCompile  extends Pman
             if (!is_dir($basedir .'/' .$f)) {
                 
                 $arfiles[$basedir .'/' .$f] = filemtime($basedir .'/' .$f);
-                 $ofiles[] = $f;
+                $ofiles[] = $f;
                 continue;
             }
+            
             foreach(glob($basedir .'/' .$f.'/*.js') as $fx) {
+                
                 $arfiles[$fx] = filemtime($fx);
                 $ofiles [] = $f . '/'. basename($fx);
             }
         }
+        $tf = 
+        // sort exc. the .js
+        usort($ofiles,create_function('$a,$b', 'return Pman_Core_JsCompile::jsSort($a,$b);'));
+        
+        //print_R($ofiles);
         
         $output = md5(serialize($arfiles)) .'.js';
         
@@ -119,9 +141,9 @@ class Pman_Core_JsCompile  extends Pman
             echo '<script type="text/javascript" src="'.$output_url.'/'.$f.'"></script>'."\n";
             
         }
-         
-        
+          
     }
+    
     function packCss($basedir, $files,   $output_url)
     {
         // this outputs <script tags..>
@@ -181,9 +203,12 @@ class Pman_Core_JsCompile  extends Pman
             return false;
         }
         require_once 'System.php';
+        
         $seed= System::which('seed');
-        if (!$seed) {
-            echo '<!-- seed not installed -->';
+        $gjs = System::which('gjs');
+        
+        if (!$seed && !$gjs) {
+            echo '<!-- seed or gjs are  not installed -->';
             return false;
             
         }
@@ -201,7 +226,9 @@ class Pman_Core_JsCompile  extends Pman
             mkdir(dirname($output), 0755, true);
         }
         $eoutput = escapeshellarg($output);
-        $cmd = "$seed {$o['cssminify']}  $eoutput " . implode($ofiles, ' ');
+        $cmd = $seed ?
+            ("$seed {$o['cssminify']}  $eoutput " . implode($ofiles, ' ')) :
+            ("$gjs {$o['cssminify']} -- -- $eoutput " . implode($ofiles, ' ')); 
         //echo "<PRE>$cmd\n"; echo `$cmd`; exit;
         `$cmd`;
         
@@ -221,7 +248,7 @@ class Pman_Core_JsCompile  extends Pman
      * @param {String} $output name fo file to output
      *
      */
-    function pack($files, $output)
+    function pack($files, $output, $translation_base=false)
     {
         
          
@@ -234,19 +261,22 @@ class Pman_Core_JsCompile  extends Pman
         }
         require_once 'System.php';
         $seed= System::which('seed');
-        if (!$seed) {
-            echo '<!-- JS COMPILE ERROR: seed not installed -->';
+        $gjs = System::which('gjs');
+        
+        if (!$seed && !$gjs) {
+            echo '<!-- seed or gjs are  not installed -->';
             return false;
             
         }
-        $targetm = file_exists($output) ? filemtime($output) : 0;
+        $targetm = file_exists($output) && filesize($output) ? filemtime($output) : 0;
         $max = 0;
         $ofiles = array();
         foreach($files as $f => $mt) {
             $max = max($max,$mt);
             $ofiles[] = escapeshellarg($f);
         }
-        if ($max < $targetm)  {
+        if ($max < $targetm) {
+            echo '<!--  use cached compile. -->';
             return true;
         }
         //var_dump($output);
@@ -256,10 +286,21 @@ class Pman_Core_JsCompile  extends Pman
         $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
         usort($ofiles, $lsort);
         
-        $eoutput = escapeshellarg($output);
-        $toutput = "-t escapeshellarg(preg_replace('/\.js$/', '.__translation__.js', $output));
+        //$eoutput = " -k  -o " . escapeshellarg($output) ; // with whitespace..
+        $eoutput = "  -o " . escapeshellarg($output) ;
+                   
+        if (  $translation_base) {
+            $toutput = " -t ". escapeshellarg(preg_replace('/\.js$/', '.__translation__.js', $output)) .
+                    " -p " . escapeshellarg($translation_base) ;//." -k "; // this kills the compression.
+                    
+        }
+        
         
-        $cmd = "$seed {$o['jspacker']}/pack.js  -o $eoutput -t $toutput " . implode($ofiles, ' ') . ' 2>&1';
+        $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';
         //echo "<PRE>$cmd\n";
         //echo `$cmd`;
         
@@ -275,7 +316,7 @@ class Pman_Core_JsCompile  extends Pman
         //exit;
         file_put_contents($output.'.log', $cmd."\n\n". $res);
         // since this only appears when we change.. it's ok to dump it out..
-          echo "<!-- Compiled javascript
+        echo "<!-- Compiled javascript
             " . htmlspecialchars($res) . "
             -->";