Lerking/python-appimage
1
0
Fork 0
mirror of https://github.com/niess/python-appimage.git synced 2026-03-14 04:10:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Multiple extra data

Browse Source
This commit is contained in:
Valentin Niess
2024-05-22 08:42:07 +02:00
parent a6d0da5f0b
commit 03bab9b38d
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python_appimage/__main__.py
View File

@@ -7,9 +7,9 @@ import sys
__all__ = ['main']
def directory(path):
if not os.path.isdir(path):
raise argparse.ArgumentTypeError("Not a directory: {}".format(path))
def exists(path):
if not os.path.exists(path):
raise argparse.ArgumentTypeError("could not find: {}".format(path))
return os.path.abspath(path)
def main():
@@ -78,8 +78,8 @@ def main():
help='force pip in-tree-build',
action='store_true',
default=False)
build_app_parser.add_argument('-x', '--extra-files', type=directory,
help='path to directory containing extra files to be baked in')
build_app_parser.add_argument('-x', '--extra-data', type=exists,
help='extra application data (bundled under $APPDIR/)', nargs='+')
list_parser = subparsers.add_parser('list',
description='List Python versions installed in a manylinux image')

19
python_appimage/commands/build/app.py
View File

@@ -26,14 +26,16 @@ def _unpack_args(args):
'''Unpack command line arguments
'''
return args.appdir, args.name, args.python_version, args.linux_tag, \
args.python_tag, args.base_image, args.in_tree_build, args.extra_files
args.python_tag, args.base_image, args.in_tree_build, \
args.extra_data
_tag_pattern = re.compile('python([^-]+)[-]([^.]+)[.]AppImage')
_linux_pattern = re.compile('manylinux([0-9]+)_' + platform.machine())
def execute(appdir, name=None, python_version=None, linux_tag=None,
python_tag=None, base_image=None, in_tree_build=False, extra_files=None):
python_tag=None, base_image=None, in_tree_build=False,
extra_data=None):
'''Build a Python application using a base AppImage
'''
@@ -287,10 +289,15 @@ def execute(appdir, name=None, python_version=None, linux_tag=None,
'--no-warn-script-location', requirement),
exclude=(deprecation + git_warnings))
# Bundle auxilliary application files
if extra_files is not None:
log('BUNDLE', os.path.basename(extra_files))
copy_tree(extra_files, 'AppDir/')
# Bundle auxilliary application data
if extra_data is not None:
for path in extra_data:
basename = os.path.basename(path)
log('BUNDLE', basename)
if os.path.isdir(path):
copy_tree(path, 'AppDir/' + basename)
else:
copy_file(path, 'AppDir/')
# Bundle the entry point
entrypoint_path = glob.glob(appdir + '/entrypoint.*')