projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #5884 - add photo to report
[Pman.Core]
/
JsCompile.php
diff --git
a/JsCompile.php
b/JsCompile.php
index
abab4e6
..
c43144b
100644
(file)
--- a/
JsCompile.php
+++ b/
JsCompile.php
@@
-37,7
+37,7
@@
class Pman_Core_JsCompile extends Pman
}
}
- function get($proj, $args)
+ function get($proj, $args
=array()
)
{
if (empty($args)) {
die("missing action : eg. build or install");
{
if (empty($args)) {
die("missing action : eg. build or install");
@@
-124,7
+124,7
@@
class Pman_Core_JsCompile extends Pman
}
$tf =
// sort exc. the .js
}
$tf =
// sort exc. the .js
- usort($ofiles,
create_function('$a,$b', 'return Pman_Core_JsCompile::jsSort($a,$b);')
);
+ usort($ofiles,
function($a,$b) { return Pman_Core_JsCompile::jsSort($a,$b); }
);
//print_R($ofiles);
//print_R($ofiles);
@@
-264,7
+264,7
@@
class Pman_Core_JsCompile extends Pman
if (isset($o['packseed'])) {
return $this->packSeed($files,$output,$translation_base);
}
if (isset($o['packseed'])) {
return $this->packSeed($files,$output,$translation_base);
}
-
+
require_once 'System.php';
$packer = System::which('roojspacker');
require_once 'System.php';
$packer = System::which('roojspacker');
@@
-286,12
+286,17
@@
class Pman_Core_JsCompile extends Pman
echo '<!-- use cached compile. -->';
return true;
}
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);
}
if (!file_exists(dirname($output))) {
mkdir(dirname($output), 0755, true);
}
- $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
- usort($ofiles,
$lsort
);
+
+ usort($ofiles,
function($a,$b) { return strlen($a) > strlen($b) ? 1 : -1; }
);
//$eoutput = " -k -o " . escapeshellarg($output) ; // with whitespace..
$eoutput = " -t " . escapeshellarg($output) ;
//$eoutput = " -k -o " . escapeshellarg($output) ; // with whitespace..
$eoutput = " -t " . escapeshellarg($output) ;
@@
-303,7
+308,7
@@
class Pman_Core_JsCompile extends Pman
//
//}
//
//}
-
+
$cmd = "$packer $eoutput -f " . implode($ofiles, ' -f ') . ' 2>&1';
//echo "<PRE>$cmd\n";
//echo `$cmd`;
$cmd = "$packer $eoutput -f " . implode($ofiles, ' -f ') . ' 2>&1';
//echo "<PRE>$cmd\n";
//echo `$cmd`;
@@
-323,12
+328,15
@@
class Pman_Core_JsCompile extends Pman
echo "<!-- Compiled javascript
" . htmlspecialchars($res) . "
-->";
echo "<!-- Compiled javascript
" . htmlspecialchars($res) . "
-->";
-
+ clearstatcache();
// we should do more checking.. return val etc..
// 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;
}
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;
echo "<!-- JS COMPILE ERROR: packed file did not exist -->";
return false;
@@
-412,7
+420,9
@@
class Pman_Core_JsCompile extends Pman
return true;
}
return true;
}
- echo "<!-- JS COMPILE ERROR: packed file did not exist -->";
+
+
+ echo "\n<!-- JS COMPILE ERROR: packed file did not exist -->\n";
return false;
}
return false;
}