Move dependencies into Makefile

This commit is contained in:
Lukas Welte
2019-02-07 17:33:38 +01:00
parent 5b8412765b
commit 3a45b8dd41
3 changed files with 14 additions and 27 deletions

View File

@@ -8,15 +8,6 @@ addons:
paths:
- bin
install:
- go get -u golang.org/x/sys/...
- go get github.com/fsnotify/fsnotify
- go get github.com/gorilla/handlers
- go get github.com/gorilla/mux
- go get github.com/gorilla/websocket
- go get github.com/urfave/cli
- go get github.com/elazarl/go-bindata-assetfs/...
- go get github.com/jteeuwen/go-bindata/...
- go get github.com/mitchellh/gox
- wget https://raw.githubusercontent.com/openmaptiles/klokantech-basic-gl-style/master/style.json
script:
- make

View File

@@ -5,10 +5,21 @@ EDITOR_VERSION ?= v1.5.0
all: $(BINARY)
dependencies:
go get -u golang.org/x/sys/...
go get github.com/gorilla/handlers
go get github.com/gorilla/mux
go get github.com/gorilla/websocket
go get github.com/fsnotify/fsnotify
go get github.com/urfave/cli
go get github.com/elazarl/go-bindata-assetfs/...
go get github.com/jteeuwen/go-bindata/...
go get github.com/mitchellh/gox
$(BINARY): $(SOURCES) bindata_assetfs.go
gox -osarch "windows/amd64 linux/amd64 darwin/amd64" -output "bin/{{.OS}}/${BINARY}"
editor/create_folder:
editor/create_folder: dependencies
mkdir -p editor
editor/pull_release: editor/create_folder

View File

@@ -60,25 +60,10 @@ Clone the repository. Make sure you clone it into the correct directory `$GOPATH
git clone git@github.com:maputnik/desktop.git
```
Install the 3rd party dependencies.
```
go get -u golang.org/x/sys/...
go get github.com/gorilla/handlers
go get github.com/gorilla/mux
go get github.com/gorilla/websocket
go get github.com/fsnotify/fsnotify
go get github.com/urfave/cli
go get github.com/elazarl/go-bindata-assetfs/...
go get github.com/jteeuwen/go-bindata/...
go get github.com/mitchellh/gox
```
Run `make` to build the app distribution bundle and create the `maputnik` binary
embedding the editor.
Run `make` to install the 3rd party dependencies and build the `maputnik` binary embedding the editor.
```
make
```
You should now find the `maputnik` binary in your directory.
You should now find the `maputnik` binary in your `bin` directory.