Merge pull request #32 from kimw/feature-version

Feature auto-gen version

Makefile

@@ -1,10 +1,13 @@
 default: all
 
-client:
+update-version:
+ ./update-version.sh
+
+client: update-version
  go get github.com/cbeuw/gotfo
  go build -o ./build/gq-client ./cmd/gq-client 
 
-server:
+server: update-version
  go get github.com/cbeuw/gotfo
  go build -o ./build/gq-server ./cmd/gq-server
 

cmd/gq-client/gq-client.go

@@ -4,6 +4,7 @@ package main
 
 import (
  "flag"
+ "fmt"
  "io"
  "log"
  "net"
@@ -137,8 +138,6 @@ func initSequence(ssConn net.Conn, sta *gqclient.State) {
 
 }
 
-var version string
-
 func main() {
  // Should be 127.0.0.1 to listen to ss-local on this machine
  var localHost string
@@ -171,7 +170,7 @@ func main() {
  flag.Parse()
 
  if *askVersion {
- log.Println("gq-client version: " + version)
+ fmt.Printf("gq-client %s\n", version)
  return
  }
 

cmd/gq-client/version.go

@@ -0,0 +1,3 @@
+package main
+
+const version = "master"

cmd/gq-server/gq-server.go

@@ -5,6 +5,7 @@ package main
 import (
  "errors"
  "flag"
+ "fmt"
  "io"
  "log"
  "net"
@@ -207,8 +208,6 @@ func usedRandomCleaner(sta *gqserver.State) {
  }
 }
 
-var version string
-
 func main() {
  // Should be 127.0.0.1 to listen to ss-server on this machine
  var localHost string
@@ -235,7 +234,7 @@ func main() {
  flag.Parse()
 
  if *askVersion {
- log.Println("gq-server verison: " + version)
+ fmt.Printf("gq-server %s\n", version)
  return
  }
 

cmd/gq-server/version.go

@@ -0,0 +1,3 @@
+package main
+
+const version = "master"

update-version.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+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
+sed -i "s/^const version = .*$/const version = \"$ver\"/" cmd/gq-server/version.go
+sed -i "s/^const version = .*$/const version = \"$ver\"/" cmd/gq-client/version.go