From 4524a5fe370c06d0374c62d844ac6eb06cc1b164 Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Tue, 11 Jun 2013 17:45:26 +0200 Subject: [PATCH] Remove gvm and install go by hand. --- .gitignore | 2 ++ Makefile | 20 +++++++++++++------- Makefile.INCLUDE | 20 ++++++++++++++++---- build/Makefile | 25 +------------------------ tools/Makefile | 3 ++- tools/dumper/Makefile | 2 +- tools/pruner/Makefile | 2 +- 7 files changed, 36 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 16bfed94a..fd78da1c1 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ command-line-arguments.test *BASE* *LOCAL* *REMOTE* +build/root +tools/dumper/dumper diff --git a/Makefile b/Makefile index a2c3c7fa4..4afde89af 100644 --- a/Makefile +++ b/Makefile @@ -18,17 +18,15 @@ include Makefile.INCLUDE all: binary test advice: - go tool vet . + $(GO) tool vet . binary: build - go build -o prometheus $(BUILDFLAGS) . + $(GO) build -o prometheus $(BUILDFLAGS) . build: preparation config model tools web clean: $(MAKE) -C build clean - $(MAKE) -C config clean - $(MAKE) -C model clean $(MAKE) -C tools clean $(MAKE) -C web clean rm -rf $(TEST_ARTIFACTS) @@ -43,7 +41,14 @@ documentation: search_index godoc -http=:6060 -index -index_files='search_index' format: - find . -iname '*.go' | egrep -v "generated|\.(l|y)\.go" | xargs -n1 gofmt -w -s=true + find . -iname '*.go' | egrep -v "generated|\.(l|y)\.go" | xargs -n1 $(GOROOT)/bin/gofmt -w -s=true + +build/cache/$(GOPKG): + curl -o $@ http://go.googlecode.com/files/$(GOPKG) + +$(GOCC): build/cache/$(GOPKG) + tar -C build/root -xzf $< + touch $@ model: preparation $(MAKE) -C model @@ -52,7 +57,7 @@ package: binary cp prometheus build/package/prometheus rsync -av build/root/lib/ build/package/lib/ -preparation: source_path +preparation: $(GOCC) source_path $(MAKE) -C build race_condition_binary: build @@ -77,7 +82,8 @@ source_path: [ -d "$(FULL_GOPATH)" ] test: build - go test ./... $(GO_TEST_FLAGS) + $(GOENV) find . -maxdepth 1 -mindepth 1 -type d -and -not -path ./build -exec $(GOCC) test {}/... $(GO_TEST_FLAGS) \; + $(GO) test $(GO_TEST_FLAGS) tools: $(MAKE) -C tools diff --git a/Makefile.INCLUDE b/Makefile.INCLUDE index c0d174730..65a2fe3e7 100644 --- a/Makefile.INCLUDE +++ b/Makefile.INCLUDE @@ -25,15 +25,27 @@ else export THIRD_PARTY_BUILD_OUTPUT := endif +OS=$(shell uname) +ARCH=$(shell uname -m) + GO_VERSION := 1.1 +GOOS = $(subst Darwin,darwin,$(subst Linux,linux,$(OS))) +GOARCH = $(subst x86_64,amd64,$(ARCH)) +GOPKG = go$(GO_VERSION).$(GOOS)-$(GOARCH).tar.gz +GOROOT = $(PWD)/build/root/go +GOPATH = $(PWD)/build/root/gopath +GOCC = $(GOROOT)/bin/go +TMPDIR = /tmp +GOENV = TMPDIR=$(TMPDIR) GOROOT=$(GOROOT) GOPATH=$(GOPATH) +GO = $(GOENV) $(GOCC) + LEVELDB_VERSION := 1.9.0 PROTOCOL_BUFFERS_VERSION := 2.5.0 SNAPPY_VERSION := 1.1.0 UNAME := $(shell uname) -FIRST_GOPATH := $(shell echo $${GOPATH} | awk -F':' '{ print $$1 }') -FULL_GOPATH := $(FIRST_GOPATH)/src/github.com/prometheus/prometheus -FULL_GOPATH_BASE := $(FIRST_GOPATH)/src/github.com/prometheus +FULL_GOPATH := $(GOPATH)/src/github.com/prometheus/prometheus +FULL_GOPATH_BASE := $(GOPATH)/src/github.com/prometheus export PREFIX=$(PWD)/build/root @@ -50,7 +62,7 @@ export PKG_CONFIG_PATH := $(PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH) export GO_TEST_FLAGS := "-v" -GO_GET := go get -u -v -x +GO_GET := $(GO) get -u -v -x APT_GET_INSTALL := sudo apt-get install -y BREW_INSTALL := brew install # By default, wget sets the creation time to match the server's, which throws diff --git a/build/Makefile b/build/Makefile index 9f9df0fcc..b2db1f482 100644 --- a/build/Makefile +++ b/build/Makefile @@ -48,7 +48,7 @@ cc-implementation-Linux-stamp: dependencies-stamp: cache-stamp go-stamp goprotobuf-stamp gorest-stamp goskiplist-stamp instrumentation-stamp levigo-stamp touch $@ -go-stamp: gvm-stamp +go-stamp: [ -x "$$(which go)" ] || { echo "go not found." ; false ; } touch $@ @@ -68,29 +68,6 @@ goskiplist-stamp: go-stamp $(GO_GET) github.com/ryszard/goskiplist/skiplist $(THIRD_PARTY_BUILD_OUTPUT) touch $@ -gvm-stamp: bison-stamp cc-stamp mercurial-stamp - [ -x "$$(which gvm)" ] || { echo "gvm not found; install manually from https://github.com/moovweb/gvm." ; false ; } - # - # ********** ********** - # gvm installed go$(GO_VERSION) if it did not exist already. - # - # Prometheus expects go$(GO_VERSION) to be used for building. - # This can be achieved by running ``gvm use go$(GO_VERSION)`` before any - # other Prometheus make tools. - # - # Once this build finishes, $(GOPATH) will be mutated and - # contain some new packages. Here is an example workflow: - # - # $ gvm install go$(GO_VERSION) - # $ gvm use go$(GO_VERSION) - # $ gvm pkgset create prometheus - # $ gvm pkgset use prometheus - # - # ********** ********** - # - -[ -z "${CI}" ] && read -p "Press [ENTER] upon reading." _ - touch $@ - instrumentation-stamp: go-stamp $(GO_GET) github.com/prometheus/client_golang/prometheus $(THIRD_PARTY_BUILD_OUTPUT) $(GO_GET) github.com/prometheus/client_golang/prometheus/exp $(THIRD_PARTY_BUILD_OUTPUT) diff --git a/tools/Makefile b/tools/Makefile index 1fdd25e0a..80b5db150 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -24,6 +24,7 @@ pruner: $(MAKE) -C pruner clean: - $(MAKE) -C dumper pruner clean + $(MAKE) -C dumper clean + $(MAKE) -C pruner clean .PHONY: clean dumper pruner diff --git a/tools/dumper/Makefile b/tools/dumper/Makefile index 5221fa036..af137def0 100644 --- a/tools/dumper/Makefile +++ b/tools/dumper/Makefile @@ -20,7 +20,7 @@ SUFFIXES: include ../../Makefile.INCLUDE dumper: $(shell find . -iname '*.go') - go build -o dumper . + $(GO) build -o dumper . clean: rm -rf $(MAKE_ARTIFACTS) diff --git a/tools/pruner/Makefile b/tools/pruner/Makefile index d7b668242..69635d424 100644 --- a/tools/pruner/Makefile +++ b/tools/pruner/Makefile @@ -20,7 +20,7 @@ SUFFIXES: include ../../Makefile.INCLUDE pruner: $(shell find . -iname '*.go') - go build -o pruner . + $(GO) build -o pruner . clean: rm -rf $(MAKE_ARTIFACTS)