Merge pull request #247 from ernado/go-modules

Use go modules

.travis.yml

@@ -2,8 +2,11 @@ language: go
 
 go:
   - tip
+  - stable
+
+matrix:
+  allow_failures:
+    - go: tip
+
 install:
-  - go get github.com/ugorji/go/codec
-  - go get github.com/pquerna/ffjson/fflib/v1
-  - go get github.com/json-iterator/go
   - go get golang.org/x/lint/golint

Makefile

@@ -1,64 +1,52 @@
-PKG=github.com/mailru/easyjson
-GOPATH:=$(PWD)/.root:$(GOPATH)
-export GOPATH
-
 all: test
 
-.root/src/$(PKG):
-	mkdir -p $@
-	for i in $$PWD/* ; do ln -s $$i $@/`basename $$i` ; done
-
-root: .root/src/$(PKG)
-
 clean:
-	rm -rf .root
+	rm -rf bin
 	rm -rf tests/*_easyjson.go
+	rm -rf benchmark/*_easyjson.go
 
 build:
-	go build -i -o .root/bin/easyjson $(PKG)/easyjson
-
-generate: root build
-	.root/bin/easyjson -stubs \
-		.root/src/$(PKG)/tests/snake.go \
-		.root/src/$(PKG)/tests/data.go \
-		.root/src/$(PKG)/tests/omitempty.go \
-		.root/src/$(PKG)/tests/nothing.go \
-		.root/src/$(PKG)/tests/named_type.go \
-		.root/src/$(PKG)/tests/custom_map_key_type.go \
-		.root/src/$(PKG)/tests/embedded_type.go \
-		.root/src/$(PKG)/tests/reference_to_pointer.go \
-
-	.root/bin/easyjson -all .root/src/$(PKG)/tests/data.go
-	.root/bin/easyjson -all .root/src/$(PKG)/tests/nothing.go
-	.root/bin/easyjson -all .root/src/$(PKG)/tests/errors.go
-	.root/bin/easyjson -snake_case .root/src/$(PKG)/tests/snake.go
-	.root/bin/easyjson -omit_empty .root/src/$(PKG)/tests/omitempty.go
-	.root/bin/easyjson -build_tags=use_easyjson .root/src/$(PKG)/benchmark/data.go
-	.root/bin/easyjson .root/src/$(PKG)/tests/nested_easy.go
-	.root/bin/easyjson .root/src/$(PKG)/tests/named_type.go
-	.root/bin/easyjson .root/src/$(PKG)/tests/custom_map_key_type.go
-	.root/bin/easyjson .root/src/$(PKG)/tests/embedded_type.go
-	.root/bin/easyjson .root/src/$(PKG)/tests/reference_to_pointer.go
-	.root/bin/easyjson .root/src/$(PKG)/tests/key_marshaler_map.go
-	.root/bin/easyjson -disallow_unknown_fields .root/src/$(PKG)/tests/disallow_unknown.go
-
-test: generate root
+	go build -i -o ./bin/easyjson ./easyjson
+
+generate: build
+	bin/easyjson -stubs \
+		./tests/snake.go \
+		./tests/data.go \
+		./tests/omitempty.go \
+		./tests/nothing.go \
+		./tests/named_type.go \
+		./tests/custom_map_key_type.go \
+		./tests/embedded_type.go \
+		./tests/reference_to_pointer.go \
+
+	bin/easyjson -all ./tests/data.go
+	bin/easyjson -all ./tests/nothing.go
+	bin/easyjson -all ./tests/errors.go
+	bin/easyjson -snake_case ./tests/snake.go
+	bin/easyjson -omit_empty ./tests/omitempty.go
+	bin/easyjson -build_tags=use_easyjson ./benchmark/data.go
+	bin/easyjson ./tests/nested_easy.go
+	bin/easyjson ./tests/named_type.go
+	bin/easyjson ./tests/custom_map_key_type.go
+	bin/easyjson ./tests/embedded_type.go
+	bin/easyjson ./tests/reference_to_pointer.go
+	bin/easyjson ./tests/key_marshaler_map.go
+	bin/easyjson -disallow_unknown_fields ./tests/disallow_unknown.go
+
+test: generate
 	go test \
-		$(PKG)/tests \
-		$(PKG)/jlexer \
-		$(PKG)/gen \
-		$(PKG)/buffer
-	go test -benchmem -tags use_easyjson -bench . $(PKG)/benchmark
-	golint -set_exit_status .root/src/$(PKG)/tests/*_easyjson.go
+		./tests \
+		./jlexer \
+		./gen \
+		./buffer
+	cd benchmark && go test -benchmem -tags use_easyjson -bench .
+	golint -set_exit_status ./tests/*_easyjson.go
 
-bench-other: generate root
-	@go test -benchmem -bench . $(PKG)/benchmark
-	@go test -benchmem -tags use_ffjson -bench . $(PKG)/benchmark
-	@go test -benchmem -tags use_jsoniter -bench . $(PKG)/benchmark
-	@go test -benchmem -tags use_codec -bench . $(PKG)/benchmark
+bench-other: generate
+	cd benchmark && make
 
 bench-python:
 	benchmark/ujson.sh
 
 
-.PHONY: root clean generate test build
+.PHONY: clean generate test build

benchmark/Makefile

@@ -0,0 +1,5 @@
+all:
+	go test -benchmem -bench .
+	go test -benchmem -tags use_ffjson -bench .
+	go test -benchmem -tags use_jsoniter -bench .
+	go test -benchmem -tags use_codec -bench .