From 0e2e81ec915e6aba6010c04032032dd76a306609 Mon Sep 17 00:00:00 2001 From: Arnold Daniels Date: Sat, 14 Jul 2012 22:03:55 +0200 Subject: [PATCH] Added Jasny build process --- Makefile | 38 +++++++++++++++++++++++++++++++------- less/jasny/bootstrap.less | 13 +++++++++++++ less/jasny/responsive.less | 13 +++++++++++++ 3 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 less/jasny/bootstrap.less create mode 100644 less/jasny/responsive.less diff --git a/Makefile b/Makefile index 827b6920..aceaa00b 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,8 @@ 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 +JASNY_BOOTSTRAP_LESS = ./less/jasny/bootstrap.less +JASNY_BOOTSTRAP_RESPONSIVE_LESS = ./less/jasny/responsive.less DATE=$(shell date +%I:%M%p) CHECK=\033[32m✔\033[39m HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\# @@ -18,8 +20,8 @@ build: @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} + @recess --compile ${JASNY_BOOTSTRAP_LESS} ${BOOTSTRAP_LESS} > ${BOOTSTRAP} + @recess --compile ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE} @echo "Compiling LESS with Recess... ${CHECK} Done" @node docs/build @cp img/* docs/assets/img/ @@ -60,25 +62,47 @@ bootstrap: mkdir -p bootstrap/css mkdir -p bootstrap/js cp img/* bootstrap/img/ - 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 + recess --compile ${BOOTSTRAP_LESS} ${JASNY_BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css + recess --compress ${BOOTSTRAP_LESS} ${JASNY_BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css + recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css + recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} ${JASNY_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 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 +# +# BUILD SIMPLE JASNY-BOOTSTRAP DIRECTORY +# recess & uglifyjs are required +# + +jasny-bootstrap: + mkdir -p jasny-bootstrap/css + mkdir -p jasny-bootstrap/js + recess --compile ${JASNY_BOOTSTRAP_LESS} > jasny-bootstrap/css/jasny-bootstrap.css + recess --compress ${JASNY_BOOTSTRAP_LESS} > jasny-bootstrap/css/jasny-bootstrap.min.css + recess --compile ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} > jasny-bootstrap/css/jasny-bootstrap-responsive.css + recess --compress ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} > jasny-bootstrap/css/jasny-bootstrap-responsive.min.css + cat /dev/null > jasny-bootstrap/js/jasny-bootstrap.js + uglifyjs -nc jasny-bootstrap/js/jasny-bootstrap.js > jasny-bootstrap/js/jasny-bootstrap.min.tmp.js + echo "/*!\n* Jasny-Bootstrap.js by @ArnoldDaniels\n* Copyright 2012 Jasny BV.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > jasny-bootstrap/js/copyright.js + cat jasny-bootstrap/js/copyright.js jasny-bootstrap/js/jasny-bootstrap.min.tmp.js > jasny-bootstrap/js/jasny-bootstrap.min.js + rm jasny-bootstrap/js/copyright.js jasny-bootstrap/js/jasny-bootstrap.min.tmp.js + # # MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O ) # -gh-pages: bootstrap docs +gh-pages: bootstrap jasny-bootstrap docs rm -f docs/assets/bootstrap.zip zip -r docs/assets/bootstrap.zip bootstrap rm -r bootstrap rm -f ../bootstrap-gh-pages/assets/bootstrap.zip + rm -f docs/assets/jasny-bootstrap.zip + zip -r docs/assets/jasny-bootstrap.zip jasny-bootstrap + rm -r jasny-bootstrap + rm -f ../bootstrap-gh-pages/assets/jasny-bootstrap.zip node docs/build production cp -r docs/* ../bootstrap-gh-pages diff --git a/less/jasny/bootstrap.less b/less/jasny/bootstrap.less new file mode 100644 index 00000000..f6829835 --- /dev/null +++ b/less/jasny/bootstrap.less @@ -0,0 +1,13 @@ +/*! + * Jasny Bootstrap Extensions j1 + * + * Copyright 2012 Jasny BV + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Extended with pride by @ArnoldDaniels of jasny.net + */ + +// Core variables and mixins +@import "../variables.less"; // Modify this for custom colors, font-sizes, etc +@import "../mixins.less"; diff --git a/less/jasny/responsive.less b/less/jasny/responsive.less new file mode 100644 index 00000000..0f3404c4 --- /dev/null +++ b/less/jasny/responsive.less @@ -0,0 +1,13 @@ +/*! + * Jasny Bootstrap Responsive Extensions j1 + * + * Copyright 2012 Jasny BV + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Extended with pride by @ArnoldDaniels of jasny.net + */ + +// Core variables and mixins +@import "../variables.less"; // Modify this for custom colors, font-sizes, etc +@import "../mixins.less";