Skip to content

Commit

Permalink
simplify build process more - remove really annoying date.
Browse files Browse the repository at this point in the history
  • Loading branch information
fat committed Jan 28, 2012
1 parent 4e191c4 commit 15d3a47
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ nbproject

# Misc
js/min

dist
15 changes: 4 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
VERSION=2.0.0
BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
Expand All @@ -12,16 +11,11 @@ WATCHR ?= `which watchr`
#

build:
@@if test ! -z ${LESS_COMPRESSOR}; then \
sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
rm -f ${BOOTSTRAP_LESS}.tmp; \
sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_RESPONSIVE_LESS} >${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
@if test ! -z ${LESS_COMPRESSOR}; then \
lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \
node docs/build; \
cp img/* docs/assets/img/; \
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"; \
Expand All @@ -32,13 +26,12 @@ build:
#

watch:
@@if test ! -z ${WATCHR}; then \
@if test ! -z ${WATCHR}; then \
echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }"; \
else \
echo "You must have the watchr installed in order to watch Bootstrap Less files."; \
echo "You can install it by running: gem install watchr"; \
fi


.PHONY: build watch
2 changes: 1 addition & 1 deletion docs/assets/css/bootstrap-responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -273,4 +273,4 @@
.offset12 { .offset(12); }
}
*/
*/
3 changes: 1 addition & 2 deletions docs/assets/css/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 27 20:16:25 PST 2012
*/
article,
aside,
Expand Down Expand Up @@ -1971,7 +1970,7 @@ table .span12 {
.navbar-search .search-query :-moz-placeholder {
color: #eeeeee;
}
.navbar-search .search-query ::-webkit-input-placeholder {
.navbar-search .search-query::-webkit-input-placeholder {
color: #eeeeee;
}
.navbar-search .search-query:hover {
Expand Down
3 changes: 1 addition & 2 deletions less/bootstrap.less
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*!
* Bootstrap @VERSION
* Bootstrap v2.0.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* 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
*/

// CSS Reset
Expand Down

0 comments on commit 15d3a47

Please sign in to comment.