Skip to content

Commit

Permalink
use makefile instead of individual scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
aehlke committed Dec 11, 2012
1 parent 4d9c524 commit 9afa0a8
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .githooks/post-commit
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ if [ -a .commit ]; then
git commit --amend -C HEAD --no-verify -q
fi

./update_gh_pages.sh
make gh-pages

2 changes: 1 addition & 1 deletion .githooks/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

./minify.sh
make

touch .commit

17 changes: 17 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
JS=./js/tag-it.js
MINIFIED_OUTPUT=./js/tag-it.min.js

build:
@echo
@echo "Compiling JS..."
@curl --progress-bar -f -d compilation_level=SIMPLE_OPTIMIZATIONS -d output_format=text -d output_info=compiled_code --data-urlencode "js_code@${JS}" https://closure-compiler.appspot.com/compile -o ${MINIFIED_OUTPUT}

gh-pages:
@echo "Updating GitHub pages..."
@if git checkout gh-pages -q; then \
git merge master -Xtheirs && \
git checkout master -q; \
fi

.PHONY: gh-pages

7 changes: 0 additions & 7 deletions minify.sh

This file was deleted.

9 changes: 0 additions & 9 deletions update_gh_pages.sh

This file was deleted.

0 comments on commit 9afa0a8

Please sign in to comment.