Remove gvm on travis.

smyrman · Jun 13, 2013 · 5624932 · 5624932
1 parent 4524a5f
commit 5624932
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,9 @@
 
 language: go
 
+go:
+ - 1.1
+
 # Explicitly stop before_script from doing anything by giving 'em nil work.
 before_script:
  - echo "Before Script"
@@ -13,6 +16,4 @@ install:
 script:
  - echo "Script"
  - cd ${TRAVIS_BUILD_DIR}
- - gvm install go1.1 || true
- - gvm use go1.1 || true
  - bash -l ./tests-for-die-in-a-fire-travis.sh
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ documentation: search_index
 	godoc -http=:6060 -index -index_files='search_index'
 
 format:
-	find . -iname '*.go' | egrep -v "generated|\.(l|y)\.go" | xargs -n1 $(GOROOT)/bin/gofmt -w -s=true
+	find . -iname '*.go' | egrep -v "generated|\.(l|y)\.go" | xargs -n1 $(GOFMT) -w -s=true
 
 build/cache/$(GOPKG):
 	curl -o $@ http://go.googlecode.com/files/$(GOPKG)

diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE
@@ -38,6 +38,7 @@ GOCC		= $(GOROOT)/bin/go
 TMPDIR		= /tmp
 GOENV		= TMPDIR=$(TMPDIR) GOROOT=$(GOROOT) GOPATH=$(GOPATH)
 GO		= $(GOENV) $(GOCC)
+GOFMT		= $(GOENV) $(GOROOT)/bin/gofmt
 
 LEVELDB_VERSION := 1.9.0
 PROTOCOL_BUFFERS_VERSION := 2.5.0

diff --git a/build/.gitignore b/build/.gitignore
@@ -0,0 +1 @@
+root/
diff --git a/build/Makefile b/build/Makefile
@@ -45,18 +45,18 @@ cc-implementation-Linux-stamp:
 	[ -x "$$(which cc)" ] || $(APT_GET_INSTALL) build-essential
 	touch $@
 
-dependencies-stamp: cache-stamp go-stamp goprotobuf-stamp gorest-stamp goskiplist-stamp instrumentation-stamp levigo-stamp
+dependencies-stamp: cache-stamp go-stamp goprotobuf-protoc-gen-go-stamp gorest-stamp goskiplist-stamp instrumentation-stamp levigo-stamp
 	touch $@
 
 go-stamp:
 	[ -x "$$(which go)" ] || { echo "go not found." ; false ; }
 	touch $@
 
-goprotobuf-protoc-gen-go-stamp: protoc-stamp
+goprotobuf-protoc-gen-go-stamp: protoc-stamp goprotobuf-stamp
 	$(GO_GET) code.google.com/p/goprotobuf/protoc-gen-go $(THIRD_PARTY_BUILD_OUTPUT)
 	touch $@
 
-goprotobuf-stamp: go-stamp mercurial-stamp
+goprotobuf-stamp: go-stamp protoc-stamp mercurial-stamp
 	$(GO_GET) code.google.com/p/goprotobuf/proto $(THIRD_PARTY_BUILD_OUTPUT)
 	touch $@
 
@@ -159,6 +159,7 @@ clean:
 	$(MAKE) -C cache clean
 	$(MAKE) -C dirty clean
 	$(MAKE) -C root clean
+	$(MAKE) -C package clean
 	rm -rf *-stamp
 
 

diff --git a/tests-for-die-in-a-fire-travis.sh b/tests-for-die-in-a-fire-travis.sh
@@ -16,6 +16,4 @@
 # A helper until https://github.com/travis-ci/travis-cookbooks/issues/184 is
 # remedied.
 
-. ./tests-for-die-in-a-fire-travis.shlib
-
 make -f Makefile || exit 1
diff --git a/tests-for-die-in-a-fire-travis.shlib b/tests-for-die-in-a-fire-travis.shlib
diff --git a/tools/dumper/.gitignore b/tools/dumper/.gitignore
@@ -0,0 +1 @@
+dumper
diff --git a/web/blob/Makefile b/web/blob/Makefile
@@ -11,12 +11,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include ../../Makefile.INCLUDE
+
 all: files.go
 
 SUFFIXES:
 
 files.go: $(shell find ../templates/ ../static/ -type f)
-	../../utility/embed-static.sh ../static ../templates | gofmt > $@
+	../../utility/embed-static.sh ../static ../templates | $(GOFMT) > $@
 
 clean:
 	-rm  files.go