JsCompile.php

[Pman.Core] / JsCompile.php

diff --git a/JsCompile.php b/JsCompile.php
index ad26719..a6d1bff 100644 (file)
--- a/JsCompile.php
+++ b/JsCompile.php
@@ -16,6 +16,9 @@ require_once 'Pman.php';
 
 class Pman_Core_JsCompile  extends Pman
 {
+    
+    static $cli_desc = "Wrapper around Javascript compression tools";
+    
     var $cli = false;
     function getAuth()
     {
@@ -69,14 +72,14 @@ class Pman_Core_JsCompile  extends Pman
      *
      * @param {String} basedir absolute path to files
      * @param {Array}  list of files (ontop of basedir) 
-     * @param {String|false} output url (path to basedir basically), or false
+     * @param {String} output url (path to basedir basically), or false
      *                  to not compile
-     *
+     * 
      *
      */
     
     
-    function packScript($basedir, $files,  $output_url)
+    function packScript($basedir, $files,  $output_url, $compile=true)
     {
         // this outputs <script tags..>
         // either for just the original files,
@@ -103,11 +106,11 @@ class Pman_Core_JsCompile  extends Pman
         
         $output = md5(serialize($arfiles)) .'.js';
         
-        if ( $output_url && !file_exists($basedir.'/_cache_/'.$output)) {
+        if ( $compile && !file_exists($basedir.'/_cache_/'.$output)) {
             $this->pack($arfiles,$basedir.'/_cache_/'.$output);
         }
         
-        if ($output_url && file_exists($basedir.'/_cache_/'.$output)) {
+        if ($compile && file_exists($basedir.'/_cache_/'.$output)) {
             
             echo '<script type="text/javascript" src="'.$output_url.'/_cache_/'. $output.'"></script>';
             return;
@@ -174,7 +177,7 @@ class Pman_Core_JsCompile  extends Pman
         $o = HTML_FlexyFramework::get()->Pman_Core;
         
         if (empty($o['cssminify']) || !file_exists($o['cssminify'])) {
-            echo '<!-- jspacker not set -->';
+            echo '<!-- cssminify not set -->';
             return false;
         }
         require_once 'System.php';
@@ -223,7 +226,7 @@ class Pman_Core_JsCompile  extends Pman
         $o = HTML_FlexyFramework::get()->Pman_Core;
         
         if (empty($o['jspacker']) || !file_exists($o['jspacker'].'/pack.js')) {
-            echo '<!-- JS COMPILE ERROR: option: Pman_Core[jspacker] not set -->';
+            echo '<!-- JS COMPILE ERROR: option: Pman_Core[jspacker] not set to directory -->';
             return false;
             
         }
@@ -248,18 +251,28 @@ class Pman_Core_JsCompile  extends Pman
         if (!file_exists(dirname($output))) {
             mkdir(dirname($output), 0755, true);
         }
-        sort($ofiles);
+        $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
+        usort($ofiles, $lsort);
+        
         $eoutput = escapeshellarg($output);
         $cmd = "$seed {$o['jspacker']}/pack.js  -o $eoutput " . implode($ofiles, ' ') . ' 2>&1';
         //echo "<PRE>$cmd\n";
         //echo `$cmd`;
+        
+         echo "<!-- Compile javascript
+          
+            " . htmlspecialchars($cmd) . "
+            
+            -->";
+            
+        
+        
         $res = `$cmd`;
         //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
           
-            " . htmlspecialchars($cmd) . "
             
             " . htmlspecialchars($res) . "