github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-04 15:02:29 +08:00
Code Projects Activity

update messages to output xgo version

Browse Source 
TODO: allow image override
This commit is contained in:
Travis McLane 2020-09-13 08:51:37 -05:00 committed by Lea Anthony
parent 0ad0092aa2
commit c72c6d2408
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/helpers.go
View File

@ -18,7 +18,7 @@ import (
"github.com/leaanthony/spinner" "github.com/leaanthony/spinner"
) )
const XGO_VERSION = "latest" const xgoVersion = "latest"
var fs = NewFSHelper() var fs = NewFSHelper()
@ -92,16 +92,17 @@ func InitializeCrossCompilation(verbose bool) error {
} }
var packSpinner *spinner.Spinner var packSpinner *spinner.Spinner
msg := fmt.Sprintf("Pulling wailsapp/xgo:%s docker image... (may take a while)", xgoVersion)
if !verbose { if !verbose {
packSpinner = spinner.New("Pulling wailsapp/xgo:latest docker image... (may take a while)") packSpinner = spinner.New(msg)
packSpinner.SetSpinSpeed(50) packSpinner.SetSpinSpeed(50)
packSpinner.Start() packSpinner.Start()
} else { } else {
println("Pulling wailsapp/xgo:latest docker image... (may take a while)") println(msg)
} }
err := NewProgramHelper(verbose).RunCommandArray([]string{"docker", err := NewProgramHelper(verbose).RunCommandArray([]string{"docker",
"pull", "wailsapp/xgo:latest"}) "pull", fmt.Sprintf("wailsapp/xgo:%s", xgoVersion)})
if err != nil { if err != nil {
if packSpinner != nil { if packSpinner != nil {
@ -116,7 +117,7 @@ func InitializeCrossCompilation(verbose bool) error {
return nil return nil
} }
// BuildDocker builds the project using the cross compiling wailsapp/xgo:latest container // BuildDocker builds the project using the cross compiling wailsapp/xgo:<xgoVersion> container
func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOptions) error { func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOptions) error {
var packSpinner *spinner.Spinner var packSpinner *spinner.Spinner
if buildMode == BuildModeBridge { if buildMode == BuildModeBridge {
@ -160,12 +161,12 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
buildCommand.Add(fmt.Sprintf("%s:/go", projectOptions.GoPath)) buildCommand.Add(fmt.Sprintf("%s:/go", projectOptions.GoPath))
} }
buildCommand.Add(fmt.Sprintf("wailsapp/xgo:%s", XGO_VERSION)) buildCommand.Add(fmt.Sprintf("wailsapp/xgo:%s", xgoVersion))
buildCommand.Add(".") buildCommand.Add(".")
compileMessage := fmt.Sprintf( compileMessage := fmt.Sprintf(
"Packing + Compiling project for %s/%s using docker image wailsapp/xgo:latest", "Packing + Compiling project for %s/%s using docker image wailsapp/xgo:%s",
projectOptions.Platform, projectOptions.Architecture) projectOptions.Platform, projectOptions.Architecture, xgoVersion)
if buildMode == BuildModeDebug { if buildMode == BuildModeDebug {
compileMessage += " (Debug Mode)" compileMessage += " (Debug Mode)"