taigrr/wails
1
0
Fork 0
mirror of https://github.com/taigrr/wails.git synced 2026-04-02 05:08:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix misc build issues

Browse Source
This commit is contained in:
Lea Anthony
2021-01-01 13:00:38 +11:00
parent 657df8bdda
commit a54d875ceb
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
v2/cmd/wails/internal/commands/build/build.go
View File

@@ -43,7 +43,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
// Quiet Build
quiet := false
command.BoolFlag("q", "Supress output to console", &quiet)
command.BoolFlag("q", "Suppress output to console", &quiet)
// ldflags to pass to `go`
ldflags := ""

5
v2/pkg/commands/build/base.go
View File

@@ -311,7 +311,10 @@ func (b *BaseBuilder) NpmRunWithEnvironment(projectDir, buildTarget string, verb
}
// BuildFrontend executes the `npm build` command for the frontend directory
func (b *BaseBuilder) BuildFrontend(outputLogger *clilogger.CLILogger, verbose bool) error {
func (b *BaseBuilder) BuildFrontend(outputLogger *clilogger.CLILogger) error {
// TODO: Fix this up from the CLI
verbose := false
frontendDir := filepath.Join(b.projectData.Path, "frontend")

13
v2/pkg/commands/build/hybrid.go
View File

@@ -2,6 +2,7 @@ package build
import (
"github.com/wailsapp/wails/v2/internal/project"
"github.com/wailsapp/wails/v2/pkg/clilogger"
)
// HybridBuilder builds applications as a server
@@ -30,7 +31,7 @@ func (b *HybridBuilder) BuildAssets(options *Options) error {
return err
}
// Build static assets
err = b.buildStaticAssets(b.projectData)
err = b.buildCustomAssets(b.projectData)
if err != nil {
return err
}
@@ -38,6 +39,12 @@ func (b *HybridBuilder) BuildAssets(options *Options) error {
return nil
}
// BuildFrontend builds the assets for the desktop application
func (b *HybridBuilder) BuildFrontend(_ *clilogger.CLILogger) error {
panic("To be implemented")
return nil
}
// BuildAssets builds the assets for the desktop application
func (b *HybridBuilder) BuildBaseAssets(options *Options) error {
@@ -57,13 +64,13 @@ func (b *HybridBuilder) BuildBaseAssets(options *Options) error {
}
// Build desktop static assets
err = b.desktop.buildStaticAssets(b.projectData)
err = b.desktop.buildCustomAssets(b.projectData)
if err != nil {
return err
}
// Build server static assets
err = b.server.buildStaticAssets(b.projectData)
err = b.server.buildCustomAssets(b.projectData)
if err != nil {
return err
}

15
v2/pkg/commands/build/server.go
View File

@@ -23,7 +23,7 @@ func newServerBuilder() *ServerBuilder {
}
// BuildAssets builds the assets for the desktop application
func (s *ServerBuilder) BuildAssets(options *Options) error {
func (s *ServerBuilder) BuildAssets(_ *Options) error {
var err error
assets, err := s.BaseBuilder.ExtractAssets()
@@ -38,7 +38,7 @@ func (s *ServerBuilder) BuildAssets(options *Options) error {
}
// Build static assets
err = s.buildStaticAssets(s.projectData)
err = s.buildCustomAssets(s.projectData)
if err != nil {
return err
}
@@ -84,11 +84,14 @@ func (s *ServerBuilder) BuildBaseAssets(assets *html.AssetBundle) error {
if err != nil {
return err
}
defer f.Close()
f.WriteString(db.Serialize("db", "webserver"))
return nil
_, err = f.WriteString(db.Serialize("db", "webserver"))
if err != nil {
// Ignore error - we already have one!
_ = f.Close()
return err
}
return f.Close()
}
// BuildRuntime builds the javascript runtime used by the HTML client to connect to the websocket