X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=JsCompile.php;h=c53bf6c6f8cd9119aa2a3df72f7a0a67c04c1920;hp=c43144b879c1013461a5b336fd888b5278b73469;hb=HEAD;hpb=68129b15bf0d805b9649dc09c21a866624ba9afd diff --git a/JsCompile.php b/JsCompile.php index c43144b8..089db58d 100644 --- a/JsCompile.php +++ b/JsCompile.php @@ -199,50 +199,18 @@ class Pman_Core_JsCompile extends Pman function packCssCore($files, $output) { - - $o = HTML_FlexyFramework::get()->Pman_Core; - - if (empty($o['cssminify']) || !file_exists($o['cssminify'])) { - echo ''; - return false; - } - require_once 'System.php'; + - $seed= System::which('seed'); - $gjs = System::which('gjs'); + echo ''; + return false; + // if we did.. use this? - if (!$seed && !$gjs) { - echo ''; - 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); - $cmd = $seed ? - ("$seed {$o['cssminify']} $eoutput " . implode($ofiles, ' ')) : - ("$gjs {$o['cssminify']} -- -- $eoutput " . implode($ofiles, ' ')); - //echo "
$cmd\n"; echo `$cmd`; exit; - `$cmd`; + // file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.$asset)); - // we should do more checking.. return val etc.. - if (file_exists($output) && ($max < filemtime($output) ) ) { - return true; - } - return false; - } /** * wrapper arround packer... @@ -260,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'; @@ -287,6 +252,23 @@ class Pman_Core_JsCompile extends Pman return true; } + + + $pg = System::which('pgrep'); + if ($pg == '') { + echo ''; + return false; + } + + $cmd = "$pg roojspacker"; + $res = `$cmd`; + $out = empty($res) ? '' : trim($res); + if (strlen($out) > 0) { + echo ''; + return false; + } + + if (file_exists($output)) { unlink($output); } @@ -309,7 +291,7 @@ class Pman_Core_JsCompile extends Pman //} - $cmd = "$packer $eoutput -f " . implode($ofiles, ' -f ') . ' 2>&1'; + $cmd = "$packer $eoutput -f " . implode(' -f ', $ofiles) . ' 2>&1'; //echo "$cmd\n"; //echo `$cmd`; @@ -342,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) {