From 22a40c298d5a89515ad8f43ff5297c13505ed46f Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Thu, 13 Jun 2013 16:24:21 +0200 Subject: [PATCH] Make prometheus build on bazooka repo manager - Build build/package on build target - And include .pkgignore --- .pkgignore | 24 ++++++++++++++++++++++++ Makefile | 8 +++----- 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 .pkgignore diff --git a/.pkgignore b/.pkgignore new file mode 100644 index 000000000..5835ffdc3 --- /dev/null +++ b/.pkgignore @@ -0,0 +1,24 @@ +*.go +*.md +*.sh +*.shlib +*-stamp +prometheus +Makefile* +tools +utility +stats +documentation +config +build/*-stamp +build/dirty +build/cache +build/root +build/package/Makefile +model +.* +coding +retrieval +web +rules +storage diff --git a/Makefile b/Makefile index a5c74be0c..590eb0f91 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,11 @@ advice: $(GO) tool vet . binary: build - $(GO) build -o prometheus $(BUILDFLAGS) . build: config dependencies model preparation tools web + $(GO) build -o prometheus $(BUILDFLAGS) . + cp prometheus build/package/prometheus + rsync -av build/root/lib/ build/package/lib/ build/cache/$(GOPKG): curl -o $@ http://go.googlecode.com/files/$(GOPKG) @@ -56,10 +58,6 @@ format: model: dependencies preparation $(MAKE) -C model -package: binary - cp prometheus build/package/prometheus - rsync -av build/root/lib/ build/package/lib/ - preparation: $(GOCC) source_path $(MAKE) -C build