mirror of
https://github.com/taigrr/wails.git
synced 2026-04-02 05:08:54 -07:00
try and simplify
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user