aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-02-17 16:58:43 -0800
committerMark Otto <[email protected]>2013-02-17 16:58:43 -0800
commitf59e4fdba32b99bdd4e6387f889dda4c9270f762 (patch)
tree0189461fabdb16b78215b3cc54fc589b787d157c /Makefile
parent9134fa4eda2ce976a982d35b779c0849a9bd7c83 (diff)
downloadbootstrap-f59e4fdba32b99bdd4e6387f889dda4c9270f762.tar.xz
bootstrap-f59e4fdba32b99bdd4e6387f889dda4c9270f762.zip
remove duplicate done text; change label on docs prep step
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0c23405be..48aacdf08 100644
--- a/Makefile
+++ b/Makefile
@@ -14,25 +14,25 @@ build:
@echo "\n\n"
@echo "\033[36mBuilding Bootstrap...\033[39m"
@echo "${HR}"
- @printf "Running JSHint on javascript..."
+ @printf "Running JSHint on JavaScript..."
@jshint js/*.js --config js/.jshintrc
@jshint js/tests/unit/*.js --config js/.jshintrc
- @echo " ${CHECK} Done"
+ @echo " ${CHECK}"
@printf "Compiling LESS with Recess..."
@recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
- @echo " ${CHECK} Done"
- @printf "Prepping fonts and JavaScript..."
+ @echo " ${CHECK}"
+ @printf "Prepping documentation assets..."
@cp fonts/* docs/assets/fonts/
@cp js/*.js docs/assets/js/
@cp js/tests/vendor/jquery.js docs/assets/js/
- @echo " ${CHECK} Done"
- @printf "Compiling and minifying javascript..."
+ @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
@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
@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 " ${CHECK} Done"
+ @echo " ${CHECK}"
@echo "${HR}"
@echo "\033[36mSuccess!\n\033[39m"
@echo "\033[37mThanks for using Bootstrap,"