diff options
author | Mark Otto <otto@github.com> | 2013-02-18 04:56:30 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2013-02-18 04:56:30 +0400 |
commit | 6663a35562a19d659fc16c8e2711479300a439f4 (patch) | |
tree | e03d6fd1ff83e6ffe525e6e477809160766bfd28 /Makefile | |
parent | 077b70112f50204bda57da3590633cb5ab1fdc20 (diff) | |
parent | 6512c5a5bccc80b1cfad84aa6b3efe267342fbba (diff) |
Resolve conflicts
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 38 |
1 files changed, 22 insertions, 16 deletions
@@ -1,8 +1,10 @@ -BOOTSTRAP = ./docs/assets/css/bootstrap.css -BOOTSTRAP_LESS = ./less/bootstrap.less +BOOTSTRAP ?= ./docs/assets/css/bootstrap.css +BOOTSTRAP_LESS ?= ./less/bootstrap.less DATE=$(shell date +%I:%M%p) CHECK=\033[32m✔ Done\033[39m HR=\033[37m--------------------------------------------------\033[39m +PATH := ./node_modules/.bin:$(PATH) + # # BUILD DOCS @@ -12,21 +14,25 @@ build: @echo "\n\n" @echo "\033[36mBuilding Bootstrap...\033[39m" @echo "${HR}" + @printf "Running JSHint on javascript..." @jshint js/*.js --config js/.jshintrc @jshint js/tests/unit/*.js --config js/.jshintrc - @echo "Running JSHint on javascript... ${CHECK}" - @./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} - @echo "Compiling LESS with Recess... ${CHECK}" + @echo " ${CHECK} Done" + @printf "Compiling LESS with Recess..." + @recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} + @echo " ${CHECK} Done" + @printf "Prepping fonts and JavaScript..." @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}" + @echo " ${CHECK} Done" + @printf "Compiling and minifying javascript..." @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 - @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 + @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js + @echo "/**\n* Bootstrap.js v2.3.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 - @echo "Compiling and minifying javascript... ${CHECK}" + @echo " ${CHECK} Done" @echo "${HR}" @echo "\033[36mSuccess!\n\033[39m" @echo "\033[37mThanks for using Bootstrap," @@ -37,8 +43,8 @@ build: # test: - ./node_modules/.bin/jshint js/*.js --config js/.jshintrc - ./node_modules/.bin/jshint js/tests/unit/*.js --config js/.jshintrc + jshint js/*.js --config js/.jshintrc + jshint 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` @@ -67,7 +73,7 @@ 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 -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 @@ -80,10 +86,10 @@ 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 --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css + recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css + recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css + recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css # # FONTS |