use built-in vendor support instead of godeps
parent
f66b15127d
commit
24d4aa4c11
10
Makefile
10
Makefile
|
@ -9,7 +9,7 @@ export PATH := $(GOPATH)/bin:$(PATH)
|
||||||
|
|
||||||
GOLDFLAGS=-ldflags '-r $${ORIGIN}/lib'
|
GOLDFLAGS=-ldflags '-r $${ORIGIN}/lib'
|
||||||
|
|
||||||
GO=godep go
|
GO:=$(if $(shell go version |grep 'go1.5'),GO15VENDOREXPERIMENT=1,) go
|
||||||
|
|
||||||
BUILD_DATE=$(shell date +%Y%m%d)
|
BUILD_DATE=$(shell date +%Y%m%d)
|
||||||
BUILD_REV=$(shell git rev-parse --short HEAD)
|
BUILD_REV=$(shell git rev-parse --short HEAD)
|
||||||
|
@ -36,11 +36,11 @@ clean:
|
||||||
|
|
||||||
test: imposm3 system-test-files
|
test: imposm3 system-test-files
|
||||||
$(GO) test ./... -i
|
$(GO) test ./... -i
|
||||||
$(GO) test ./...
|
$(GO) test `$(GO) list ./... | grep -Ev '/vendor'`
|
||||||
|
|
||||||
test-unit: imposm3
|
test-unit: imposm3
|
||||||
$(GO) test ./... -i
|
$(GO) test ./... -i
|
||||||
$(GO) test `$(GO) list ./... | grep -v 'imposm3/test'`
|
$(GO) test `$(GO) list ./... | grep -Ev '/test|/vendor'`
|
||||||
|
|
||||||
test-system: imposm3
|
test-system: imposm3
|
||||||
(cd test && make test)
|
(cd test && make test)
|
||||||
|
@ -63,8 +63,8 @@ upload-docs: docs
|
||||||
|
|
||||||
build-license-deps:
|
build-license-deps:
|
||||||
rm LICENSE.deps
|
rm LICENSE.deps
|
||||||
find ./Godeps/_workspace/src -iname license\* -exec bash -c '\
|
find ./vendor -iname license\* -exec bash -c '\
|
||||||
dep=$${1#./Godeps/_workspace/src/}; \
|
dep=$${1#./vendor/}; \
|
||||||
(echo -e "========== $$dep ==========\n"; cat $$1; echo -e "\n\n") \
|
(echo -e "========== $$dep ==========\n"; cat $$1; echo -e "\n\n") \
|
||||||
| fold -s -w 80 \
|
| fold -s -w 80 \
|
||||||
>> LICENSE.deps \
|
>> LICENSE.deps \
|
||||||
|
|
31
README.md
31
README.md
|
@ -112,7 +112,7 @@ There are some dependencies:
|
||||||
|
|
||||||
#### Compiler
|
#### Compiler
|
||||||
|
|
||||||
You need [Go >=1.1](http://golang.org).
|
You need [Go >=1.5](http://golang.org).
|
||||||
|
|
||||||
#### C/C++ libraries
|
#### C/C++ libraries
|
||||||
|
|
||||||
|
@ -129,35 +129,28 @@ For best performance use [HyperLevelDB][libhyperleveldb] as an in-place replacem
|
||||||
|
|
||||||
#### Go libraries
|
#### Go libraries
|
||||||
|
|
||||||
Imposm3 uses the following libraries.
|
Imposm3 uses the following Go libraries.
|
||||||
|
|
||||||
- <https://github.com/jmhodges/levigo>
|
- <https://github.com/jmhodges/levigo>
|
||||||
- <https://github.com/golang/protobuf/proto>
|
- <https://github.com/golang/protobuf/proto>
|
||||||
- <https://github.com/golang/protobuf/protoc-gen-go>
|
|
||||||
- <https://github.com/lib/pq>
|
- <https://github.com/lib/pq>
|
||||||
|
- <https://gopkg.in/yaml.v2>
|
||||||
|
|
||||||
`go get` will fetch these, but you can also use [godep][] to use a provided (vendorized) set of these dependencies.
|
These libraries are already vendorized (i.e. the source code is included in the Imposm repository).
|
||||||
|
|
||||||
[godep]: https://github.com/tools/godep
|
|
||||||
|
|
||||||
|
|
||||||
#### Other
|
|
||||||
|
|
||||||
Fetching Imposm and the Go libraries requires [mercurial][] and [git][].
|
|
||||||
|
|
||||||
[mercurial]: http://mercurial.selenic.com/
|
|
||||||
[git]: http://git-scm.com/
|
|
||||||
|
|
||||||
|
|
||||||
#### Compile
|
#### Compile
|
||||||
|
|
||||||
Create a new [Go workspace](http://golang.org/doc/code.html):
|
Create a [Go workspace](http://golang.org/doc/code.html) by creating the `GOPATH` directory for all your Go code, if you don't have one already:
|
||||||
|
|
||||||
mkdir imposm
|
mkdir -p go
|
||||||
cd imposm
|
cd go
|
||||||
export GOPATH=`pwd`
|
export GOPATH=`pwd`
|
||||||
|
|
||||||
Get Imposm 3 and all dependencies:
|
Then you need to enable GO15VENDOREXPERIMENT, if you are using Go 1.5. You can skip this if you are using 1.6 or higher:
|
||||||
|
|
||||||
|
export GO15VENDOREXPERIMENT=1
|
||||||
|
|
||||||
|
Get the code and install Imposm 3:
|
||||||
|
|
||||||
go get github.com/omniscale/imposm3
|
go get github.com/omniscale/imposm3
|
||||||
go install github.com/omniscale/imposm3
|
go install github.com/omniscale/imposm3
|
||||||
|
|
Loading…
Reference in New Issue