grim/resticide

Various tweaks
develop
2016-07-06, Gary Kramlich
489053430a0f
Parents d005c43d22ce
Children 8a2bdd19461f
Various tweaks
--- a/Makefile Wed Jul 06 13:56:17 2016 -0500
+++ b/Makefile Wed Jul 06 14:25:43 2016 -0500
@@ -5,33 +5,23 @@
BUILT_SOURCES = \
loader/assets.go
-.PHONY: all deps clean check godep go-bindata
+.PHONY: all deps clean check go-bindata
all: check
-deps: Godeps/Godeps.json
- touch $<
-
-godep: $(GOPATH)/bin/godep
-
-$(GOPATH)/bin/godep:
- go get github.com/tools/godep
- touch $@
-
-Godeps/Godeps.json: godep
- godep restore
- touch $@
+deps:
+ go get ./...
go-bindata: $(GOPATH)/bin/go-bindata
-$(GOPATH)/bin/go-bindata: godep
+$(GOPATH)/bin/go-bindata:
go get github.com/jteeuwen/go-bindata/...
touch $@
loader/assets.go: loader/schema.json | go-bindata
$(GOPATH)/bin/go-bindata -o $@ -pkg loader -prefix loader/ $^
-$(TARGET): *.go $(BUILT_SOURCES)
+$(TARGET): deps *.go $(BUILT_SOURCES)
go build -o $@
clean:
--- a/loader/loader.go Wed Jul 06 13:56:17 2016 -0500
+++ b/loader/loader.go Wed Jul 06 14:25:43 2016 -0500
@@ -8,7 +8,7 @@
"path/filepath"
"strings"
- "github.com/xeipuuv/gojsonschema"
+ "gopkg.in/xeipuuv/gojsonschema.v0"
"bitbucket.org/rw_grim/resticide/reporter"
"bitbucket.org/rw_grim/resticide/test"
--- a/test/request.go Wed Jul 06 13:56:17 2016 -0500
+++ b/test/request.go Wed Jul 06 14:25:43 2016 -0500
@@ -15,7 +15,7 @@
"os"
"path/filepath"
- "github.com/xeipuuv/gojsonschema"
+ "gopkg.in/xeipuuv/gojsonschema.v0"
)
type Request struct {