2014-10-28 05:56:36 +10:00
|
|
|
GIT=git
|
2015-03-31 22:34:04 +10:00
|
|
|
GIT_SUBTREE=$(GIT) subtree pull --squash
|
2014-10-28 05:56:36 +10:00
|
|
|
SYNC=rsync -rtvx --cvs-exclude --exclude '.*.swp'
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
@echo 'Make what?'
|
|
|
|
|
|
|
|
|
|
personal p: test push-personal
|
|
|
|
|
|
|
|
|
|
test t: pull merge push-testing gc
|
|
|
|
|
|
|
|
|
|
check:
|
|
|
|
|
find . -type f -name '*.php' | xargs -n1 php -l 2>&1 | awk '/^No syntax errors detected in / {next} {print; ret=1} END {exit ret}'
|
|
|
|
|
|
|
|
|
|
gc:
|
|
|
|
|
$(GIT) gc
|
|
|
|
|
|
|
|
|
|
merge:
|
|
|
|
|
$(GIT) merge master
|
|
|
|
|
|
|
|
|
|
pull:
|
|
|
|
|
$(GIT) pull
|
|
|
|
|
|
|
|
|
|
push-dev:
|
|
|
|
|
$(GIT) push
|
|
|
|
|
|
|
|
|
|
push-personal pp:
|
|
|
|
|
$(GIT) push personal
|
|
|
|
|
|
2015-04-18 19:06:22 +10:00
|
|
|
push-testing pt:
|
2014-10-28 05:56:36 +10:00
|
|
|
$(GIT) push testing
|
|
|
|
|
|
2015-03-31 17:33:42 +01:00
|
|
|
update-subtrees: datetime-subtree moment-subtree font-awesome vis
|
2015-03-31 22:34:04 +10:00
|
|
|
|
|
|
|
|
datetime-subtree:
|
|
|
|
|
$(GIT_SUBTREE) --prefix=html/js/datetime https://github.com/Eonasdan/bootstrap-datetimepicker master
|
|
|
|
|
|
|
|
|
|
moment-subtree:
|
|
|
|
|
$(GIT_SUBTREE) --prefix=html/js/moment https://github.com/moment/moment master
|
2015-03-31 17:33:42 +01:00
|
|
|
|
|
|
|
|
font-awesome:
|
|
|
|
|
$(GIT_SUBTREE) --prefix=lib/Font-Awesome https://github.com/FortAwesome/Font-Awesome.git master
|
|
|
|
|
|
|
|
|
|
vis:
|
|
|
|
|
$(GIT_SUBTREE) --prefix=lib/vis https://github.com/almende/vis.git master
|
2015-04-29 15:18:14 +01:00
|
|
|
|
|
|
|
|
typeahead:
|
|
|
|
|
$(GIT_SUBTREE) -- prefix=lib/typeahead https://github.com/twitter/typeahead.js.git master
|
