aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-07-02 10:45:59 -0700
committerJacob Thornton <[email protected]>2011-07-02 10:45:59 -0700
commit088bfcc13a1f85557d12553a7942e3284c6ceae5 (patch)
treeb6530b14acb847f381ef0f510ac9ade598bd3e59
parent52dfbe65006e1be7df88d1c1d39dc151ebc672aa (diff)
downloadbootstrap-088bfcc13a1f85557d12553a7942e3284c6ceae5.tar.xz
bootstrap-088bfcc13a1f85557d12553a7942e3284c6ceae5.zip
add formal checks to makefile to make sure people have neccessary software installed
add date to built file!
-rw-r--r--Makefile33
-rw-r--r--bootstrap-1.0.0.css2
-rw-r--r--lib/bootstrap.less2
3 files changed, 26 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 7a962a3e5..74ab90d02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,29 @@
-# NOTE: you must have the less npm package installed globally to build!
-# To install less package run: $npm install less -g
-# watchr -e "watch('lib/.*\.less') { system 'make' }"
+DATE=$(shell DATE)
+BOOTSTRAP = ./bootstrap-1.0.0.css
+BOOTSTRAP_MIN = ./bootstrap-1.0.0.min.css
+BOOTSTRAP_LESS = ./lib/bootstrap.less
+LESS_COMPESSOR ?= `which lessc`
+WATCHR ?= `which watchr`
build:
- @lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.css
- @lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.min.css --compress
- @echo "Bootstrap successfully built! - `date`"
+ @@if test ! -z ${LESS_COMPESSOR}; then \
+ sed 's/@DATE/'"${DATE}"'/' ${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
+ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
+ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
+ rm -f ${BOOTSTRAP_LESS}.tmp; \
+ echo "Bootstrap successfully built! - `date`"; \
+ else \
+ echo "You must have the LESS compiler installed in order to build Bootstrap."; \
+ echo "You can install it by running: npm install less -g"; \
+ fi
watch:
- @echo "Watching less files for changes..."
- @watchr -e "watch('lib/.*\.less') { system 'make' }"
+ @@if test ! -z ${LESS_COMPESSOR}; then \
+ echo "Watching less files..."; \
+ watchr -e "watch('lib/.*\.less') { system 'make' }"; \
+ else \
+ echo "You must have the WATCHR installed in order to build Bootstrap."; \
+ echo "You can install it by running: gem install watchr"; \
+ fi
-.PHONY: build \ No newline at end of file
+.PHONY: build watch \ No newline at end of file
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index 7a74227ab..37bfc0f33 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: {{ date }}
+ * Date: Sat Jul 2 10:45:47 PDT 2011
*/
/*
* Reset.less
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 834d95080..ead0c8f83 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: {{ date }}
+ * Date: @DATE
*/
// CSS Reset