mirror of
https://github.com/wailsapp/wails.git
synced 2025-05-02 17:39:58 +08:00
ignoring findstring errors for bridge mode
refactored build mode strings
This commit is contained in:
parent
20c0b48634
commit
27f852ac6a
8
app.go
8
app.go
@ -7,7 +7,7 @@ import (
|
||||
// -------------------------------- Compile time Flags ------------------------------
|
||||
|
||||
// BuildMode indicates what mode we are in
|
||||
var BuildMode = "prod"
|
||||
var BuildMode = cmd.BuildModeProd
|
||||
|
||||
// ----------------------------------------------------------------------------------
|
||||
|
||||
@ -53,7 +53,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
|
||||
result.config = appconfig
|
||||
|
||||
// Set up the CLI if not in release mode
|
||||
if BuildMode != "prod" {
|
||||
if BuildMode != BuildModeProd {
|
||||
result.cli = result.setupCli()
|
||||
} else {
|
||||
// Disable Inspector in release mode
|
||||
@ -65,7 +65,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App {
|
||||
|
||||
// Run the app
|
||||
func (a *App) Run() error {
|
||||
if BuildMode != "prod" {
|
||||
if BuildMode != BuildModeProd {
|
||||
return a.cli.Run()
|
||||
}
|
||||
|
||||
@ -82,7 +82,7 @@ func (a *App) start() error {
|
||||
a.log.Info("Starting")
|
||||
|
||||
// Check if we are to run in headless mode
|
||||
if BuildMode == "bridge" {
|
||||
if BuildMode == BuildModeBridge {
|
||||
a.renderer = &Headless{}
|
||||
}
|
||||
|
||||
|
10
cmd/build.go
Normal file
10
cmd/build.go
Normal file
@ -0,0 +1,10 @@
|
||||
package cmd
|
||||
|
||||
const (
|
||||
// BuildModeProd indicates we are building for prod mode
|
||||
BuildModeProd = "prod"
|
||||
// BuildModeDebug indicates we are building for debug mode
|
||||
BuildModeDebug = "debug"
|
||||
// BuildModeBridge indicates we are building for bridge mode
|
||||
BuildModeBridge = "bridge"
|
||||
)
|
@ -49,7 +49,8 @@ func InstallGoDependencies() error {
|
||||
// BuildApplication will attempt to build the project based on the given inputs
|
||||
func BuildApplication(binaryName string, forceRebuild bool, buildMode string) error {
|
||||
compileMessage := "Packing + Compiling project"
|
||||
if buildMode == "debug" {
|
||||
|
||||
if buildMode == BuildModeDebug {
|
||||
compileMessage += " (Debug Mode)"
|
||||
}
|
||||
|
||||
@ -72,7 +73,7 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string) er
|
||||
|
||||
// Setup ld flags
|
||||
ldflags := "-w -s "
|
||||
if buildMode == "debug" {
|
||||
if buildMode == BuildModeDebug {
|
||||
ldflags = ""
|
||||
}
|
||||
ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
|
||||
|
@ -89,9 +89,9 @@ func init() {
|
||||
}
|
||||
|
||||
// Build application
|
||||
buildMode := "prod"
|
||||
buildMode := cmd.BuildModeProd
|
||||
if debugMode {
|
||||
buildMode = "debug"
|
||||
buildMode = cmd.BuildModeDebug
|
||||
}
|
||||
err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode)
|
||||
if err != nil {
|
||||
|
@ -62,6 +62,8 @@ func init() {
|
||||
}
|
||||
|
||||
// Save project directory
|
||||
// TODO: Remove compiling frontend once packr
|
||||
// allows optional boxes
|
||||
projectDir := fs.Cwd()
|
||||
|
||||
// Install deps
|
||||
@ -84,7 +86,7 @@ func init() {
|
||||
return err
|
||||
}
|
||||
|
||||
buildMode := "bridge"
|
||||
buildMode := cmd.BuildModeBridge
|
||||
err = cmd.BuildApplication(projectOptions.BinaryName, forceRebuild, buildMode)
|
||||
if err != nil {
|
||||
return err
|
||||
|
5
utils.go
5
utils.go
@ -4,6 +4,8 @@ import (
|
||||
"log"
|
||||
"strings"
|
||||
|
||||
"github.com/wailsapp/wails/cmd"
|
||||
|
||||
"github.com/gobuffalo/packr"
|
||||
)
|
||||
|
||||
@ -18,6 +20,9 @@ func escapeJS(js string) (string, error) {
|
||||
func BoxString(box *packr.Box, filename string) string {
|
||||
result, err := box.FindString(filename)
|
||||
if err != nil {
|
||||
if BuildMode == cmd.BuildModeBridge {
|
||||
return ""
|
||||
}
|
||||
log.Fatal(err)
|
||||
}
|
||||
return result
|
||||
|
Loading…
Reference in New Issue
Block a user