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

[v2] Improve multi platform builds (#1373)

Browse Source 
- Make sure to reset the default Arch of the build options and not keep the previous one.
- Expand to the full platform in outputBinaries so e.g. `-platform windows` can be used with `-nsis`
This commit is contained in:
stffabi 2022-05-03 23:27:13 +02:00 committed by GitHub
parent 531d7cfb62
commit 2d66d2146a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,10 +259,9 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
// Calculate platform and arch // Calculate platform and arch
platformSplit := strings.Split(platform, "/") platformSplit := strings.Split(platform, "/")
buildOptions.Platform = platformSplit[0] buildOptions.Platform = platformSplit[0]
buildOptions.Arch = runtime.GOARCH
if system.IsAppleSilicon { if system.IsAppleSilicon {
buildOptions.Arch = "arm64" buildOptions.Arch = "arm64"
} else {
buildOptions.Arch = runtime.GOARCH
} }
if len(platformSplit) == 2 { if len(platformSplit) == 2 {
buildOptions.Arch = platformSplit[1] buildOptions.Arch = platformSplit[1]
@ -330,7 +329,7 @@ func AddBuildSubcommand(app *clir.Cli, w io.Writer) {
// Output stats // Output stats
buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.\n", outputFilename, time.Since(start).Round(time.Millisecond).String())) buildOptions.Logger.Println(fmt.Sprintf("Built '%s' in %s.\n", outputFilename, time.Since(start).Round(time.Millisecond).String()))
outputBinaries[platform] = outputFilename outputBinaries[buildOptions.Platform+"/"+buildOptions.Arch] = outputFilename
}) })
if targetErr != nil { if targetErr != nil {