deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 22:55:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

try and simplify

Browse source
This commit is contained in:
Lea Anthony 2019-02-20 22:54:06 +11:00
commit 2ccabc772b
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/helpers.go
View file

@ -12,6 +12,7 @@ import (
"github.com/leaanthony/slicer"
"github.com/leaanthony/spinner"
"github.com/wailsapp/wails/cmd"
)
// ValidateFrontendConfig checks if the frontend config is valid
@ -99,6 +100,10 @@ func PackageApplication(projectOptions *ProjectOptions) error {
// Package app
message := "Generating .app"
if runtime.GOOS == "windows" {
err = cmd.CheckWindres()
if err != nil {
return err
}
message = "Generating resource bundle"
}
packageSpinner := spinner.New(message)

15
cmd/wails/4_build.go
View file

@ -25,6 +25,7 @@ func init() {
BoolFlag("d", "Build in Debug mode", &debugMode)
initCmd.Action(func() error {
log := cmd.NewLogger()
message := "Building Application"
if forceRebuild {
@ -95,16 +96,10 @@ func init() {
buildMode = cmd.BuildModeDebug
}
if runtime.GOOS == "windows" {
if packageApp {
err = cmd.CheckWindres()
if err != nil {
return err
}
err = cmd.PackageApplication(projectOptions)
if err != nil {
return err
}
if runtime.GOOS == "windows" && packageApp {
err = cmd.PackageApplication(projectOptions)
if err != nil {
return err
}
}
err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode)