X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=JsCompile.php;h=c53bf6c6f8cd9119aa2a3df72f7a0a67c04c1920;hp=6fcd1ee61256fe74ed15826dc41725138a4e6fcf;hb=HEAD;hpb=1feb190f013536de9fcd9f13fafe4f409bef63c9

diff --git a/JsCompile.php b/JsCompile.php
index 6fcd1ee6..089db58d 100644
--- a/JsCompile.php
+++ b/JsCompile.php
@@ -200,47 +200,16 @@ class Pman_Core_JsCompile  extends Pman
     {
         
 
-        // csstidy 
-        // cat  x a b c | csstidy - --preserve_css=true --remove_bslash=false --silent=true --template=highest {out}
-        
-        
-        require_once 'System.php';
-        
-        $csstidy= System::which('csstidy');
-        $cat = System::which('cat');
         
+        echo '<!-- JSCOMPILE - should not be used for CSS packing ?? -->';
+        return false;
+        // if we did.. use this?
         
-        if (!$csstidy) {
-            echo '<!-- csstidy not installed -->';
-            return false;
+        //require_once 'HTML/CSS/Minify.php';
+        //$x = new HTML_CSS_Minify(substr($relpath,0,-1), $dir, $relfiles);
             
-        }
-        $targetm = file_exists($output) ? filemtime($output) : 0;
-        $max = 0;
-        $ofiles = array();
-        foreach($files as $f => $mt) {
-            $max = max($max,$mt);
-            $ofiles[] = escapeshellarg($f);
-        }
-        if ($max < $targetm)  {
-            return true;
-        }
-        if (!file_exists(dirname($output))) {
-            mkdir(dirname($output), 0755, true);
-        }
-        $eoutput = escapeshellarg($output);
+          //  file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.$asset));
         
-        $cmd = "$cat " . implode($ofiles, " ") . " | $csstidy   - --preserve_css=true --remove_bslash=false --silent=true --template=highest $eoutput";
-        
-        //echo "<PRE>$cmd\n"; echo `$cmd`; exit;
-        `$cmd`;
-        
-        
-        // we should do more checking.. return val etc..
-        if (file_exists($output) && ($max < filemtime($output) ) ) {
-            return true;
-        }
-        return false;
         
     }
     /**
@@ -259,10 +228,7 @@ class Pman_Core_JsCompile  extends Pman
             return false;
         }
         
-        $o = HTML_FlexyFramework::get()->Pman_Core;
-        if (isset($o['packseed'])) {
-            return $this->packSeed($files,$output,$translation_base);
-        }
+        // if packer is running, then dont compile - just output onebyone...
         
         
         require_once 'System.php';
@@ -286,6 +252,23 @@ class Pman_Core_JsCompile  extends Pman
             return true;
         }
         
+        
+        
+        $pg = System::which('pgrep');
+        if ($pg == '') {
+            echo '<!--  install pgrep -->';
+            return false;
+        }
+        
+        $cmd = "$pg roojspacker";
+        $res = `$cmd`;
+        $out = empty($res) ? '' : trim($res);
+        if (strlen($out) > 0) {
+            echo '<!--  onther process is compiling compile. -->';
+            return false;
+        }
+         
+        
         if (file_exists($output)) {
             unlink($output);
         }
@@ -341,6 +324,15 @@ class Pman_Core_JsCompile  extends Pman
         
     }
     
+    
+    function packIsRunning()
+    {
+        require_once 'System.php';
+      
+        
+    }
+    
+    
     // depricated verison using seed.
     function packSeed($files, $output, $translation_base=false)
     {