function pack($files, $output, $translation_base=false)
{
-
- $o = HTML_FlexyFramework::get()->Pman_Core;
+ if (empty($files)) {
+ return false;
+ }
+ $o = HTML_FlexyFramework::get()->Pman_Core;
+ if (isset($o['packseed'])) {
+ return $this->packSeed($files,$output,$translation_base);
+ }
+
require_once 'System.php';
$packer = System::which('roojspacker');
echo '<!-- use cached compile. -->';
return true;
}
- //var_dump($output);
+
+ if (file_exists($output)) {
+ unlink($output);
+ }
+
+
if (!file_exists(dirname($output))) {
mkdir(dirname($output), 0755, true);
}
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`;
echo "<!-- Compiled javascript
" . htmlspecialchars($res) . "
-->";
-
+ clearstatcache();
// we should do more checking.. return val etc..
- if (file_exists($output) && ($max < filemtime($output) ) ) {
-
+ if (file_exists($output) && filesize($output) && ($max < filemtime($output) ) ) {
+ echo "<!-- file looks like its been generated -->\n";
return true;
}
+ echo '<script type="text/javascript"> alert('. json_encode("Error: Javascript Compile failed\n" . $res) .');</script>';
+
+
echo "<!-- JS COMPILE ERROR: packed file did not exist -->";
return false;
$o = HTML_FlexyFramework::get()->Pman_Core;
- if (empty($o['jspacker']) || !file_exists($o['jspacker'].'/pack.js')) {
+ if (empty($o['packseed']) || !file_exists($o['jspacker'].'/pack.js')) {
echo '<!-- JS COMPILE ERROR: option: Pman_Core[jspacker] not set to directory -->';
return false;
$cmd = ($seed ?
- "$seed {$o['jspacker']}/pack.js " :
- "$gjs -I {$o['jspacker']} -I {$o['jspacker']}/JSDOC {$o['jspacker']}/pack.js -- -- "
+ "$seed {$o['packseed']}/pack.js " :
+ "$gjs -I {$o['packseed']} -I {$o['packseed']}/JSDOC {$o['packseed']}/pack.js -- -- "
) . " $eoutput $toutput " . implode($ofiles, ' ') . ' 2>&1';
//echo "<PRE>$cmd\n";
return true;
}
- echo "<!-- JS COMPILE ERROR: packed file did not exist -->";
+
+
+ echo "\n<!-- JS COMPILE ERROR: packed file did not exist -->\n";
return false;
}
$o = HTML_FlexyFramework::get()->Pman_Core;
- if (empty($o['jspacker']) || !file_exists($o['jspacker'].'/pack.js')) {
- $this->err ="no jstoolkit path set [Pman_Core][jspacker] to the
+ if (empty($o['packseed']) || !file_exists($o['packseed'].'/pack.js')) {
+ $this->err ="no jstoolkit path set [Pman_Core][packseed] to the
introspection documentation directory where pack.js is located.";
if ($this->cli) echo $this->err;
return false;
// should we be more specirfic!??!?!?
- $cmd = "$seed {$o['jspacker']}/pack.js -m $proj -a $src/*.js";
+ $cmd = "$seed {$o['packseed']}/pack.js -m $proj -a $src/*.js";
echo "$cmd\n";
passthru($cmd);
// technically we should trash old compiled files..