projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
26e81ed
)
handle sassc version
author
Alan Knowles
<alan@roojs.com>
Wed, 30 Dec 2020 09:53:01 +0000
(17:53 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 30 Dec 2020 09:53:01 +0000
(17:53 +0800)
AssetTrait.php
patch
|
blob
|
history
diff --git
a/AssetTrait.php
b/AssetTrait.php
index
11770ee
..
6e8627e
100644
(file)
--- a/
AssetTrait.php
+++ b/
AssetTrait.php
@@
-335,9
+335,16
@@
trait Pman_Core_AssetTrait {
}
$fd = dirname($fp);
}
$fd = dirname($fp);
-
-
- $cmd = "{$sassc} --style=compressed --sourcemap=auto -I {$fd} -I {$this->rootDir}/roojs1/scss/bootstrap $smod.scss {$compiledir}/{$output}";
+
+ $ver = `$sassc --version`;
+ $bits = explode("\n", $ver);
+ foreach($bits as $b) {
+ $lr = explode(":", $b);
+ $vers[trim($lr[0])] = trim($lr[1]);
+ }
+
+ $sm = $vers['sass'] > 3.4 ? ' --sourcemap=auto ' : '--sourcemap';
+ $cmd = "{$sassc} --style=compressed {$sm} -I {$fd} -I {$this->rootDir}/roojs1/scss/bootstrap $smod.scss {$compiledir}/{$output}";
//echo "$cmd\n"; echo `$cmd`;
`$cmd`;
//echo "$cmd\n"; echo `$cmd`;
`$cmd`;