}
exit;
}
+ /**
+ * packScript:
+ *
+ * @param {String} basedir absolute path to files
+ * @param {Array} list of files (ontop of basedir)
+ *
+ *
+ *
+ */
-
- function packScript($basedir, $files, $output_path, $output_url)
+ function packScript($basedir, $files, $output_url)
{
// this outputs <script tags..>
// either for just the original files,
$output = md5(serialize($arfiles)) .'.js';
- if (!file_exists($output_path.'/_cache_/'.$output)) {
- $this->pack($arfiles,$output_path.'/_cache_/'.$output);
+ if (!file_exists($basedir.'/_cache_/'.$output)) {
+ $this->pack($arfiles,$basedir.'/_cache_/'.$output);
}
- if (file_exists($output_path.'/_cache_/'.$output)) {
+ if (file_exists($basedir.'/_cache_/'.$output)) {
echo '<script type="text/javascript" src="'.$output_url.'/_cache_/'. $output.'"></script>';
return;
}
- function packCss($basedir, $files, $output_path, $output_url)
+ function packCss($basedir, $files, $output_url)
{
// this outputs <script tags..>
// either for just the original files,
$output = md5(serialize($arfiles)) .'.css';
- if (!file_exists($output_path.'/_cache_/'.$output)) {
- $this->packCssCore($arfiles,$output_path.'/_cache_/'.$output);
+ if (!file_exists($basedir.'/_cache_/'.$output)) {
+ $this->packCssCore($arfiles,$basedir.'/_cache_/'.$output);
}
- //var_dump()$output_path. '/_cache_/'.$output);
- if (file_exists($output_path. '/_cache_/'.$output)) {
+ //var_dump()$basedir. '/_cache_/'.$output);
+ if (file_exists($basedir. '/_cache_/'.$output)) {
echo '<link type="text/css" rel="stylesheet" media="screen" href="'.$output_url. '/_cache_/'. $output.'" />';
return;
}
if (!file_exists(dirname($output))) {
mkdir(dirname($output), 0755, true);
}
+ sort($ofiles);
$eoutput = escapeshellarg($output);
- $cmd = "$seed {$o['jspacker']}/pack.js -o $eoutput " . implode($ofiles, ' ');
+ $cmd = "$seed {$o['jspacker']}/pack.js -o $eoutput " . implode($ofiles, ' ') . ' >2&1';
//echo "<PRE>$cmd\n";
//echo `$cmd`;
- `$cmd`;
+ $res = `$cmd`;
//exit;
// we should do more checking.. return val etc..
if (file_exists($output) && ($max < filemtime($output) ) ) {
+
return true;
}
+ echo "<!-- packed file did not exist
+
+ " . htmlspecialchars($cmd) . "
+
+ " . htmlspecialchars($res) . "
+
+ -->";
return false;
}