From cfbd7b35d375942f7b7a39480123ea43d60c95d0 Mon Sep 17 00:00:00 2001
From: Chris Bednarski <banzaimonkey@gmail.com>
Date: Tue, 23 Feb 2016 23:05:37 -0800
Subject: [PATCH] If go version is 1.4 use godeps to restore dependencies

---
 .travis.yml |  3 +++
 Makefile    | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec61a599d..7da0b4d22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ go:
   - 1.4.3
   - 1.6
 
+install:
+  - make deps
+
 script:
   - GOMAXPROCS=2 make ci
 
diff --git a/Makefile b/Makefile
index 856087caa..2f16de211 100644
--- a/Makefile
+++ b/Makefile
@@ -12,14 +12,14 @@ release: deps test releasebin package
 
 bin: deps
 	@echo "WARN: 'make bin' is for debug / test builds only. Use 'make release' for release builds."
-	@sh -c "$(CURDIR)/scripts/build.sh"
+	@GO15VENDOREXPERIMENT=1 sh -c "$(CURDIR)/scripts/build.sh"
 
 releasebin: deps
 	@grep 'const VersionPrerelease = "dev"' version.go > /dev/null ; if [ $$? -eq 0 ]; then \
 		echo "ERROR: You must remove prerelease tags from version.go prior to release."; \
 		exit 1; \
 	fi
-	@sh -c "$(CURDIR)/scripts/build.sh"
+	@GO15VENDOREXPERIMENT=1 sh -c "$(CURDIR)/scripts/build.sh"
 
 package:
 	$(if $(VERSION),,@echo 'VERSION= needed to release; Use make package skip compilation'; exit 1)
@@ -29,13 +29,18 @@ deps:
 	go get github.com/mitchellh/gox
 	go get golang.org/x/tools/cmd/stringer
 	go get golang.org/x/tools/cmd/vet
+	@go version | grep 1.4 ; if [ $$? -eq 0 ]; then \
+		echo "Installing godep and restoring dependencies"; \
+		go get github.com/tools/godep; \
+		godep restore; \
+	fi
 
 dev: deps
 	@grep 'const VersionPrerelease = ""' version.go > /dev/null ; if [ $$? -eq 0 ]; then \
 		echo "ERROR: You must add prerelease tags to version.go prior to making a dev build."; \
 		exit 1; \
 	fi
-	@PACKER_DEV=1 sh -c "$(CURDIR)/scripts/build.sh"
+	@PACKER_DEV=1 GO15VENDOREXPERIMENT=1 sh -c "$(CURDIR)/scripts/build.sh"
 
 fmt:
 	go fmt `go list ./... | grep -v vendor`