]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Splits the progress @echo statements in the Makefile.
authorNicolas Dudebout <nicolas.dudebout@gatech.edu>
Mon, 12 Nov 2012 00:13:43 +0000 (19:13 -0500)
committerNicolas Dudebout <nicolas.dudebout@gatech.edu>
Mon, 14 Jan 2013 13:57:44 +0000 (08:57 -0500)
Makefile

index 18f77c2254b06f33835f860dd1b2c7d2886188a1..cb776a6bf01635cdd13fa5947f3d94d23d9448ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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"