Browse Source

Improve build script

Ask Bjørn Hansen 8 years ago
parent
commit
119259cf7a
2 changed files with 12 additions and 5 deletions
  1. 2 2
      Makefile
  2. 10 3
      build

+ 2 - 2
Makefile

@@ -5,8 +5,8 @@ templates.go: templates/*.html monitor.go
 	go generate
 
 .PHONY: test
-test:
-	go test $(go list ./... | grep -v /vendor/)
+test: .PHONY
+	go test $(shell go list ./... | grep -v /vendor/)
 
 testrace: .PHONY
 	go test -race $(shell go list ./... | grep -v /vendor/)

+ 10 - 3
build

@@ -1,8 +1,15 @@
 #!/bin/sh
+echo building
 # git describe --always --tags --dirty --long)
 REVISION=`git rev-parse --short=5  HEAD`
 BUILDTIME=`TZ=UTC date "+%Y-%m-%dT%H:%MZ"`
 echo $REVISION > REVISION
-go build \
-  -ldflags "-X main.gitVersion $REVISION -X main.buildTime $BUILDTIME" \
-  -v
+
+OS=`go env GOOS`
+ARCH=`go env GOARCH`
+
+go build -i -o geodns-$OS-$ARCH \
+  -ldflags "-X main.gitVersion=$REVISION -X main.buildTime=$BUILDTIME" \
+  -v && \
+  (cd geodns-influxdb && go build -i -v -o geodns-influxdb-$OS-$ARCH && cd ..) && \
+tar cvf geodns-$OS-$ARCH.tar geodns-$OS-$ARCH geodns-influxdb/geodns-influxdb-$OS-$ARCH service service-influxdb