projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix attribute
[roojs1]
/
buildSDK
/
pre-commit
diff --git
a/buildSDK/pre-commit
b/buildSDK/pre-commit
index
6e8a240
..
a47449e
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_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();
if ($core || $ui) {
merge_files();
@@
-45,8
+45,7
@@
function unlock()
{
unlink(".git/pre-commit-running");
}
{
unlink(".git/pre-commit-running");
}
-
-
+
function changed_files()
{
static $output = array();
function changed_files()
{
static $output = array();
@@
-65,17
+64,25
@@
function changed_files()
function trigger_action_file($fn, $filename)
{
function trigger_action_file($fn, $filename)
{
- $ret = explode("\n",file_get_contents("buildSDK/" . $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;
$ret[] = "buildSDK/".$filename;
- return trigger_action($fn, $
ret
);
+ return trigger_action($fn, $
add
);
}
function trigger_action($fn, $files)
{
}
function trigger_action($fn, $files)
{
- $changed = changed_files();
+
foreach(changed_files() as $cg) {
foreach($files as $f) {
foreach(changed_files() as $cg) {
foreach($files as $f) {
+ $f = trim($f);
if ($f == $cg) {
echo "RUNNING : $fn\n";
$fn();
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 " .
{
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()
"--doc-target=docs -D");
}
function compile_core()