瀏覽代碼

Forward arch when building

Valentin Niess 7 月之前
父節點
當前提交
ca8d4717d4
共有 3 個文件被更改,包括 5 次插入3 次删除
  1. 3 2
      python_appimage/appimage/build.py
  2. 1 0
      python_appimage/commands/build/manylinux.py
  3. 1 1
      python_appimage/utils/deps.py

+ 3 - 2
python_appimage/appimage/build.py

@@ -12,7 +12,7 @@ from ..utils.log import debug, log
 __all__ = ['build_appimage']
 
 
-def build_appimage(appdir=None, destination=None):
+def build_appimage(appdir=None, *, arch=None, destination=None):
     '''Build an AppImage from an AppDir
     '''
     if appdir is None:
@@ -21,7 +21,8 @@ def build_appimage(appdir=None, destination=None):
     log('BUILD', os.path.basename(appdir))
     appimagetool = ensure_appimagetool()
 
-    arch = platform.machine()
+    if arch is None:
+        arch = platform.machine()
     cmd = ['ARCH=' + arch, appimagetool, '--no-appstream', appdir]
     if destination is not None:
         cmd.append(destination)

+ 1 - 0
python_appimage/commands/build/manylinux.py

@@ -55,6 +55,7 @@ def execute(tag, abi, clean, tarball):
             destination = f'{fullname}.AppImage'
             build_appimage(
                 appdir = str(appdir),
+                arch = str(image.arch),
                 destination = destination
             )
             shutil.copy(

+ 1 - 1
python_appimage/utils/deps.py

@@ -20,7 +20,7 @@ PREFIX = os.path.abspath(os.path.dirname(__file__) + '/..')
 APPIMAGETOOL_DIR = os.path.join(CACHE_DIR, 'bin')
 '''Location of the appimagetool binary'''
 
-APPIMAGETOOL_VERSION = '12'
+APPIMAGETOOL_VERSION = '1.9.0'
 '''Version of the appimagetool binary'''
 
 EXCLUDELIST = os.path.join(CACHE_DIR, 'share/excludelist')