projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4127efe
)
JsCompile.php
author
Alan Knowles
<alan@akbkhome.com>
Thu, 18 Aug 2011 04:11:28 +0000
(12:11 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Thu, 18 Aug 2011 04:11:28 +0000
(12:11 +0800)
JsCompile.php
patch
|
blob
|
history
diff --git
a/JsCompile.php
b/JsCompile.php
index
c60974c
..
a81c425
100644
(file)
--- a/
JsCompile.php
+++ b/
JsCompile.php
@@
-221,7
+221,7
@@
class Pman_Core_JsCompile extends Pman
* @param {String} $output name fo file to output
*
*/
* @param {String} $output name fo file to output
*
*/
- function pack($files, $output)
+ function pack($files, $output
, $translation_base=false
)
{
{
@@
-258,7
+258,12
@@
class Pman_Core_JsCompile extends Pman
$eoutput = escapeshellarg($output);
$eoutput = escapeshellarg($output);
- $toutput = "-t ". escapeshellarg(preg_replace('/\.js$/', '.__translation__.js', $output));
+ if ($translation_base) {
+ $toutput = "-t ". escapeshellarg(preg_replace('/\.js$/', '.__translation__.js', $output)) .
+ " -p " . escapeshellarg($translation_base);
+ }
+
+
$cmd = "$seed {$o['jspacker']}/pack.js -o $eoutput $toutput " . implode($ofiles, ' ') . ' 2>&1';
//echo "<PRE>$cmd\n";
$cmd = "$seed {$o['jspacker']}/pack.js -o $eoutput $toutput " . implode($ofiles, ' ') . ' 2>&1';
//echo "<PRE>$cmd\n";