add basic Makefile, remove need for global grunt-cli

This commit is contained in:
Dan Cech 2016-04-25 12:44:26 -04:00
parent 29a2b2032a
commit 2244224b12
4 changed files with 20 additions and 4 deletions

17
Makefile Normal file
View File

@ -0,0 +1,17 @@
all: deps build
deps:
go run build.go setup
godep restore
npm install
build:
go run build.go build
npm run build
test:
godep go test -v ./pkg/...
npm run test
run:
./bin/grafana-server

View File

@ -103,8 +103,7 @@ npm (v2.5.0) and grunt (v0.4.5). Run the following:
```bash
npm install
npm install -g grunt-cli
grunt
npm run build
```
### Recompile backend on source change
@ -145,4 +144,3 @@ please [sign the CLA](http://docs.grafana.org/project/cla/)
Grafana is distributed under Apache 2.0 License.
Work in progress Grafana 2.0 (with included Grafana backend)

View File

@ -306,7 +306,7 @@ func ChangeWorkingDir(dir string) {
}
func grunt(params ...string) {
runPrint("./node_modules/grunt-cli/bin/grunt", params...)
runPrint("./node_modules/.bin/grunt", params...)
}
func setup() {

View File

@ -62,6 +62,7 @@
"npm": "2.14.x"
},
"scripts": {
"build": "grunt",
"test": "grunt test",
"coveralls": "grunt karma:coveralls && rm -rf ./coverage"
},