diff options
| author | Steven Normore <snormore@gmail.com> | 2014-04-09 11:49:19 +0000 |
|---|---|---|
| committer | Steven Normore <snormore@gmail.com> | 2014-04-09 11:51:43 +0000 |
| commit | 38b69be6804306a919363d4d12bcfebb62ec97ca (patch) | |
| tree | 832fe45176666e849f0abef1a5f335b41ec298e0 | |
| parent | add bin to gitignore (diff) | |
| download | dedo-38b69be6804306a919363d4d12bcfebb62ec97ca.tar.gz dedo-38b69be6804306a919363d4d12bcfebb62ec97ca.tar.xz | |
add ldflags on build with main.commit and main.branch to Makefile
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | cmd/bolt/main.go | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,6 +1,9 @@ TEST=. BENCH=. COVERPROFILE=/tmp/c.out +BRANCH=`git rev-parse --abbrev-ref HEAD` +COMMIT=`git rev-parse --short HEAD` +GOLDFLAGS="-X main.branch $(BRANCH) -X main.commit $(COMMIT)" bench: benchpreq go test -v -test.bench=$(BENCH) @@ -31,7 +34,7 @@ get: build: get @mkdir -p bin - @go build -a -o bin/bolt-`git rev-parse --short HEAD` ./cmd/bolt + @go build -ldflags=$(GOLDFLAGS) -a -o bin/bolt-`git rev-parse --short HEAD` ./cmd/bolt test: fmt errcheck @go get github.com/stretchr/testify/assert diff --git a/cmd/bolt/main.go b/cmd/bolt/main.go index bc5fadb..ff3c1bf 100644 --- a/cmd/bolt/main.go +++ b/cmd/bolt/main.go @@ -9,6 +9,8 @@ import ( "github.com/codegangsta/cli" ) +var branch, commit string + func main() { log.SetFlags(0) NewApp().Run(os.Args) @@ -19,7 +21,7 @@ func NewApp() *cli.App { app := cli.NewApp() app.Name = "bolt" app.Usage = "BoltDB toolkit" - app.Version = "0.1.0" + app.Version = fmt.Sprintf("0.1.0 (%s %s)", branch, commit) app.Commands = []cli.Command{ { Name: "get", |