aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-04-15 00:16:09 -0700
committerJacob Thornton <[email protected]>2012-04-15 00:16:09 -0700
commit2a6894d834c0866e2bbd3d7aa7d824b4355e61f7 (patch)
tree99f846bb500cc1e52d9c8bc629de741cbe0da4b0
parentc262ead6ed63408bbe062187fd4aa8aeb5da2e70 (diff)
downloadbootstrap-2a6894d834c0866e2bbd3d7aa7d824b4355e61f7.tar.xz
bootstrap-2a6894d834c0866e2bbd3d7aa7d824b4355e61f7.zip
simplify make - move zipping to gh-pages only
-rw-r--r--Makefile14
-rw-r--r--docs/assets/bootstrap.zipbin71464 -> 0 bytes
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index ae76c66c1..038629468 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,9 @@ BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
# BUILD DOCS
#
-docs: bootstrap
- rm docs/assets/bootstrap.zip
- zip -r docs/assets/bootstrap.zip bootstrap
- rm -r bootstrap
+docs:
+ jshint js/*.js --config js/.jshintrc
+ jshint js/tests/unit/*.js --config js/.jshintrc
lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
node docs/build
@@ -32,8 +31,6 @@ bootstrap:
lessc --yui-compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
lessc --yui-compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
- jshint js/*.js --config js/.jshintrc
- jshint js/tests/unit/*.js --config js/.jshintrc
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 > bootstrap/js/bootstrap.js
uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
@@ -44,7 +41,10 @@ bootstrap:
# MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O )
#
-gh-pages: docs
+gh-pages: bootstrap docs
+ rm 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
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
deleted file mode 100644
index fd0862399..000000000
--- a/docs/assets/bootstrap.zip
+++ /dev/null
Binary files differ