5
0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 07:10:40 +08:00

Refactor recent mac updates (#2419)

This commit is contained in:
Lea Anthony 2023-02-25 20:28:27 +11:00 committed by GitHub
parent 9b35926789
commit 76371fcb27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -262,12 +262,10 @@ func execBuildApplication(builder Builder, options *Options) (string, error) {
// Compile the application // Compile the application
printBulletPoint("Compiling application: ") printBulletPoint("Compiling application: ")
outputFile := builder.OutputFilename(options)
options.ProjectData.OutputFilename = outputFile
options.ProjectData.Name = outputFile
options.ProjectData.Info.ProductName = outputFile
if options.Platform == "darwin" && options.Arch == "universal" { if options.Platform == "darwin" {
outputFile := builder.OutputFilename(options)
if options.Arch == "universal" {
amd64Filename := outputFile + "-amd64" amd64Filename := outputFile + "-amd64"
arm64Filename := outputFile + "-arm64" arm64Filename := outputFile + "-arm64"
@ -313,6 +311,11 @@ func execBuildApplication(builder Builder, options *Options) (string, error) {
} }
options.ProjectData.OutputFilename = outputFile options.ProjectData.OutputFilename = outputFile
options.CompiledBinary = filepath.Join(options.BinDirectory, outputFile) options.CompiledBinary = filepath.Join(options.BinDirectory, outputFile)
} else {
options.ProjectData.OutputFilename = outputFile
options.ProjectData.Name = outputFile
options.ProjectData.Info.ProductName = outputFile
}
} else { } else {
err := builder.CompileProject(options) err := builder.CompileProject(options)
if err != nil { if err != nil {