DataObjects/Core_notify.php

[Pman.Core] / JsCompile.php

diff --git a/JsCompile.php b/JsCompile.php
index 2ebc966..be9b38f 100644 (file)
--- a/JsCompile.php
+++ b/JsCompile.php
@@ -211,7 +211,7 @@ class Pman_Core_JsCompile  extends Pman
         $eoutput = escapeshellarg($output);
         $cmd = $seed ?
             ("$seed {$o['cssminify']}  $eoutput " . implode($ofiles, ' ')) :
-            ("$gjs {$o['cssminify']}  $eoutput " . implode($ofiles, ' ')); 
+            ("$gjs {$o['cssminify']} -- -- $eoutput " . implode($ofiles, ' ')); 
         //echo "<PRE>$cmd\n"; echo `$cmd`; exit;
         `$cmd`;
         
@@ -279,7 +279,11 @@ class Pman_Core_JsCompile  extends Pman
         }
         
         
-        $cmd = "$seed {$o['jspacker']}/pack.js   $eoutput  $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`;