diff options
| author | Nicolas Dudebout <[email protected]> | 2012-11-11 19:13:43 -0500 |
|---|---|---|
| committer | Nicolas Dudebout <[email protected]> | 2013-01-14 08:57:44 -0500 |
| commit | 5204f206b982a9ded4a70e8f900fdf5811f4e557 (patch) | |
| tree | f7cf1705cc770f2c660a9b5c8eb13037f8ebac27 | |
| parent | d247f71217917f6e53354e410b8020289b841a47 (diff) | |
| download | bootstrap-5204f206b982a9ded4a70e8f900fdf5811f4e557.tar.xz bootstrap-5204f206b982a9ded4a70e8f900fdf5811f4e557.zip | |
Splits the progress @echo statements in the Makefile.
| -rw-r--r-- | Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -13,22 +13,26 @@ build: @echo "\n${HR}" @echo "Building Bootstrap..." @echo "${HR}\n" + @echo -n "Running JSHint on javascript..." @jshint js/*.js --config js/.jshintrc @jshint js/tests/unit/*.js --config js/.jshintrc - @echo "Running JSHint on javascript... ${CHECK} Done" + @echo " ${CHECK} Done" + @echo -n "Compiling LESS with Recess..." @./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} - @echo "Compiling LESS with Recess... ${CHECK} Done" + @echo " ${CHECK} Done" + @echo -n "Compiling documentation..." @node docs/build @cp fonts/* docs/assets/fonts/ @cp js/*.js docs/assets/js/ @cp js/tests/vendor/jquery.js docs/assets/js/ - @echo "Compiling documentation... ${CHECK} Done" + @echo " ${CHECK} Done" @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 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 + @echo -n "Compiling and minifying javascript..." @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} Done" + @echo " ${CHECK} Done" @echo "\n${HR}" @echo "Bootstrap successfully built at ${DATE}." @echo "${HR}\n" |