DataObjects/Core_person.php

[Pman.Core] / AssetTrait.php

diff --git a/AssetTrait.php b/AssetTrait.php
index 69dfd90..36ce845 100644 (file)
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -127,6 +127,7 @@ 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;
@@ -287,6 +288,7 @@ trait Pman_Core_AssetTrait {
         // we cant output non-cached versions of this.... 
         $ff = HTML_FlexyFramework::get();
         $fp =   "{$this->rootDir}/Pman/$smod/scss/{$smod}.scss";
+       // var_dump($fp);
         if (!file_exists($fp)) {
             return;
         }
@@ -302,7 +304,7 @@ trait Pman_Core_AssetTrait {
         //print_r($relfiles);
       
         require_once 'Pman/Core/Asset.php';
-        $compiledir = Pman_Core_Asset::getCompileDir('scss', '', true);
+        $compiledir = Pman_Core_Asset::getCompileDir('css',  '', true);
         
          
         if (!file_exists($compiledir)) {
@@ -311,11 +313,10 @@ trait Pman_Core_AssetTrait {
         
         
         
-        $smod = str_replace('/','.',$path);
-        
+         
         $output = date('Y-m-d-H-i-s-', $maxtime). $smod .'-'.md5(serialize(array($this->baseURL, $ar))) .'.css';
          
-        $asset = $ff->project == 'Pman' ? '/Core/Asset/scss/' : '/Asset/scss/';
+        $asset = $ff->project == 'Pman' ? '/Core/Asset/css/' : '/Asset/css/';
         
         // where are we going to write all of this..
         // This has to be done via a
@@ -324,17 +325,30 @@ trait Pman_Core_AssetTrait {
         
         if ( !file_exists($compiledir.'/'.$output) || !filesize($compiledir.'/'.$output)) {
             
-            //print_r($relfiles);
             
-            require_once 'HTML/CSS/Minify.php';
-            $x = new HTML_CSS_Minify(substr($relpath,0,-1), $dir, $relfiles);
             
-            file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.$asset));
+            require_once 'System.php';
+            static $sassc = false;
+            if ($sassc === false) {
+                $sassc = System::which("sassc");
+            }
+            if (empty($sassc)) {
+                die("INSTALL sassc");
+            }
+                 
+            $fd = dirname($fp);
+                
+                
+            $cmd = "{$sassc} --style=compressed  --sourcemap=auto -I {$fd} -I {$this->rootDir}/roojs1/scss/bootstrap $smod.scss {$compiledir}/{$output}";
+            //echo "$cmd\n";            echo `$cmd`;
+            `$cmd`;
+            
+             
             clearstatcache();
             if (!file_exists($compiledir.'/'.$output) ||
                 !filesize($compiledir.'/'.$routput)) {
                 echo "<!-- compile did not generate files : " . basename($compiledir) . "/{$output} -->\n";
-                $this->assetArrayToHtml($files,'css');
+                echo "<script type=\"text/javascript\">alert('Failed to compile {$fp}');</script>\n";
                 return;
             }