mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
add basic Makefile, remove need for global grunt-cli
This commit is contained in:
parent
29a2b2032a
commit
2244224b12
17
Makefile
Normal file
17
Makefile
Normal 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
|
@ -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)
|
||||
|
||||
|
2
build.go
2
build.go
@ -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() {
|
||||
|
@ -62,6 +62,7 @@
|
||||
"npm": "2.14.x"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "grunt",
|
||||
"test": "grunt test",
|
||||
"coveralls": "grunt karma:coveralls && rm -rf ./coverage"
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user