mirror of
https://github.com/wailsapp/wails.git
synced 2026-03-14 14:45:49 +01:00
[V3 Linux] aarch64 compilation (#3854)
* [V3 Linux] Add multi arch package for imageapp base quick refacto * update changelog * update changelog --------- Co-authored-by: Lea Anthony <lea.anthony@gmail.com>
This commit is contained in:
Kodflow
GitHub
parent
331097f269
commit
3b7c870a53
2 changed files with 41 additions and 17 deletions
|
|
@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
### Fixed
|
||||
- Fixed `AlwaysOnTop` not working on Mac by [leaanthony](https://github.com/leaanthony) in [#3841](https://github.com/wailsapp/wails/pull/3841)
|
||||
- [darwin] Fixed `application.NewEditMenu` including a duplicate `PasteAndMatchStyle` role in the edit menu on Darwin by [johnmccabe](https://github.com/johnmccabe) in [#3839](https://github.com/wailsapp/wails/pull/3839)
|
||||
- [linux] Fixed aarch64 compilation [#3840](https://github.com/wailsapp/wails/issues/3840) in [#3854](https://github.com/wailsapp/wails/pull/3854) by [kodflow](https://github.com/kodflow)
|
||||
|
||||
## v3.0.0-alpha.7 - 2024-09-18
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
|
|
@ -72,7 +73,18 @@ func generateAppImage(options *GenerateAppImageOptions) error {
|
|||
// Get the last path of the binary and normalise the name
|
||||
name := normaliseName(filepath.Base(options.Binary))
|
||||
|
||||
appDir := filepath.Join(options.BuildDir, name+"-x86_64.AppDir")
|
||||
// Architecture-specific variables using a map
|
||||
archDetails := map[string]string{
|
||||
"arm64": "aarch64",
|
||||
"x86_64": "x86_64",
|
||||
}
|
||||
|
||||
arch, exists := archDetails[runtime.GOARCH]
|
||||
if !exists {
|
||||
return fmt.Errorf("unsupported architecture: %s", runtime.GOARCH)
|
||||
}
|
||||
|
||||
appDir := filepath.Join(options.BuildDir, fmt.Sprintf("%s-%s.AppDir", name, arch))
|
||||
s.RMDIR(appDir)
|
||||
|
||||
log(p, "Preparing AppImage Directory: "+appDir)
|
||||
|
|
@ -92,27 +104,38 @@ func generateAppImage(options *GenerateAppImageOptions) error {
|
|||
// Download linuxdeploy and make it executable
|
||||
s.CD(options.BuildDir)
|
||||
|
||||
// Download necessary files
|
||||
// Download URLs using a map based on architecture
|
||||
urls := map[string]string{
|
||||
"linuxdeploy": fmt.Sprintf("https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-%s.AppImage", arch),
|
||||
"AppRun": fmt.Sprintf("https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-%s", arch),
|
||||
}
|
||||
|
||||
// Download necessary files concurrently
|
||||
log(p, "Downloading AppImage tooling")
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(2)
|
||||
|
||||
go func() {
|
||||
if !s.EXISTS(filepath.Join(options.BuildDir, "linuxdeploy-x86_64.AppImage")) {
|
||||
s.DOWNLOAD("https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage", filepath.Join(options.BuildDir, "linuxdeploy-x86_64.AppImage"))
|
||||
linuxdeployPath := filepath.Join(options.BuildDir, filepath.Base(urls["linuxdeploy"]))
|
||||
if !s.EXISTS(linuxdeployPath) {
|
||||
s.DOWNLOAD(urls["linuxdeploy"], linuxdeployPath)
|
||||
}
|
||||
s.CHMOD(filepath.Join(options.BuildDir, "linuxdeploy-x86_64.AppImage"), 0755)
|
||||
s.CHMOD(linuxdeployPath, 0755)
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
go func() {
|
||||
target := filepath.Join(appDir, "AppRun")
|
||||
if !s.EXISTS(target) {
|
||||
s.DOWNLOAD("https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-x86_64", target)
|
||||
s.DOWNLOAD(urls["AppRun"], target)
|
||||
}
|
||||
s.CHMOD(target, 0755)
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
wg.Wait()
|
||||
|
||||
// Processing GTK files
|
||||
log(p, "Processing GTK files.")
|
||||
filesNeeded := []string{"WebKitWebProcess", "WebKitNetworkProcess", "libwebkit2gtkinjectedbundle.so"}
|
||||
files, err := findGTKFiles(filesNeeded)
|
||||
|
|
@ -122,11 +145,9 @@ func generateAppImage(options *GenerateAppImageOptions) error {
|
|||
s.CD(appDir)
|
||||
for _, file := range files {
|
||||
targetDir := filepath.Dir(file)
|
||||
// Strip leading forward slash
|
||||
if targetDir[0] == '/' {
|
||||
targetDir = targetDir[1:]
|
||||
}
|
||||
var err error
|
||||
targetDir, err = filepath.Abs(targetDir)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -134,6 +155,7 @@ func generateAppImage(options *GenerateAppImageOptions) error {
|
|||
s.MKDIR(targetDir)
|
||||
s.COPY(file, targetDir)
|
||||
}
|
||||
|
||||
// Copy GTK Plugin
|
||||
err = os.WriteFile(filepath.Join(options.BuildDir, "linuxdeploy-plugin-gtk.sh"), gtkPlugin, 0755)
|
||||
if err != nil {
|
||||
|
|
@ -141,7 +163,6 @@ func generateAppImage(options *GenerateAppImageOptions) error {
|
|||
}
|
||||
|
||||
// Determine GTK Version
|
||||
// Run ldd on the binary and capture the output
|
||||
targetBinary := filepath.Join(appDir, "usr", "bin", options.Binary)
|
||||
lddOutput, err := s.EXEC(fmt.Sprintf("ldd %s", targetBinary))
|
||||
if err != nil {
|
||||
|
|
@ -149,21 +170,23 @@ func generateAppImage(options *GenerateAppImageOptions) error {
|
|||
return err
|
||||
}
|
||||
lddString := string(lddOutput)
|
||||
// Check if GTK3 is present
|
||||
var DeployGtkVersion string
|
||||
if s.CONTAINS(lddString, "libgtk-x11-2.0.so") {
|
||||
switch {
|
||||
case s.CONTAINS(lddString, "libgtk-x11-2.0.so"):
|
||||
DeployGtkVersion = "2"
|
||||
} else if s.CONTAINS(lddString, "libgtk-3.so") {
|
||||
case s.CONTAINS(lddString, "libgtk-3.so"):
|
||||
DeployGtkVersion = "3"
|
||||
} else if s.CONTAINS(lddString, "libgtk-4.so") {
|
||||
case s.CONTAINS(lddString, "libgtk-4.so"):
|
||||
DeployGtkVersion = "4"
|
||||
} else {
|
||||
default:
|
||||
return fmt.Errorf("unable to determine GTK version")
|
||||
}
|
||||
|
||||
// Run linuxdeploy to bundle the application
|
||||
s.CD(options.BuildDir)
|
||||
//log(p, "Generating AppImage (This may take a while...)")
|
||||
cmd := fmt.Sprintf("./linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir %s --output appimage --plugin gtk", appDir)
|
||||
linuxdeployAppImage := filepath.Join(options.BuildDir, fmt.Sprintf("linuxdeploy-%s.AppImage", arch))
|
||||
|
||||
cmd := fmt.Sprintf("%s --appimage-extract-and-run --appdir %s --output appimage --plugin gtk", linuxdeployAppImage, appDir)
|
||||
s.SETENV("DEPLOY_GTK_VERSION", DeployGtkVersion)
|
||||
output, err := s.EXEC(cmd)
|
||||
if err != nil {
|
||||
|
|
@ -172,7 +195,7 @@ func generateAppImage(options *GenerateAppImageOptions) error {
|
|||
}
|
||||
|
||||
// Move file to output directory
|
||||
targetFile := filepath.Join(options.BuildDir, name+"-x86_64.AppImage")
|
||||
targetFile := filepath.Join(options.BuildDir, fmt.Sprintf("%s-%s.AppImage", name, arch))
|
||||
s.MOVE(targetFile, options.OutputDir)
|
||||
|
||||
log(p, "AppImage created: "+targetFile)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue