From a1dd76947de598c7b3da59cbdc74e3ceaf860183 Mon Sep 17 00:00:00 2001 From: Simon Mudd Date: Fri, 24 Nov 2017 08:02:04 +0100 Subject: [PATCH 1/2] Add new makefile target cleanall to remove files pulled down by bootstrap.sh This is to completely clean up your working environment without touching anything that's local in the git repo. Reasons for this are when changing the go binaries or wanting to be sure your repo is clean. --- Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Makefile b/Makefile index 5612e74e0a2..dfa1db42e40 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,21 @@ clean: clean_pkg: rm -rf ../../../../pkg Godeps/_workspace/pkg +# Remove everything including stuff pulled down by bootstrap.sh +cleanall: + # symlinks + for f in config data py-vtdb; do test -L ../../../../$$f && rm ../../../../$$f; done + # directories created by bootstrap.sh + # - exclude vtdataroot and vthook as they may have data we want + rm -rf ../../../../bin ../../../../dist ../../../../lib ../../../../pkg + # keep the vendor.json file but nothing else under the vendor directory as it's not actually part of the Vitess repo + rm -rf vendor/cloud.google.com vendor/github.com vendor/golang.org vendor/google.golang.org vendor/gopkg.in + # other stuff in the go hierarchy that is not under vendor/ + rm -rf ../../../golang.org ../../../honnef.co + rm -rf ../../../github.com/golang ../../../github.com/kardianos ../../../github.com/kisielk + # Remind people to run bootstrap.sh again + echo "Please run boottsrap.sh again to setup your environment" + unit_test: build echo $$(date): Running unit tests go test $(VT_GO_PARALLEL) ./go/... From 97a67baa617b57577e4d83468dd3436b54d0ae1d Mon Sep 17 00:00:00 2001 From: Simon Mudd Date: Fri, 24 Nov 2017 08:09:01 +0100 Subject: [PATCH 2/2] fix typo in instruction to run bootstrap.sh --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dfa1db42e40..21ca94bbbbd 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ cleanall: rm -rf ../../../golang.org ../../../honnef.co rm -rf ../../../github.com/golang ../../../github.com/kardianos ../../../github.com/kisielk # Remind people to run bootstrap.sh again - echo "Please run boottsrap.sh again to setup your environment" + echo "Please run bootstrap.sh again to setup your environment" unit_test: build echo $$(date): Running unit tests