add formal checks to makefile to make sure people have neccessary software installed

add date to built file!

diff --git a/Makefile b/Makefile
index 7a962a3e5b9d152a95ef80508dec2f3f20e0f5f1..74ab90d023226c3736cd3ba2b2f168ede30b1b66 100644 (file)
--- 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 7a74227ab245623119751d98efefa3e1f4d851e5..37bfc0f334973f167f720ed0f9df6c64fc31a958 100644 (file)
--- 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 834d95080359070069e14b51c8efb6886d2ab752..ead0c8f8327bfbe30ac02f6e33db73650e859f03 100644 (file)
--- 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