*
*/
+ static function jsSort($a,$b)
+ {
+ $a = substr($a, 0, -3);
+ $b= substr($b, 0, -3);
+ if ($a == $b) {
+ return 0;
+ }
+ return ($a > $b) ? +1 : -1;
+ }
+
function packScript($basedir, $files, $output_url, $compile=true)
{
if (!is_dir($basedir .'/' .$f)) {
$arfiles[$basedir .'/' .$f] = filemtime($basedir .'/' .$f);
- $ofiles[] = $f;
+ $ofiles[] = $f;
continue;
}
+
foreach(glob($basedir .'/' .$f.'/*.js') as $fx) {
+
$arfiles[$fx] = filemtime($fx);
$ofiles [] = $f . '/'. basename($fx);
}
}
+ $tf =
+ // sort exc. the .js
+ usort($ofiles,create_function('$a,$b', 'return Pman_Core_JsCompile::jsSort($a,$b);'));
+
+ //print_R($ofiles);
$output = md5(serialize($arfiles)) .'.js';
$lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
usort($ofiles, $lsort);
- $eoutput = " -k -o " . escapeshellarg($output) ;
-
+ //$eoutput = " -k -o " . escapeshellarg($output) ; // with whitespace..
+ $eoutput = " -o " . escapeshellarg($output) ;
if ( $translation_base) {
$toutput = " -t ". escapeshellarg(preg_replace('/\.js$/', '.__translation__.js', $output)) .