Commit e7670a78 authored by JC Brand's avatar JC Brand

remove bower stuff from makefile

parent 4a37c694
# You can set these variables from the command line. # You can set these variables from the command line.
BOWER ?= node_modules/.bin/bower
BUILDDIR = ./docs BUILDDIR = ./docs
BUNDLE ?= ./.bundle/bin/bundle BUNDLE ?= ./.bundle/bin/bundle
GRUNT ?= ./node_modules/.bin/grunt GRUNT ?= ./node_modules/.bin/grunt
...@@ -35,7 +34,7 @@ help: ...@@ -35,7 +34,7 @@ help:
@echo " all A synonym for 'make dev'." @echo " all A synonym for 'make dev'."
@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 " changes Make an overview of all changed/added/deprecated items added to the documentation." @echo " changes Make an overview of all changed/added/deprecated items added to the documentation."
@echo " clean Remove downloaded the stamp-* guard files as well as all NPM, bower and Ruby packages." @echo " clean Remove downloaded the stamp-* guard files as well as all NPM and Ruby packages."
@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 " epub Export the documentation to epub." @echo " epub Export the documentation to epub."
...@@ -47,7 +46,6 @@ help: ...@@ -47,7 +46,6 @@ help:
@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 " stamp-bower Install bower dependencies and create the guard file stamp-bower which will prevent those dependencies from being installed again."
@echo " stamp-npm Install NPM dependencies and create the guard file stamp-npm which will prevent those dependencies from being installed again." @echo " stamp-npm Install NPM dependencies and create the guard file stamp-npm which will prevent those dependencies from being installed again."
@echo " stamp-bundler Install Bundler (Ruby) dependencies and create the guard file stamp-bundler which will prevent those dependencies from being installed again." @echo " stamp-bundler Install Bundler (Ruby) dependencies and create the guard file stamp-bundler which will prevent those dependencies from being installed again."
@echo " watch Tells Sass to watch the .scss files for changes and then automatically update the CSS files." @echo " watch Tells Sass to watch the .scss files for changes and then automatically update the CSS files."
...@@ -103,10 +101,6 @@ stamp-npm: package.json ...@@ -103,10 +101,6 @@ stamp-npm: package.json
npm install npm install
touch stamp-npm touch stamp-npm
stamp-bower: stamp-npm bower.json
$(BOWER) install
touch stamp-bower
stamp-bundler: Gemfile stamp-bundler: Gemfile
mkdir -p .bundle mkdir -p .bundle
gem install --user bundler --bindir .bundle/bin gem install --user bundler --bindir .bundle/bin
...@@ -115,11 +109,11 @@ stamp-bundler: Gemfile ...@@ -115,11 +109,11 @@ stamp-bundler: Gemfile
.PHONY: clean .PHONY: clean
clean: clean:
-rm -f stamp-npm stamp-bower stamp-bundler -rm -f stamp-npm stamp-bundler
-rm -rf node_modules .bundle -rm -rf node_modules .bundle
.PHONY: dev .PHONY: dev
dev: stamp-bower stamp-bundler dev: stamp-bundler stamp-npm
######################################################################## ########################################################################
## Builds ## Builds
...@@ -127,13 +121,13 @@ dev: stamp-bower stamp-bundler ...@@ -127,13 +121,13 @@ dev: stamp-bower stamp-bundler
.PHONY: css .PHONY: css
css: sass/*.scss css/converse.css css/converse.min.css css/mobile.min.css css/theme.min.css css/converse-muc-embedded.min.css css: sass/*.scss css/converse.css css/converse.min.css css/mobile.min.css css/theme.min.css css/converse-muc-embedded.min.css
css/converse-muc-embedded.css:: stamp-bundler stamp-bower sass css/converse-muc-embedded.css:: stamp-bundler sass
$(SASS) -I ./node_modules/bourbon/app/assets/stylesheets/ sass/_muc_embedded.scss css/converse-muc-embedded.css $(SASS) -I ./node_modules/bourbon/app/assets/stylesheets/ sass/_muc_embedded.scss css/converse-muc-embedded.css
css/converse-muc-embedded.min.css:: stamp-bundler stamp-bower sass css/converse-muc-embedded.css css/converse-muc-embedded.min.css:: stamp-bundler sass css/converse-muc-embedded.css
$(CLEANCSS) css/converse-muc-embedded.css > css/converse-muc-embedded.min.css $(CLEANCSS) css/converse-muc-embedded.css > css/converse-muc-embedded.min.css
css/converse.css:: stamp-bundler stamp-bower sass css/converse.css:: stamp-bundler sass
$(SASS) -I ./node_modules/bourbon/app/assets/stylesheets/ sass/converse.scss css/converse.css $(SASS) -I ./node_modules/bourbon/app/assets/stylesheets/ sass/converse.scss css/converse.css
css/converse.min.css:: stamp-npm css/converse.min.css:: stamp-npm
...@@ -158,21 +152,21 @@ BUILDS = dist/converse.js \ ...@@ -158,21 +152,21 @@ BUILDS = dist/converse.js \
dist/converse-no-dependencies.min.js \ dist/converse-no-dependencies.min.js \
dist/converse-no-dependencies.js dist/converse-no-dependencies.js
dist/converse.min.js: stamp-bower src locale node_modules *.js dist/converse.min.js: src locale node_modules *.js
$(RJS) -o src/build.js $(RJS) -o src/build.js
dist/converse.js: stamp-bower src locale node_modules *.js dist/converse.js: src locale node_modules *.js
$(RJS) -o src/build.js optimize=none out=dist/converse.js $(RJS) -o src/build.js optimize=none out=dist/converse.js
dist/converse.nojquery.min.js: stamp-bower src locale node_modules *.js dist/converse.nojquery.min.js: src locale node_modules *.js
$(RJS) -o src/build-no-jquery.js $(RJS) -o src/build-no-jquery.js
dist/converse.nojquery.js: stamp-bower src locale node_modules *.js dist/converse.nojquery.js: src locale node_modules *.js
$(RJS) -o src/build-no-jquery.js optimize=none out=dist/converse.nojquery.js $(RJS) -o src/build-no-jquery.js optimize=none out=dist/converse.nojquery.js
dist/converse-no-dependencies.min.js: stamp-bower src locale node_modules *.js dist/converse-no-dependencies.min.js: src locale node_modules *.js
$(RJS) -o src/build-no-dependencies.js $(RJS) -o src/build-no-dependencies.js
dist/converse-no-dependencies.js: stamp-bower src locale node_modules *.js dist/converse-no-dependencies.js: src locale node_modules *.js
$(RJS) -o src/build-no-dependencies.js optimize=none out=dist/converse-no-dependencies.js $(RJS) -o src/build-no-dependencies.js optimize=none out=dist/converse-no-dependencies.js
dist/converse-mobile.min.js: stamp-bower src locale node_modules *.js dist/converse-mobile.min.js: src locale node_modules *.js
$(RJS) -o src/build-mobile.js $(RJS) -o src/build-mobile.js
dist/converse-mobile.js: stamp-bower src locale node_modules *.js dist/converse-mobile.js: src locale node_modules *.js
$(RJS) -o src/build-mobile.js optimize=none out=dist/converse-mobile.js $(RJS) -o src/build-mobile.js optimize=none out=dist/converse-mobile.js
.PHONY: jsmin .PHONY: jsmin
...@@ -182,7 +176,7 @@ jsmin: $(BUILDS) ...@@ -182,7 +176,7 @@ jsmin: $(BUILDS)
dist:: build dist:: build
.PHONY: build .PHONY: build
build:: stamp-bundler stamp-bower css build:: stamp-bundler css
$(GRUNT) json $(GRUNT) json
make jsmin make jsmin
...@@ -190,7 +184,7 @@ build:: stamp-bundler stamp-bower css ...@@ -190,7 +184,7 @@ build:: stamp-bundler stamp-bower css
## Tests ## Tests
.PHONY: jshint .PHONY: jshint
jshint: stamp-bower jshint: stamp-npm
$(JSHINT) --config jshintrc $(CHECKSOURCES) $(JSHINT) --config jshintrc $(CHECKSOURCES)
.PHONY: eslint .PHONY: eslint
...@@ -199,7 +193,7 @@ eslint: stamp-npm ...@@ -199,7 +193,7 @@ eslint: stamp-npm
$(ESLINT) spec/ $(ESLINT) spec/
.PHONY: check .PHONY: check
check: stamp-bower jshint eslint check: jshint eslint
$(PHANTOMJS) node_modules/phantom-jasmine/lib/run_jasmine_test.coffee tests.html $(PHANTOMJS) node_modules/phantom-jasmine/lib/run_jasmine_test.coffee tests.html
######################################################################## ########################################################################
......
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