mirror
/
tile38
mirror of https://github.com/tidwall/tile38.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix version not being set at build, close #386

This commit is contained in:
tidwall 2018-11-15 13:45:36 -07:00
parent c2ebffabd4
commit 737561fa8b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.sh
View File

@ -8,13 +8,13 @@ VERSION=1.14.1
PROTECTED_MODE="no" PROTECTED_MODE="no"
# Hardcode some values to the core package # Hardcode some values to the core package
LDFLAGS="$LDFLAGS -X github.com/tidwall/tile38/pkg/core.Version=${VERSION}" LDFLAGS="$LDFLAGS -X github.com/tidwall/tile38/core.Version=${VERSION}"
if [ -d ".git" ]; then if [ -d ".git" ]; then
LDFLAGS="$LDFLAGS -X github.com/tidwall/tile38/pkg/core.GitSHA=$(git rev-parse --short HEAD)" LDFLAGS="$LDFLAGS -X github.com/tidwall/tile38/core.GitSHA=$(git rev-parse --short HEAD)"
fi fi
LDFLAGS="$LDFLAGS -X github.com/tidwall/tile38/pkg/core.BuildTime=$(date +%FT%T%z)" LDFLAGS="$LDFLAGS -X github.com/tidwall/tile38/core.BuildTime=$(date +%FT%T%z)"
if [ "$PROTECTED_MODE" == "no" ]; then if [ "$PROTECTED_MODE" == "no" ]; then
LDFLAGS="$LDFLAGS -X github.com/tidwall/tile38/pkg/core.ProtectedMode=no" LDFLAGS="$LDFLAGS -X github.com/tidwall/tile38/core.ProtectedMode=no"
fi fi
if [ "$1" == "update-version" ]; then if [ "$1" == "update-version" ]; then

4
cmd/tile38-server/main.go
View File

@ -147,10 +147,10 @@ Developer Options:
if i < len(os.Args) { if i < len(os.Args) {
switch strings.ToLower(os.Args[i]) { switch strings.ToLower(os.Args[i]) {
case "no": case "no":
core.ProtectedMode = false core.ProtectedMode = "no"
continue continue
case "yes": case "yes":
core.ProtectedMode = true core.ProtectedMode = "yes"
continue continue
} }
} }

6
core/options.go
View File

@ -7,16 +7,16 @@ var DevMode = false
var ShowDebugMessages = false var ShowDebugMessages = false
// ProtectedMode forces Tile38 to default in protected mode. // ProtectedMode forces Tile38 to default in protected mode.
var ProtectedMode = true var ProtectedMode = "no"
// AppendOnly allows for disabling the appendonly file. // AppendOnly allows for disabling the appendonly file.
var AppendOnly = true var AppendOnly = true
// AppendFileName allows for custom appendonly file path // AppendFileName allows for custom appendonly file path
var AppendFileName string var AppendFileName = ""
// QueueFileName allows for custom queue.db file path // QueueFileName allows for custom queue.db file path
var QueueFileName string var QueueFileName = ""
// NumThreads is the number of network threads to use. // NumThreads is the number of network threads to use.
var NumThreads int var NumThreads int

2
internal/server/server.go
View File

@ -278,7 +278,7 @@ func Serve(host string, port int, dir string, http bool) error {
} }
func (server *Server) isProtected() bool { func (server *Server) isProtected() bool {
if core.ProtectedMode == false { if core.ProtectedMode == "no" {
// --protected-mode no // --protected-mode no
return false return false
} }