github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 20:21:01 +08:00
Code Projects Activity

Revert changes to file output

Browse Source
This commit is contained in:
Lea Anthony 2023-02-26 15:11:24 +11:00
parent 393a4c9251
commit bcde850bac
1 changed files with 44 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
v2/pkg/commands/build/build.go
View File

@ -263,59 +263,53 @@ func execBuildApplication(builder Builder, options *Options) (string, error) {
// Compile the application // Compile the application
printBulletPoint("Compiling application: ") printBulletPoint("Compiling application: ")
if options.Platform == "darwin" { if options.Platform == "darwin" && options.Arch == "universal" {
outputFile := builder.OutputFilename(options) outputFile := builder.OutputFilename(options)
if options.Arch == "universal" { amd64Filename := outputFile + "-amd64"
amd64Filename := outputFile + "-amd64" arm64Filename := outputFile + "-arm64"
arm64Filename := outputFile + "-arm64"
// Build amd64 first // Build amd64 first
options.Arch = "amd64" options.Arch = "amd64"
options.OutputFile = amd64Filename options.OutputFile = amd64Filename
options.CleanBinDirectory = false options.CleanBinDirectory = false
if options.Verbosity == VERBOSE { if options.Verbosity == VERBOSE {
pterm.Println("Building AMD64 Target: " + filepath.Join(options.BinDirectory, options.OutputFile)) pterm.Println("Building AMD64 Target: " + filepath.Join(options.BinDirectory, options.OutputFile))
}
err := builder.CompileProject(options)
if err != nil {
return "", err
}
// Build arm64
options.Arch = "arm64"
options.OutputFile = arm64Filename
options.CleanBinDirectory = false
if options.Verbosity == VERBOSE {
pterm.Println("Building ARM64 Target: " + filepath.Join(options.BinDirectory, options.OutputFile))
}
err = builder.CompileProject(options)
if err != nil {
return "", err
}
// Run lipo
if options.Verbosity == VERBOSE {
pterm.Println(fmt.Sprintf("Running lipo: lipo -create -output %s %s %s", outputFile, amd64Filename, arm64Filename))
}
_, stderr, err := shell.RunCommand(options.BinDirectory, "lipo", "-create", "-output", outputFile, amd64Filename, arm64Filename)
if err != nil {
return "", fmt.Errorf("%s - %s", err.Error(), stderr)
}
// Remove temp binaries
err = fs.DeleteFile(filepath.Join(options.BinDirectory, amd64Filename))
if err != nil {
return "", err
}
err = fs.DeleteFile(filepath.Join(options.BinDirectory, arm64Filename))
if err != nil {
return "", err
}
options.ProjectData.OutputFilename = outputFile
options.CompiledBinary = filepath.Join(options.BinDirectory, outputFile)
} else {
options.ProjectData.OutputFilename = outputFile
options.ProjectData.Name = outputFile
options.ProjectData.Info.ProductName = outputFile
} }
err := builder.CompileProject(options)
if err != nil {
return "", err
}
// Build arm64
options.Arch = "arm64"
options.OutputFile = arm64Filename
options.CleanBinDirectory = false
if options.Verbosity == VERBOSE {
pterm.Println("Building ARM64 Target: " + filepath.Join(options.BinDirectory, options.OutputFile))
}
err = builder.CompileProject(options)
if err != nil {
return "", err
}
// Run lipo
if options.Verbosity == VERBOSE {
pterm.Println(fmt.Sprintf("Running lipo: lipo -create -output %s %s %s", outputFile, amd64Filename, arm64Filename))
}
_, stderr, err := shell.RunCommand(options.BinDirectory, "lipo", "-create", "-output", outputFile, amd64Filename, arm64Filename)
if err != nil {
return "", fmt.Errorf("%s - %s", err.Error(), stderr)
}
// Remove temp binaries
err = fs.DeleteFile(filepath.Join(options.BinDirectory, amd64Filename))
if err != nil {
return "", err
}
err = fs.DeleteFile(filepath.Join(options.BinDirectory, arm64Filename))
if err != nil {
return "", err
}
options.ProjectData.OutputFilename = outputFile
options.CompiledBinary = filepath.Join(options.BinDirectory, outputFile)
} else { } else {
err := builder.CompileProject(options) err := builder.CompileProject(options)
if err != nil { if err != nil {