mirror of
https://github.com/maputnik/editor.git
synced 2026-03-06 18:30:02 +00:00
Merge pull request #3 from maputnik/update-release-to-v1.5.0
Update release to v1.5.0
This commit is contained in:
pathmapper
GitHub
2
.gitignore
vendored
2
.gitignore
vendored
@@ -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
|
||||
|
||||
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -1,4 +0,0 @@
|
||||
[submodule "editor"]
|
||||
path = editor
|
||||
url = https://github.com/maputnik/editor.git
|
||||
branch = master
|
||||
22
.travis.yml
22
.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
|
||||
- ./maputnik --version
|
||||
- ./maputnik --watch --file style.json & sleep 5; kill $!
|
||||
- ./bin/linux/maputnik --help
|
||||
- ./bin/linux/maputnik --version
|
||||
- ./bin/linux/maputnik --watch --file style.json & sleep 5; kill $!
|
||||
|
||||
26
Makefile
26
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:
|
||||
cd editor && npm install
|
||||
editor/create_folder: dependencies
|
||||
mkdir -p editor
|
||||
|
||||
editor/public: editor/node_modules
|
||||
cd editor && npm run build
|
||||
editor/pull_release: editor/create_folder
|
||||
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
|
||||
|
||||
29
README.md
29
README.md
@@ -1,8 +1,4 @@
|
||||
# Maputnik Desktop [](https://travis-ci.org/maputnik/desktop) [](https://ci.appveyor.com/project/lukasmartinelli/desktop)
|
||||
|
||||
> :warning: The desktop build of Maputnik is no longer maintained.
|
||||
|
||||
|
||||
# Maputnik Desktop [](https://travis-ci.org/maputnik/desktop)
|
||||
|
||||
---
|
||||
|
||||
@@ -54,31 +50,16 @@ maputnik --watch --file basic-v9.json
|
||||
|
||||
### Build
|
||||
|
||||
Clone the repository **recursively** since the Maputnik editor is embedded
|
||||
as submodule. Make sure you clone it into the correct directory `$GOPATH/src/github.com/maputnik`.
|
||||
Clone the repository. 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.
|
||||
|
||||
```
|
||||
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.
|
||||
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.
|
||||
|
||||
42
appveyor.yml
42
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
|
||||
1
editor
1
editor
Submodule editor deleted from 5c286f8d96
@@ -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{
|
||||
|
||||
Reference in New Issue
Block a user