From 75c4ce4edbce20cbd314365ca61e8c590cf9e893 Mon Sep 17 00:00:00 2001 From: Paul Gear Date: Tue, 28 Oct 2014 05:56:36 +1000 Subject: [PATCH] Genericise Makefile and do not ignore it --- .gitignore | 1 - Makefile | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Makefile diff --git a/.gitignore b/.gitignore index 12cf06a76..4fa34c85d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -Makefile config.php .index logs diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..e6b9efd5c --- /dev/null +++ b/Makefile @@ -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