Merge branch 'release/0.5' into develop

.gitignore

@@ -0,0 +1 @@
+table.cache

cmd/shadowsocks-local/local.go

@@ -277,7 +277,9 @@ func enoughOptions(config *ss.Config) bool {
 func main() {
 	var configFile, cmdServer string
 	var cmdConfig ss.Config
+	var printVer bool
 
+	flag.BoolVar(&printVer, "version", false, "print version")
 	flag.StringVar(&configFile, "c", "config.json", "specify config file")
 	flag.StringVar(&cmdServer, "s", "", "server address")
 	flag.StringVar(&cmdConfig.Password, "k", "", "password")
@@ -287,6 +289,11 @@ func main() {
 
 	flag.Parse()
 
+	if printVer {
+		ss.PrintVersion()
+		os.Exit(0)
+	}
+
 	cmdConfig.Server = cmdServer
 	ss.SetDebug(debug)
 

cmd/shadowsocks-server/server.go

@@ -354,14 +354,22 @@ var config *ss.Config
 
 func main() {
 	var cmdConfig ss.Config
+	var printVer bool
 
+	flag.BoolVar(&printVer, "version", false, "print version")
 	flag.StringVar(&configFile, "c", "config.json", "specify config file")
 	flag.StringVar(&cmdConfig.Password, "k", "", "password")
 	flag.IntVar(&cmdConfig.ServerPort, "p", 0, "server port")
 	flag.IntVar(&cmdConfig.Timeout, "t", 60, "connection timeout (in seconds)")
 	flag.BoolVar((*bool)(&debug), "d", false, "print debug message")
 
 	flag.Parse()
+
+	if printVer {
+		ss.PrintVersion()
+		os.Exit(0)
+	}
+
 	ss.SetDebug(debug)
 
 	var err error

shadowsocks/util.go

@@ -2,9 +2,15 @@ package shadowsocks
 
 import (
 	"errors"
+	"fmt"
 	"os"
 )
 
+func PrintVersion() {
+	const version = "0.5"
+	fmt.Println("shadowsocks-go version", version)
+}
+
 func IsFileExists(path string) (bool, error) {
 	stat, err := os.Stat(path)
 	if err == nil {

win32build.bat

@@ -1,5 +1,6 @@
-set GOPATH=%cd%
-go install local
-go install server
-go install test
-
+pushd cmd\shadowsocks-local
+go install
+popd
+pushd cmd\shadowsocks-server
+go install
+popd