X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=buildSDK%2Fpre-commit;h=a47449e5e36f6f29807a5026c7b2601d312cd7c1;hb=fc32d3336ffe6a4ac93549dab21fd04b7d7056d3;hp=3d9d1c99d5c6ab263994ab11b1e3122fccca8aae;hpb=a2b2df9f863b7c68eca7ad8170c29b90bac68f50;p=roojs1 diff --git a/buildSDK/pre-commit b/buildSDK/pre-commit index 3d9d1c99d5..a47449e5e3 100755 --- 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(); @@ -95,6 +102,7 @@ function build_docs() { exec("roojspacker -i buildSDK/dependancy_core.txt -i buildSDK/dependancy_ui.txt " . "-i buildSDK/dependancy_bootstrap.txt -i buildSDK/dependancy_calendar.txt " . + "-i buildSDK/dependancy_svg.txt " . "--doc-target=docs -D"); } function compile_core()