roojs-ui.js

[roojs1] / buildSDK / pre-commit

diff --git a/buildSDK/pre-commit b/buildSDK/pre-commit
index 3d9d1c9..c983695 100755 (executable)
--- a/buildSDK/pre-commit
+++ b/buildSDK/pre-commit
@@ -16,8 +16,8 @@ trigger_action_file('compile_bootstrap',  'dependancy_bootstrap.txt');
 trigger_action_file('compile_mailer',  'dependancy_mailer.txt');
 trigger_action_file('compile_calendar',  'dependancy_calendar.txt');
 
-trigger_action('compile_less', array('less'));
-trigger_action('compile_scss', array('scss'));
+trigger_action('compile_less', array('less/'));
+trigger_action('compile_scss', array('scss/'));
 
 if ($core || $ui) {
     merge_files();
@@ -45,8 +45,7 @@ function unlock()
 {
     unlink(".git/pre-commit-running");
 }
-
-
+ 
 function changed_files()
 {
     static $output = array();
@@ -66,16 +65,24 @@ function changed_files()
 function trigger_action_file($fn, $filename)
 {
     $ret = explode("\n",file_get_contents(__DIR__ . "/" . $filename));
+    $add = array();
+    foreach($ret as $r) {
+        $r=trim($r);
+        if (strlen($r)) {
+            $add[] = str_replace('.','/', $r) . ".js";
+        }
+    }
     $ret[] = "buildSDK/".$filename;
-    return trigger_action($fn, $ret);
+    return trigger_action($fn, $add);
     
 }
 
 function trigger_action($fn, $files)
 {
-    $changed = changed_files();
+    
     foreach(changed_files() as $cg) {
         foreach($files as $f) {
+            $f = trim($f);
             if ($f == $cg) {
                 echo "RUNNING : $fn\n";
                 $fn();