From 83f37f2ce795d0862883d47dfe61493c9153267d Mon Sep 17 00:00:00 2001 From: Simon Eisenmann Date: Mon, 22 May 2017 15:05:16 +0200 Subject: [PATCH] Add godeps support via dependencies.tsv --- Makefile | 14 ++++++++------ dependencies.tsv | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 dependencies.tsv diff --git a/Makefile b/Makefile index 03c11f8..10f9d71 100644 --- a/Makefile +++ b/Makefile @@ -20,9 +20,11 @@ dist_gopath: $(DIST_SRC) if [ ! -d "$(SYSTEM_GOPATH)" ]; then find $(CURDIR)/vendor/src -mindepth 1 -maxdepth 1 -type d \ -exec ln -sf {} $(DIST_SRC) \; ; fi -goget: -# if [ -z "$(DEB_BUILDING)" ]; then GOPATH=$(GOPATH) go get github.com/rogpeppe/godeps; fi -# if [ -z "$(DEB_BUILDING)" ]; then GOPATH=$(GOPATH) $(CURDIR)/vendor/bin/godeps -u dependencies.tsv; fi +godeps: + if [ -z "$(DEB_BUILDING)" ]; then GOPATH=$(GOPATH) go get github.com/rogpeppe/godeps; fi + +goget: godeps + if [ -z "$(DEB_BUILDING)" ]; then GOPATH=$(GOPATH) $(CURDIR)/vendor/bin/godeps -u dependencies.tsv; fi mkdir -p $(shell dirname "$(CURDIR)/vendor/src/$(GOPKG)") rm -f $(CURDIR)/vendor/src/$(GOPKG) ln -sf $(PWD) $(CURDIR)/vendor/src/$(GOPKG) @@ -42,11 +44,11 @@ build: goget binary format: find $(FOLDERS) \( -name "*.go" ! -name "bindata.go" \) -print0 | xargs -0 -n 1 go fmt -dependencies.tsv: +dependencies.tsv: godeps set -e ;\ TMP=$$(mktemp -d) ;\ cp -r $(CURDIR)/vendor $$TMP ;\ - GOPATH=$$TMP/vendor:$(CURDIR) $(CURDIR)/vendor/bin/godeps $(GOPKG)/wlan > $(CURDIR)/dependencies.tsv ;\ + GOPATH=$$TMP/vendor:$(CURDIR) $(CURDIR)/vendor/bin/godeps $(GOPKG)/realtimetrafficd > $(CURDIR)/dependencies.tsv ;\ rm -rf $$TMP ;\ -.PHONY: all dist_gopath goget generate generate-dev binary dependencies.tsv +.PHONY: all dist_gopath godeps goget generate generate-dev binary dependencies.tsv diff --git a/dependencies.tsv b/dependencies.tsv new file mode 100644 index 0000000..c4bdd2a --- /dev/null +++ b/dependencies.tsv @@ -0,0 +1,2 @@ +github.com/elazarl/go-bindata-assetfs git 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43 2017-02-27T21:27:28Z +github.com/gorilla/websocket git 119002ce0495aa7a8f388544d740e1bdc8829513 2014-02-18T05:22:10Z