JsCompile.php

[Pman.Core] / JsCompile.php

diff --git a/JsCompile.php b/JsCompile.php
index 7e9f8e3..c460373 100644 (file)
--- a/JsCompile.php
+++ b/JsCompile.php
@@ -258,7 +258,10 @@ class Pman_Core_JsCompile  extends Pman
         
          
         $o = HTML_FlexyFramework::get()->Pman_Core;
-        
+        if (isset($o['jspacker'])) {
+            return $this->packSeed($files,$output,$translation_base);
+        }
+    
         
         require_once 'System.php';
         $packer = System::which('roojspacker');
@@ -288,20 +291,17 @@ class Pman_Core_JsCompile  extends Pman
         usort($ofiles, $lsort);
         
         //$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.
-                    
-        }
+        $eoutput = "  -t " . escapeshellarg($output) ;
+          
+        // no support for translation any more?         
+        //if (  $translation_base) {
+        //    $toutput = " -t ". escapeshellarg(preg_replace('/\.js$/', '.__translation__.js', $output)) .
+        //            " -p " . escapeshellarg($translation_base) ;//." -k "; // this kills the compression.
+        //            
+        //}
         
         
-        $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($ofiles, ' -f ') . ' 2>&1';
         //echo "<PRE>$cmd\n";
         //echo `$cmd`;