JsCompile.php

[Pman.Core] / JsCompile.php

diff --git a/JsCompile.php b/JsCompile.php
index 6a58b86..6ef48b3 100644 (file)
--- a/JsCompile.php
+++ b/JsCompile.php
@@ -74,7 +74,7 @@ class Pman_Core_JsCompile  extends Pman
      * @param {Array}  list of files (ontop of basedir) 
      * @param {String} output url (path to basedir basically), or false
      *                  to not compile
-     *
+     * 
      *
      */
     
@@ -177,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';
@@ -226,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;
             
         }
@@ -251,21 +251,29 @@ 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';
+        $toutput = escapeshellarg(preg_replace('/\.js$/', '.__translation__.js', $output));
+        $cmd = "$seed {$o['jspacker']}/pack.js  -o $eoutput -t $output" . implode($ofiles, ' ') . ' 2>&1';
         //echo "<PRE>$cmd\n";
         //echo `$cmd`;
-        $res = `$cmd`;
-        //exit;
         
-        // since this only appears when we change.. it's ok to dump it out..
-          echo "<!-- Compiled javascript
+         echo "<!-- Compile javascript
           
             " . htmlspecialchars($cmd) . "
             
-            " . htmlspecialchars($res) . "
+            -->";
             
+       // return false;
+        
+        $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($res) . "
             -->";
             
         // we should do more checking.. return val etc..