From afb1411608526338d594918328c17f3cbceace24 Mon Sep 17 00:00:00 2001
From: Olivier Gambier <olivier@docker.com>
Date: Tue, 3 Nov 2015 21:28:40 -0800
Subject: [PATCH] Make updates

Added and documented two simple helpers to ease managing deps.
Removed now obsolete references to `grep -v Godeps`

Signed-off-by: Olivier Gambier <olivier@docker.com>
---
 CONTRIBUTING.md | 5 +++++
 mk/dev.mk       | 9 +++++++++
 mk/main.mk      | 6 +++++-
 mk/validate.mk  | 4 ++--
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 mk/dev.mk

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b48b21d5a0..40fcc2ab06 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -145,6 +145,11 @@ Scrub build results:
     make lint
     make dco
 
+### Save and restore dependencies
+
+    make dep-save
+    make dep-restore
+
 ## Integration Tests
 
 ### Setup
diff --git a/mk/dev.mk b/mk/dev.mk
new file mode 100644
index 0000000000..6b2940816d
--- /dev/null
+++ b/mk/dev.mk
@@ -0,0 +1,9 @@
+dep-save:
+	$(if $(GODEP), , \
+		$(error Please install godep: go get github.com/tools/godep))
+	godep save $(shell go list ./... | grep -v vendor/)
+
+dep-restore:
+	$(if $(GODEP), , \
+		$(error Please install godep: go get github.com/tools/godep))
+	godep restore $(shell go list ./... | grep -v vendor/)
diff --git a/mk/main.mk b/mk/main.mk
index abf54c7e13..9c690b9cd1 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -3,7 +3,7 @@ GO_LDFLAGS := -X `go list ./version`.GitCommit=`git rev-parse --short HEAD 2>/de
 GO_GCFLAGS :=
 
 # Full package list
-PKGS := $(shell go list -tags "$(BUILDTAGS)" ./... | grep -v "/vendor/" | grep -v "/Godeps/" | grep -v "/cmd")
+PKGS := $(shell go list -tags "$(BUILDTAGS)" ./... | grep -v "/vendor/" | grep -v "/cmd")
 
 # Support go1.5 vendoring (let us avoid messing with GOPATH or using godep)
 export GO15VENDOREXPERIMENT = 1
@@ -12,6 +12,9 @@ export GO15VENDOREXPERIMENT = 1
 GOLINT_BIN := $(GOPATH)/bin/golint
 GOLINT := $(shell [ -x $(GOLINT_BIN) ] && echo $(GOLINT_BIN) || echo '')
 
+GODEP_BIN := $(GOPATH)/bin/godep
+GODEP := $(shell [ -x $(GODEP_BIN) ] && echo $(GODEP_BIN) || echo '')
+
 # Honor debug
 ifeq ($(DEBUG),true)
 	# Disable function inlining and variable registerization
@@ -36,6 +39,7 @@ endif
 
 include mk/build.mk
 include mk/coverage.mk
+include mk/dev.mk
 include mk/release.mk
 include mk/test.mk
 include mk/validate.mk
diff --git a/mk/validate.mk b/mk/validate.mk
index be8fdfef01..f906dfcaaf 100644
--- a/mk/validate.mk
+++ b/mk/validate.mk
@@ -10,7 +10,7 @@ dco:
 
 # Fmt
 fmt:
-	@test -z "$$(gofmt -s -l . 2>&1 | grep -v vendor/ | grep -v Godeps/ | tee /dev/stderr)"
+	@test -z "$$(gofmt -s -l . 2>&1 | grep -v vendor/ | tee /dev/stderr)"
 
 # Vet
 vet: build
@@ -20,4 +20,4 @@ vet: build
 lint:
 	$(if $(GOLINT), , \
 		$(error Please install golint: go get -u github.com/golang/lint/golint))
-	@test -z "$$($(GOLINT) ./... 2>&1 | grep -v vendor/ | grep -v Godeps/ | tee /dev/stderr)"
+	@test -z "$$($(GOLINT) ./... 2>&1 | grep -v vendor/ | tee /dev/stderr)"