Genericise Makefile and do not ignore it

This commit is contained in:
Paul Gear
2014-10-28 05:56:36 +10:00
parent 0d704de9b0
commit 75c4ce4edb
2 changed files with 34 additions and 1 deletions

1
.gitignore vendored
View File

@@ -1,4 +1,3 @@
Makefile
config.php
.index
logs

34
Makefile Normal file
View File

@@ -0,0 +1,34 @@
GIT=git
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
push-testing:
$(GIT) push testing
update-subtrees:
$(GIT) subtree pull --squash --prefix=html/js/datetime https://github.com/Eonasdan/bootstrap-datetimepicker master
$(GIT) subtree pull --squash --prefix=html/js/moment https://github.com/moment/moment master