diff options
| author | Mark Otto <[email protected]> | 2013-02-12 12:27:18 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-12 12:27:18 -0800 |
| commit | 8174705be8a78258a9167fab0800549978233b6c (patch) | |
| tree | 3f280cefea1761fcfffc4309304f0ab9ac808e73 | |
| parent | 8b9733b288a3daca0da04fe60e0b5a0ae8681362 (diff) | |
| download | bootstrap-8174705be8a78258a9167fab0800549978233b6c.tar.xz bootstrap-8174705be8a78258a9167fab0800549978233b6c.zip | |
update makefile to work given nuked docs dir
| -rw-r--r-- | Makefile | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -1,4 +1,4 @@ -BOOTSTRAP = ./docs/assets/css/bootstrap.css +BOOTSTRAP = ./assets/css/bootstrap.css BOOTSTRAP_LESS = ./less/bootstrap.less DATE=$(shell date +%I:%M%p) CHECK=\033[32m✔\033[39m @@ -23,11 +23,11 @@ build: # @cp js/*.js docs/assets/js/ # @cp js/tests/vendor/jquery.js docs/assets/js/ # @echo "Compiling documentation... ${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 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 + @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 > assets/js/bootstrap.js + @./node_modules/.bin/uglifyjs -nc assets/js/bootstrap.js > 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*/" > assets/js/copyright.js + @cat assets/js/copyright.js assets/js/bootstrap.min.tmp.js > assets/js/bootstrap.min.js + @rm assets/js/copyright.js assets/js/bootstrap.min.tmp.js @echo "Compiling and minifying javascript... ${CHECK} Done" @echo "\n${HR}" @echo "Bootstrap successfully built at ${DATE}." @@ -103,13 +103,13 @@ bootstrap/fonts/*: fonts/* # MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O ) # -gh-pages: bootstrap docs - rm -f docs/assets/bootstrap.zip - zip -r docs/assets/bootstrap.zip bootstrap - rm -r bootstrap - rm -f ../bootstrap-gh-pages/assets/bootstrap.zip - node docs/build production - cp -r docs/* ../bootstrap-gh-pages +# gh-pages: bootstrap docs +# rm -f docs/assets/bootstrap.zip +# zip -r docs/assets/bootstrap.zip bootstrap +# rm -r bootstrap +# rm -f ../bootstrap-gh-pages/assets/bootstrap.zip +# node docs/build production +# cp -r docs/* ../bootstrap-gh-pages # # WATCH LESS FILES |