Skip to content

Commit

Permalink
Use Makefile ldflags -X link to set version
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeuw committed Apr 12, 2018
1 parent 7205be0 commit 2489b50
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 21 deletions.
15 changes: 9 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
default: all

update-version:
./update-version.sh
version=$(shell ver=$$(git log -n 1 --pretty=oneline --format=%D | awk -F, '{print $$1}' | awk '{print $$3}'); \
if [ "$$ver" = "master" ] ; then \
ver="master($$(git log -n 1 --pretty=oneline --format=%h))" ; \
fi ; \
echo $$ver)

client: update-version
client:
go get github.com/cbeuw/gotfo
go build -o ./build/gq-client ./cmd/gq-client
go build -ldflags "-X main.version=${version}" -o ./build/gq-client ./cmd/gq-client

server: update-version
server:
go get github.com/cbeuw/gotfo
go build -o ./build/gq-server ./cmd/gq-server
go build -ldflags "-X main.version=${version}" -o ./build/gq-server ./cmd/gq-server

all: client server

Expand Down
2 changes: 2 additions & 0 deletions cmd/gq-client/gq-client.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
"github.com/cbeuw/gotfo"
)

var version string

// ss refers to the ss-client, remote refers to the proxy server

type pipe interface {
Expand Down
3 changes: 0 additions & 3 deletions cmd/gq-client/version.go

This file was deleted.

2 changes: 2 additions & 0 deletions cmd/gq-server/gq-server.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import (
"github.com/cbeuw/gotfo"
)

var version string

type pipe interface {
remoteToServer()
serverToRemote()
Expand Down
3 changes: 0 additions & 3 deletions cmd/gq-server/version.go

This file was deleted.

9 changes: 0 additions & 9 deletions update-version.sh

This file was deleted.

0 comments on commit 2489b50

Please sign in to comment.