diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | src/papod.go | 20 |
3 files changed, 21 insertions, 15 deletions
@@ -1,4 +1,5 @@ /*.bin +/src/version.go /src/*.a /src/*.bin /tests/*.a @@ -39,12 +39,14 @@ objects = \ sources = \ src/$(NAME).go \ + src/version.go \ src/main.go \ $(sources.static) \ $(sources.sql) \ derived-assets = \ + src/version.go \ $(objects) \ src/main.bin \ tests/main.bin \ @@ -66,14 +68,16 @@ all: $(derived-assets) $(objects): Makefile -src/$(NAME).a: src/$(NAME).go +src/$(NAME).a: src/$(NAME).go src/version.go + go tool compile $(GOCFLAGS) -o $@ -p $(*F) -I $(@D) $*.go src/version.go + src/main.a: src/main.go src/$(NAME).a tests/main.a: tests/main.go tests/$(NAME).a -src/$(NAME).a src/main.a tests/main.a: +src/main.a tests/main.a: go tool compile $(GOCFLAGS) -o $@ -p $(*F) -I $(@D) $*.go -tests/$(NAME).a: tests/$(NAME).go src/$(NAME).go - go tool compile $(GOCFLAGS) -o $@ -p $(*F) $*.go src/$(*F).go +tests/$(NAME).a: tests/$(NAME).go src/$(NAME).go src/version.go + go tool compile $(GOCFLAGS) -o $@ -p $(*F) $*.go src/$(*F).go src/version.go src/main.bin: src/main.a tests/main.bin: tests/main.a @@ -83,6 +87,9 @@ src/main.bin tests/main.bin: $(NAME).bin: src/main.bin ln -fs $? $@ +src/version.go: Makefile + echo 'package $(NAME); var version = "$(VERSION)"' > $@ + tests.bin-check = \ diff --git a/src/papod.go b/src/papod.go index 91e1145..05b1d8e 100644 --- a/src/papod.go +++ b/src/papod.go @@ -9,6 +9,7 @@ import ( "fmt" "io" "io/ioutil" + "log/slog" "net" "os" "regexp" @@ -18,7 +19,7 @@ import ( "time" g "gobang" - _ "golite" + "golite" ) @@ -26,19 +27,11 @@ import ( // Global variables -var ( - Version string - Colour string -) +var Colour string func SetEnvironmentVariables() { - Version = os.Getenv("PAPOD_VERSION") - if Version == "" { - Version = "PAPOD-VERSION-UNKNOWN" - } - Colour = os.Getenv("PAPOD_COLOUR") if Colour == "" { Colour = "PAPOD-COLOUR-UNKNOWN" @@ -509,7 +502,12 @@ func InitDB(databasePath string) *sql.DB { } func Init() { - g.Init() + g.Init(slog.Group( + "versions", + "gobang", g.Version, + "golite", golite.Version, + "this", version, + )) SetEnvironmentVariables() } |