Merge pull request #3 from maputnik/update-release-to-v1.5.0

Update release to v1.5.0

.gitignore

@@ -6,6 +6,7 @@
 # Folders
 _obj
 _test
+editor
 
 # Architecture specific extensions/prefixes
 *.[568vq]
@@ -25,6 +26,7 @@ _testmain.go
 
 # Bindata
 bindata_assetfs.go
+bindata.go
 
 # Built binary
 maputnik

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "editor"]
-    path = editor
-    url =  https://github.com/maputnik/editor.git
-	branch = master

.travis.yml

@@ -1,28 +1,16 @@
 os:
 - linux
-- osx
 language: go
 go:
-- 1.7.x
+- 1.11.x
 addons:
   artifacts:
     paths:
-    - maputnik
+    - bin
 install:
-- nvm install 6
-- nvm use 6
-- 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/...
 - wget https://raw.githubusercontent.com/openmaptiles/klokantech-basic-gl-style/master/style.json
 script:
-- mkdir -p editor/public
 - make
-- ./maputnik --help
+- ./bin/linux/maputnik --help
-- ./maputnik --version
+- ./bin/linux/maputnik --version
-- ./maputnik --watch --file style.json & sleep 5; kill $!
+- ./bin/linux/maputnik --watch --file style.json & sleep 5; kill $!

Makefile

@@ -1,21 +1,33 @@
 SOURCEDIR=.
 SOURCES := $(shell find $(SOURCEDIR) -name '*.go')
 BINARY=maputnik
+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
-	go build -o ${BINARY}
+	gox -osarch "windows/amd64 linux/amd64 darwin/amd64" -output "bin/{{.OS}}/${BINARY}"
 
-editor/node_modules:
+editor/create_folder: dependencies
-	cd editor && npm install
+	mkdir -p editor
 
-editor/public: editor/node_modules
+editor/pull_release: editor/create_folder
-	cd editor && npm run build
+	cd editor && rm -rf public && curl -L https://github.com/maputnik/editor/releases/download/$(EDITOR_VERSION)/public.zip --output public.zip && unzip public.zip && rm public.zip
 
-bindata_assetfs.go: editor/public
+bindata_assetfs.go: editor/pull_release
 	go-bindata-assetfs --prefix "editor/" editor/public/...
 
 .PHONY: clean
 clean:
-	rm -rf editor/public && rm -f bindata_assetfs.go && rm -f maputnik
+	rm -rf editor/public && rm -f bindata.go && rm -f bindata_assetfs.go && rm -rf bin

README.md

@@ -1,8 +1,4 @@
-# Maputnik Desktop [![Build Status](https://travis-ci.org/maputnik/desktop.svg?branch=master)](https://travis-ci.org/maputnik/desktop) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/sepe9jhfs123dwk9?svg=true)](https://ci.appveyor.com/project/lukasmartinelli/desktop)
+# Maputnik Desktop [![Build Status](https://travis-ci.org/maputnik/desktop.svg?branch=master)](https://travis-ci.org/maputnik/desktop)
-
-> :warning: The desktop build of Maputnik is no longer maintained.
-
-![](https://camo.githubusercontent.com/ea32c1383049053bd0ceba2b31834841f229bf64/68747470733a2f2f63312e737461746963666c69636b722e636f6d2f352f343339362f33363730343333373739315f343236383236313038395f6e2e6a7067)
 
 ---
 
@@ -54,31 +50,16 @@ maputnik --watch --file basic-v9.json
 
 ### Build
 
-Clone the repository **recursively** since the Maputnik editor is embedded
+Clone the repository. Make sure you clone it into the correct directory `$GOPATH/src/github.com/maputnik`.
-as submodule. Make sure you clone it into the correct directory `$GOPATH/src/github.com/maputnik`.
 
 ```
-git clone --recursive git@github.com:maputnik/desktop.git
+git clone git@github.com:maputnik/desktop.git
 ```
 
-Install the 3rd party dependencies.
+Run `make` to install the 3rd party dependencies and build the `maputnik` binary embedding the editor.
-
-```
-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/...
-```
-
-Run `make` to build the app distribution bundle and create 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.

appveyor.yml

@@ -1,42 +0,0 @@
-# version format
-version: "{build}"
-
-# Operating system (build VM template)
-os: Windows Server 2012 R2
-
-clone_folder: c:\gopath\src\github.com\maputnik\desktop
-
-# environment variables
-environment:
-  GOPATH: c:\gopath
-  GO15VENDOREXPERIMENT: 1
-
-# scripts that run after cloning repository
-install:
-- git submodule update --init --recursive
-- set PATH=%GOPATH%\bin;c:\go\bin;%PATH%
-- go version
-- go env
-- 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/...
-
-# to run your custom scripts instead of automatic MSBuild
-build_script:
-- go vet ./...
-- gofmt -s -l .
-- C:\MinGW\bin\mingw32-make.exe
-
-artifacts:
-- path: maputnik
-
-# to disable automatic tests
-test: off
-
-# to disable deployment
-deploy: off

maputnik.go

@@ -16,7 +16,7 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "maputnik"
 	app.Usage = "Server for integrating Maputnik locally"
-	app.Version = "1.0.2"
+	app.Version = "Editor: 1.5.0; Desktop: 1.0.3"
 
 	app.Flags = []cli.Flag{
 		cli.StringFlag{