From ff48515e2ca59fd2a759d9d6597a5f91faf73eae Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Sat, 11 Jun 2016 21:35:36 -0400
Subject: [PATCH] upup: build tar distribution file

Enables us to do integration tests
---
 upup/Makefile | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/upup/Makefile b/upup/Makefile
index 432512d50d..37167c4d83 100644
--- a/upup/Makefile
+++ b/upup/Makefile
@@ -15,24 +15,36 @@ gofmt:
 	gofmt -w -s cmd/
 	gofmt -w -s pkg/
 
+upup-tar: gocode
+	rm -rf .build/upup/tar
+	mkdir -p .build/upup/tar/upup/
+	cp ${GOPATH}/bin/cloudup .build/upup/tar/upup/cloudup
+	cp ${GOPATH}/bin/upup .build/upup/tar/upup/upup
+	cp -r models/ .build/upup/tar/upup/models/
+	tar czvf .build/upup.tar.gz -C .build/upup/tar/ .
+	tar tvf .build/upup.tar.gz
+	(sha1sum .build/upup.tar.gz | cut -d' ' -f1) > .build/upup.tar.gz.sha1
 
-tar: gocode
-	rm -rf .build/tar
-	mkdir -p .build/tar/nodeup/root
-	cp ${GOPATH}/bin/nodeup .build/tar/nodeup/root
-	cp -r models/nodeup/ .build/tar/nodeup/root/model/
-	tar czvf .build/nodeup.tar.gz -C .build/tar/ .
+nodeup-tar: gocode
+	rm -rf .build/nodeup/tar
+	mkdir -p .build/nodeup/tar/nodeup/root
+	cp ${GOPATH}/bin/nodeup .build/nodeup/tar/nodeup/root
+	cp -r models/nodeup/ .build/nodeup/tar/nodeup/root/model/
+	tar czvf .build/nodeup.tar.gz -C .build/nodeup/tar/ .
 	tar tvf .build/nodeup.tar.gz
 	(sha1sum .build/nodeup.tar.gz | cut -d' ' -f1) > .build/nodeup.tar.gz.sha1 
 
-upload: tar
+upload: nodeup-tar upup-tar
 	rm -rf .build/s3
 	mkdir -p .build/s3/nodeup
 	cp .build/nodeup.tar.gz .build/s3/nodeup/
 	cp .build/nodeup.tar.gz.sha1 .build/s3/nodeup/
-	aws s3 sync .build/s3/ s3://kubeupv2/
-	aws s3api put-object-acl --bucket kubeupv2 --key nodeup/nodeup.tar.gz --acl public-read
-	aws s3api put-object-acl --bucket kubeupv2 --key nodeup/nodeup.tar.gz.sha1 --acl public-read
+	mkdir -p .build/s3/upup
+	cp .build/upup.tar.gz .build/s3/upup/
+	cp .build/upup.tar.gz.sha1 .build/s3/upup/
+	aws s3 sync --acl public-read .build/s3/ s3://kubeupv2/
+	#aws s3api put-object-acl --bucket kubeupv2 --key nodeup/nodeup.tar.gz --acl public-read
+	#aws s3api put-object-acl --bucket kubeupv2 --key nodeup/nodeup.tar.gz.sha1 --acl public-read
 
 push: tar
 	scp .build/nodeup.tar.gz ${TARGET}:/tmp/