X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=AssetTrait.php;h=6e8627ead2879c9c1292f7e790206bf673f5766e;hb=dff7116c31985c523f927df3e8e7cf50670ef428;hp=36ce845382e05e5b98963759d3b36f0520d365a5;hpb=c99710918ed71fdf5e2f76869b0c417600b0887b;p=Pman.Core

diff --git a/AssetTrait.php b/AssetTrait.php
index 36ce8453..6e8627ea 100644
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -127,13 +127,11 @@ trait Pman_Core_AssetTrait {
                 case 'js':
                     echo '<script type="text/javascript" src="'. $f. '"></script>'."\n";
                     break;
-                case 'css':
                 case 'css':
                     echo '<link rel="stylesheet" href="'. $f. '"/>'."\n";
                     break;
        
             }
-            
         }
     }
     
@@ -337,9 +335,16 @@ trait Pman_Core_AssetTrait {
             }
                  
             $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`;
             
@@ -347,7 +352,7 @@ trait Pman_Core_AssetTrait {
             clearstatcache();
             if (!file_exists($compiledir.'/'.$output) ||
                 !filesize($compiledir.'/'.$routput)) {
-                echo "<!-- compile did not generate files : " . basename($compiledir) . "/{$output} -->\n";
+                echo "<!-- compile did not generate files : $cmd -->\n";
                 echo "<script type=\"text/javascript\">alert('Failed to compile {$fp}');</script>\n";
                 return;
             }