diff --git a/Makefile b/Makefile index 57393d1049b735672ed84531b23ceb0271857a61..3478af356f335e8bdc1406163fa37e0948451843 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,10 @@ BOOTSTRAP_LESS = ./less/bootstrap.less DATE=$(shell date +%I:%M%p) CHECK=\033[32m✔ Done\033[39m HR=\033[37m--------------------------------------------------\033[39m +BIN_PREFIX=./node_modules/.bin/ +JSHINT_BIN=$(BIN_PREFIX)jshint +RECESS_BIN=$(BIN_PREFIX)recess +UGLIFYJS_BIN=$(BIN_PREFIX)uglifyjs # # BUILD DOCS @@ -12,17 +16,17 @@ build: @echo "\n\n" @echo "\033[36mBuilding Bootstrap...\033[39m" @echo "${HR}" - @jshint js/*.js --config js/.jshintrc - @jshint js/tests/unit/*.js --config js/.jshintrc + @$(JSHINT_BIN) js/*.js --config js/.jshintrc + @$(JSHINT_BIN) js/tests/unit/*.js --config js/.jshintrc @echo "Running JSHint on javascript... ${CHECK}" - @./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} + @$(RECESS_BIN) --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} @echo "Compiling LESS with Recess... ${CHECK}" @cp fonts/* docs/assets/fonts/ @cp js/*.js docs/assets/js/ @cp js/tests/vendor/jquery.js docs/assets/js/ @echo "Prepping fonts and JavaScript... ${CHECK}" @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js - @./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js + @$(UGLIFYJS_BIN) -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js @echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js @@ -37,8 +41,8 @@ build: # test: - ./node_modules/.bin/jshint js/*.js --config js/.jshintrc - ./node_modules/.bin/jshint js/tests/unit/*.js --config js/.jshintrc + $(JSHINT_BIN) js/*.js --config js/.jshintrc + $(JSHINT_BIN) js/tests/unit/*.js --config js/.jshintrc node js/tests/server.js & phantomjs js/tests/phantom.js "http://localhost:3000/js/tests" kill -9 `cat js/tests/pid.txt` @@ -49,7 +53,7 @@ test: # clean: - rm -r bootstrap + -rm -r bootstrap # # BUILD SIMPLE BOOTSTRAP DIRECTORY @@ -67,23 +71,23 @@ bootstrap-js: bootstrap/js/*.js bootstrap/js/*.js: js/*.js mkdir -p bootstrap/js cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > bootstrap/js/bootstrap.js - ./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js + $(UGLIFYJS_BIN) -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js # -# CSS COMPLILE +# CSS COMPILE # bootstrap-css: bootstrap/css/*.css bootstrap/css/*.css: less/*.less mkdir -p bootstrap/css - ./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css - ./node_modules/.bin/recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css - ./node_modules/.bin/recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css - ./node_modules/.bin/recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css + $(RECESS_BIN) --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css + $(RECESS_BIN) --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css + $(RECESS_BIN) --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css + $(RECESS_BIN) --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css # # FONTS @@ -100,7 +104,7 @@ bootstrap/fonts/*: fonts/* # MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O ) # -gh-pages: bootstrap docs +gh-pages: bootstrap rm -f docs/assets/bootstrap.zip zip -r docs/assets/bootstrap.zip bootstrap rm -r bootstrap @@ -113,8 +117,8 @@ gh-pages: bootstrap docs # watch: - echo "Watching less files..."; \ + @echo "Watching less files..."; \ watchr -e "watch('less/.*\.less') { system 'make' }" -.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js +.PHONY: build test clean bootstrap bootstrap-js bootstrap-css bootstrap-fonts gh-pages watch