Skip to content

Commit

Permalink
update makefile to work again; gitignore the compiled docs _gh_pages …
Browse files Browse the repository at this point in the history
…folder; test makefile with darkened navbar active bg
  • Loading branch information
mdo committed Feb 13, 2013
1 parent b57c20a commit 96953c2
Show file tree
Hide file tree
Showing 102 changed files with 23 additions and 21,179 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Ignore compiled docs
_gh_pages

# Numerous always-ignore extensions
*.diff
*.err
Expand Down
35 changes: 17 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BOOTSTRAP = ./assets/css/bootstrap.css
BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less
DATE=$(shell date +%I:%M%p)
CHECK=\033[32m✔\033[39m
Expand All @@ -18,16 +18,15 @@ build:
@echo "Running JSHint on javascript... ${CHECK} Done"
@./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
@echo "Compiling LESS with Recess... ${CHECK} Done"
# @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"
@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
@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"
@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
@echo "Compiling and minifying javascript... ${CHECK} Done"
@echo "\n${HR}"
@echo "Bootstrap successfully built at ${DATE}."
Expand Down Expand Up @@ -103,13 +102,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
Expand Down
Loading

0 comments on commit 96953c2

Please sign in to comment.