From ab1e84cf417600c4387d7b4f2262a6c409c7e508 Mon Sep 17 00:00:00 2001 From: Sergey Lanzman Date: Sat, 18 Jun 2016 00:09:19 +0300 Subject: [PATCH] Streamline Revel AppVersion and BuildTime and fix -X import.name=value --- harness/build.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/harness/build.go b/harness/build.go index d1e21b6..348eee8 100755 --- a/harness/build.go +++ b/harness/build.go @@ -77,7 +77,13 @@ func Build(buildFlags ...string) (app *App, compileError *revel.Error) { gotten := make(map[string]struct{}) for { appVersion := getAppVersion() - versionLinkerFlags := fmt.Sprintf("-X %s/app.APP_VERSION \"%s\"", revel.ImportPath, appVersion) + versionLinkerFlags := fmt.Sprintf("-X %s/app.APP_VERSION=\"%s\"", revel.ImportPath, appVersion) + + // TODO remove version check for versionLinkerFlags after Revel becomes Go min version to go1.5 + goVersion, _ := strconv.ParseFloat(runtime.Version()[2:5], 64) + if goVersion < 1.5 { + versionLinkerFlags = fmt.Sprintf("-X %s/app.APP_VERSION \"%s\"", revel.ImportPath, appVersion) + } flags := []string{ "build", "-i",