Commit 38919a35 authored by JC Brand's avatar JC Brand

Remove traces of bourbon from Makefile and use tabs

parent 3f0d88e8
# You can set these variables from the command line. # You can set these variables from the command line.
BABEL ?= node_modules/.bin/babel BABEL ?= node_modules/.bin/babel
BOOTSTRAP = ./node_modules/ BOOTSTRAP = ./node_modules/
BOURBON = ./node_modules/bourbon/app/assets/stylesheets/
BUILDDIR = ./docs BUILDDIR = ./docs
CHROMIUM ?= ./node_modules/.bin/run-headless-chromium CHROMIUM ?= ./node_modules/.bin/run-headless-chromium
CLEANCSS ?= ./node_modules/clean-css-cli/bin/cleancss --skip-rebase CLEANCSS ?= ./node_modules/clean-css-cli/bin/cleancss --skip-rebase
ESLINT ?= ./node_modules/.bin/eslint ESLINT ?= ./node_modules/.bin/eslint
HTTPSERVE ?= ./node_modules/.bin/http-server HTTPSERVE ?= ./node_modules/.bin/http-server
HTTPSERVE_PORT ?= 8000 HTTPSERVE_PORT ?= 8000
INKSCAPE ?= inkscape INKSCAPE ?= inkscape
INSTALL ?= install INSTALL ?= install
JSDOC ?= ./node_modules/.bin/jsdoc JSDOC ?= ./node_modules/.bin/jsdoc
LERNA ?= ./node_modules/.bin/lerna LERNA ?= ./node_modules/.bin/lerna
OXIPNG ?= oxipng OXIPNG ?= oxipng
PAPER = PAPER =
RJS ?= ./node_modules/.bin/r.js RJS ?= ./node_modules/.bin/r.js
NPX ?= ./node_modules/.bin/npx NPX ?= ./node_modules/.bin/npx
SASS ?= ./node_modules/.bin/node-sass SASS ?= ./node_modules/.bin/node-sass
SED ?= sed SED ?= sed
SPHINXBUILD ?= ./bin/sphinx-build SPHINXBUILD ?= ./bin/sphinx-build
SPHINXOPTS = SPHINXOPTS =
UGLIFYJS ?= node_modules/.bin/uglifyjs UGLIFYJS ?= node_modules/.bin/uglifyjs
XGETTEXT = xgettext XGETTEXT = xgettext
# Internal variables. # Internal variables.
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
VERSION_FORMAT = [0-9]+\.[0-9]+\.[0-9]+ VERSION_FORMAT = [0-9]+\.[0-9]+\.[0-9]+
.PHONY: all .PHONY: all
...@@ -35,21 +34,21 @@ all: dev dist ...@@ -35,21 +34,21 @@ all: dev dist
help: help:
@echo "Please use \`make <target>' where <target> is one of the following:" @echo "Please use \`make <target>' where <target> is one of the following:"
@echo "" @echo ""
@echo " all Set up dev environment and create all builds" @echo " all Set up dev environment and create all builds"
@echo " build Create minified builds of converse.js and all its dependencies." @echo " build Create minified builds of converse.js and all its dependencies."
@echo " clean Remove all NPM packages." @echo " clean Remove all NPM packages."
@echo " check Run all tests." @echo " check Run all tests."
@echo " css Generate CSS from the Sass files." @echo " css Generate CSS from the Sass files."
@echo " dev Set up the development environment. To force a fresh start, run 'make clean' first." @echo " dev Set up the development environment. To force a fresh start, run 'make clean' first."
@echo " html Make standalone HTML files of the documentation." @echo " html Make standalone HTML files of the documentation."
@echo " po Generate gettext PO files for each i18n language." @echo " po Generate gettext PO files for each i18n language."
@echo " pot Generate a gettext POT file to be used for translations." @echo " pot Generate a gettext POT file to be used for translations."
@echo " release Prepare a new release of converse.js. E.g. make release VERSION=0.9.5" @echo " release Prepare a new release of converse.js. E.g. make release VERSION=0.9.5"
@echo " serve Serve this directory via a webserver on port 8000." @echo " serve Serve this directory via a webserver on port 8000."
@echo " serve_bg Same as \"serve\", but do it in the background" @echo " serve_bg Same as \"serve\", but do it in the background"
@echo " stamp-npm Install NPM dependencies" @echo " stamp-npm Install NPM dependencies"
@echo " watch Watch for changes on JS and scss files and automatically update the generated files." @echo " watch Watch for changes on JS and scss files and automatically update the generated files."
@echo " logo Generate PNG logos of multiple sizes." @echo " logo Generate PNG logos of multiple sizes."
######################################################################## ########################################################################
...@@ -129,7 +128,7 @@ dev: stamp-npm ...@@ -129,7 +128,7 @@ dev: stamp-npm
css: sass/*.scss dist/website.css dist/website.min.css css: sass/*.scss dist/website.css dist/website.min.css
dist/website.css:: stamp-npm sass dist/website.css:: stamp-npm sass
$(SASS) --source-map true --include-path $(BOURBON) --include-path $(BOOTSTRAP) sass/website.scss $@ $(SASS) --source-map true --include-path $(BOOTSTRAP) sass/website.scss $@
dist/website.min.css:: stamp-npm dist/website.css dist/website.min.css:: stamp-npm dist/website.css
$(CLEANCSS) dist/website.css > $@ $(CLEANCSS) dist/website.css > $@
...@@ -140,15 +139,15 @@ watch: stamp-npm ...@@ -140,15 +139,15 @@ watch: stamp-npm
.PHONY: logo .PHONY: logo
logo: logo/conversejs-transparent16.png \ logo: logo/conversejs-transparent16.png \
logo/conversejs-transparent19.png \ logo/conversejs-transparent19.png \
logo/conversejs-transparent48.png \ logo/conversejs-transparent48.png \
logo/conversejs-transparent128.png \ logo/conversejs-transparent128.png \
logo/conversejs-transparent512.png \ logo/conversejs-transparent512.png \
logo/conversejs-filled16.png \ logo/conversejs-filled16.png \
logo/conversejs-filled19.png \ logo/conversejs-filled19.png \
logo/conversejs-filled48.png \ logo/conversejs-filled48.png \
logo/conversejs-filled128.png \ logo/conversejs-filled128.png \
logo/conversejs-filled512.png \ logo/conversejs-filled512.png \
logo/conversejs-transparent%.png:: logo/conversejs-transparent.svg logo/conversejs-transparent%.png:: logo/conversejs-transparent.svg
$(INKSCAPE) -e $@ -w $* $< $(INKSCAPE) -e $@ -w $* $<
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment