From 5591a9b96668c0f151872ce5f473a968d042a73c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 14:56:37 -0700 Subject: use yui-compress by default instead of regular compress --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 768d59e1f..59cd451b7 100644 --- a/Makefile +++ b/Makefile @@ -31,9 +31,9 @@ bootstrap: mkdir -p bootstrap/js cp img/* bootstrap/img/ lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css - lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css + lessc --yui-compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css - lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css + lessc --yui-compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css 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 -- cgit v1.2.3 From 575f18aaf49abb0289185f6409bee031947ccf69 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 16:29:53 -0700 Subject: add jshint support + a few minor stylistic changes --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 59cd451b7..8f57099b9 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,8 @@ 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 -- cgit v1.2.3 From c7dc4cc573c61306ae849d316f432160b16a2099 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 22:43:36 -0700 Subject: change position of var in dropdown + cleanup makefile vars --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8f57099b9..a0ad78d69 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,6 @@ BOOTSTRAP = ./docs/assets/css/bootstrap.css BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less -LESS_COMPRESSOR ?= `which lessc` -WATCHR ?= `which watchr` # # BUILD DOCS -- cgit v1.2.3 From c262ead6ed63408bbe062187fd4aa8aeb5da2e70 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 23:51:08 -0700 Subject: change comments to preserve for yui --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a0ad78d69..ae76c66c1 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ bootstrap: 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 + 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 cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js -- cgit v1.2.3 From 2a6894d834c0866e2bbd3d7aa7d824b4355e61f7 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Apr 2012 00:16:09 -0700 Subject: simplify make - move zipping to gh-pages only --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.3 From e985681758c3fef534f5bbe86c12b884a8333cbe Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Apr 2012 00:19:25 -0700 Subject: add zip to git ignore, and fix gh-pages make --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 038629468..78d1a8407 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ bootstrap: # gh-pages: bootstrap docs - rm docs/assets/bootstrap.zip + rm -f docs/assets/bootstrap.zip zip -r docs/assets/bootstrap.zip bootstrap rm -r bootstrap rm -f ../bootstrap-gh-pages/assets/bootstrap.zip -- cgit v1.2.3 From 6cf9906a60faa17c0463932c761b8280e9dce63c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Apr 2012 17:03:33 -0700 Subject: build bootstrap.js and bootstrap.min.js into docs --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 78d1a8407..ecb7a0040 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,11 @@ docs: cp img/* docs/assets/img/ cp js/*.js docs/assets/js/ cp js/tests/vendor/jquery.js docs/assets/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 > docs/assets/js/bootstrap.js + uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/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*/" > 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 # # BUILD SIMPLE BOOTSTRAP DIRECTORY -- cgit v1.2.3 From edb52a82d83d473071c20dfc4d8cb99742421950 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 18 Apr 2012 16:16:42 -0700 Subject: make bootstrap compile with Recess instead of Less --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ecb7a0040..7927c1e1c 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less 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} + recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} + recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE} node docs/build cp img/* docs/assets/img/ cp js/*.js docs/assets/js/ @@ -24,7 +24,7 @@ docs: # # BUILD SIMPLE BOOTSTRAP DIRECTORY -# lessc & uglifyjs are required +# recess & uglifyjs are required # bootstrap: @@ -32,10 +32,10 @@ bootstrap: mkdir -p bootstrap/css mkdir -p bootstrap/js cp img/* bootstrap/img/ - lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css - 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 + recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css + recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css + recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css + recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css 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 -- cgit v1.2.3 From f89394b8efda4bb9c969a7c69f8e9743ed546776 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 18 Apr 2012 22:49:31 -0700 Subject: make build prettier - hopefully this works, maybe some makefile bro's can improve --- Makefile | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7927c1e1c..f99b2303f 100644 --- a/Makefile +++ b/Makefile @@ -2,25 +2,40 @@ BOOTSTRAP = ./docs/assets/css/bootstrap.css BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less +DATE=$(shell date +%I:%M%p) +CHECK=\033[32m✔\033[39m # # BUILD DOCS # -docs: - jshint js/*.js --config js/.jshintrc - jshint js/tests/unit/*.js --config js/.jshintrc - recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} - recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE} - node docs/build - cp img/* docs/assets/img/ - cp js/*.js docs/assets/js/ - cp js/tests/vendor/jquery.js docs/assets/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 > docs/assets/js/bootstrap.js - uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/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*/" > 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 +build: + @echo "\n##################################################" + @echo "Building Bootstrap..." + @echo "##################################################\n" + @jshint js/*.js --config js/.jshintrc + @jshint js/tests/unit/*.js --config js/.jshintrc + @echo "Running JSHint on javascript... ${CHECK} Done" + @recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP} + @recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE} + @echo "Compiling LESS with Recess... ${CHECK} Done" + @node docs/build + @cp img/* docs/assets/img/ + @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 > docs/assets/js/bootstrap.js + @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/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*/" > 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##################################################" + @echo "Bootstrap successfully built at ${DATE}." + @echo "##################################################\n" + @echo "Thanks for using Bootstrap," + @echo "<3 @mdo and @fat\n" + # # BUILD SIMPLE BOOTSTRAP DIRECTORY -- cgit v1.2.3 From 1160935446e06339d8c7e09415d57086746fbce5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 19 Apr 2012 16:38:43 -0700 Subject: make a few changes to package.json (add make test to makefile) --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f99b2303f..e7a0f035f 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,14 @@ build: @echo "Thanks for using Bootstrap," @echo "<3 @mdo and @fat\n" +# +# RUN JSHINT +# TODO: run unittests +# + +test: + jshint js/*.js --config js/.jshintrc + jshint js/tests/unit/*.js --config js/.jshintrc # # BUILD SIMPLE BOOTSTRAP DIRECTORY -- cgit v1.2.3 From 03f78f7a60a631c01c1fb085b01d98bee61d7bb6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 19 Apr 2012 17:34:07 -0700 Subject: run qunit tests in phantomjs for travis-ci --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e7a0f035f..9a4ffa453 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less DATE=$(shell date +%I:%M%p) CHECK=\033[32m✔\033[39m + # # BUILD DOCS # @@ -37,13 +38,16 @@ build: @echo "<3 @mdo and @fat\n" # -# RUN JSHINT -# TODO: run unittests +# RUN JSHINT & QUNIT TESTS IN PHANTOMJS # test: jshint js/*.js --config js/.jshintrc jshint js/tests/unit/*.js --config js/.jshintrc + node js/tests/server.js & + phantomjs js/tests/phantom.js "http://localhost:3000/js/tests" + kill -9 `cat js/tests/pid.txt` + rm js/tests/pid.txt # # BUILD SIMPLE BOOTSTRAP DIRECTORY -- cgit v1.2.3 From b8b1ffde055b9e04f658201f81cf7974d56ae0c2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 23 Apr 2012 04:16:27 -0700 Subject: hr to var in makefil --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9a4ffa453..ea9d3a3f9 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less DATE=$(shell date +%I:%M%p) CHECK=\033[32m✔\033[39m +HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# # @@ -11,9 +12,9 @@ CHECK=\033[32m✔\033[39m # build: - @echo "\n##################################################" + @echo "\n${HR}" @echo "Building Bootstrap..." - @echo "##################################################\n" + @echo "${HR}\n" @jshint js/*.js --config js/.jshintrc @jshint js/tests/unit/*.js --config js/.jshintrc @echo "Running JSHint on javascript... ${CHECK} Done" @@ -31,9 +32,9 @@ build: @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##################################################" + @echo "\n${HR}" @echo "Bootstrap successfully built at ${DATE}." - @echo "##################################################\n" + @echo "${HR}\n" @echo "Thanks for using Bootstrap," @echo "<3 @mdo and @fat\n" -- cgit v1.2.3