mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-02 14:24:19 +01:00
Merge pull request #6968 from twitter/bs3_makefile_separated_done
More accurate makefile step confirmation
This commit is contained in:
commit
6e0815bf4e
40
Makefile
40
Makefile
@ -1,8 +1,10 @@
|
|||||||
BOOTSTRAP = ./docs/assets/css/bootstrap.css
|
BOOTSTRAP ?= ./docs/assets/css/bootstrap.css
|
||||||
BOOTSTRAP_LESS = ./less/bootstrap.less
|
BOOTSTRAP_LESS ?= ./less/bootstrap.less
|
||||||
DATE=$(shell date +%I:%M%p)
|
DATE=$(shell date +%I:%M%p)
|
||||||
CHECK=\033[32m✔ Done\033[39m
|
CHECK=\033[32m✔ Done\033[39m
|
||||||
HR=\033[37m--------------------------------------------------\033[39m
|
HR=\033[37m--------------------------------------------------\033[39m
|
||||||
|
PATH := ./node_modules/.bin:$(PATH)
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# BUILD DOCS
|
# BUILD DOCS
|
||||||
@ -12,21 +14,25 @@ build:
|
|||||||
@echo "\n\n"
|
@echo "\n\n"
|
||||||
@echo "\033[36mBuilding Bootstrap...\033[39m"
|
@echo "\033[36mBuilding Bootstrap...\033[39m"
|
||||||
@echo "${HR}"
|
@echo "${HR}"
|
||||||
@./node_modules/.bin/jshint js/*.js --config js/.jshintrc
|
@printf "Running JSHint on JavaScript..."
|
||||||
@./node_modules/.bin/jshint js/tests/unit/*.js --config js/.jshintrc
|
@jshint js/*.js --config js/.jshintrc
|
||||||
@echo "Running JSHint on javascript... ${CHECK}"
|
@jshint js/tests/unit/*.js --config js/.jshintrc
|
||||||
@./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
|
@echo " ${CHECK}"
|
||||||
@echo "Compiling LESS with Recess... ${CHECK}"
|
@printf "Compiling LESS with Recess..."
|
||||||
|
@recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
|
||||||
|
@echo " ${CHECK}"
|
||||||
|
@printf "Prepping documentation assets..."
|
||||||
@cp fonts/* docs/assets/fonts/
|
@cp fonts/* docs/assets/fonts/
|
||||||
@cp js/*.js docs/assets/js/
|
@cp js/*.js docs/assets/js/
|
||||||
@cp js/tests/vendor/jquery.js docs/assets/js/
|
@cp js/tests/vendor/jquery.js docs/assets/js/
|
||||||
@echo "Prepping fonts and JavaScript... ${CHECK}"
|
@echo " ${CHECK}"
|
||||||
|
@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
|
@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 -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
|
@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
|
@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
|
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
|
||||||
@echo "Compiling and minifying javascript... ${CHECK}"
|
@echo " ${CHECK}"
|
||||||
@echo "${HR}"
|
@echo "${HR}"
|
||||||
@echo "\033[36mSuccess!\n\033[39m"
|
@echo "\033[36mSuccess!\n\033[39m"
|
||||||
@echo "\033[37mThanks for using Bootstrap,"
|
@echo "\033[37mThanks for using Bootstrap,"
|
||||||
@ -37,8 +43,8 @@ build:
|
|||||||
#
|
#
|
||||||
|
|
||||||
test:
|
test:
|
||||||
./node_modules/.bin/jshint js/*.js --config js/.jshintrc
|
jshint js/*.js --config js/.jshintrc
|
||||||
./node_modules/.bin/jshint js/tests/unit/*.js --config js/.jshintrc
|
jshint js/tests/unit/*.js --config js/.jshintrc
|
||||||
node js/tests/server.js &
|
node js/tests/server.js &
|
||||||
phantomjs js/tests/phantom.js "http://localhost:3000/js/tests"
|
phantomjs js/tests/phantom.js "http://localhost:3000/js/tests"
|
||||||
kill -9 `cat js/tests/pid.txt`
|
kill -9 `cat js/tests/pid.txt`
|
||||||
@ -67,7 +73,7 @@ bootstrap-js: bootstrap/js/*.js
|
|||||||
bootstrap/js/*.js: js/*.js
|
bootstrap/js/*.js: js/*.js
|
||||||
mkdir -p bootstrap/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
|
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
|
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
|
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
|
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
|
bootstrap/css/*.css: less/*.less
|
||||||
mkdir -p bootstrap/css
|
mkdir -p bootstrap/css
|
||||||
./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
|
recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
|
||||||
./node_modules/.bin/recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
|
recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
|
||||||
./node_modules/.bin/recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
|
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 --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
|
||||||
|
|
||||||
#
|
#
|
||||||
# FONTS
|
# FONTS
|
||||||
|
Loading…
Reference in New Issue
Block a user