From 7c15b780e22b76d373ee1988346de1cc4baa36b4 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 11 Jan 2019 06:32:13 +1100 Subject: [PATCH] Fix frameworkspinner Fix BoxString for frameworks --- cmd/frameworks/main.go | 15 +++++++++++++++ cmd/wails/3_build.go | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/cmd/frameworks/main.go b/cmd/frameworks/main.go index 4e96440c5..8abf89adc 100644 --- a/cmd/frameworks/main.go +++ b/cmd/frameworks/main.go @@ -1,5 +1,11 @@ package frameworks +import ( + "log" + + "github.com/gobuffalo/packr" +) + // Framework has details about a specific framework type Framework struct { Name string @@ -11,3 +17,12 @@ type Framework struct { // FrameworkToUse is the framework we will use when building // Set by `wails init`, used by `wails build` var FrameworkToUse *Framework + +// BoxString extracts a string from a packr box +func BoxString(box *packr.Box, filename string) string { + result, err := box.FindString(filename) + if err != nil { + log.Fatal(err) + } + return result +} diff --git a/cmd/wails/3_build.go b/cmd/wails/3_build.go index f3ae22c7f..c5e726504 100644 --- a/cmd/wails/3_build.go +++ b/cmd/wails/3_build.go @@ -162,6 +162,7 @@ func init() { frameworkSpinner := spinner.New() frameworkSpinner.SetSpinSpeed(50) if projectOptions.Framework != nil { + frameworkSpinner.Start() frameworkSpinner.Success("Compiling support for " + projectOptions.Framework.Name) buildTags = append(buildTags, projectOptions.Framework.BuildTag) } @@ -219,7 +220,7 @@ func init() { // Release mode if releaseMode { - buildCommand.AddSlice([]string{"-ldflags","-X github.com/wailsapp/wails.DebugMode=false"}) + buildCommand.AddSlice([]string{"-ldflags", "-X github.com/wailsapp/wails.DebugMode=false"}) } err = program.RunCommandArray(buildCommand.AsSlice()) if err != nil {