TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

makewheel: support building single-arch .whl from a fat Panda build

Browse Source
This commit is contained in:
rdb 2016-12-26 17:36:38 +01:00
parent fb2568afad
commit 325302b623
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
makepanda/makewheel.py
View File

@ -29,7 +29,7 @@ default_platform = get_platform()
if default_platform.startswith("linux-"): if default_platform.startswith("linux-"):
# Is this manylinux1? # Is this manylinux1?
if os.path.isfile("/lib/libc-2.5.so") and os.path.isdir("/opt/python"): if os.path.isfile("/lib/libc-2.5.so") and os.path.isdir("/opt/python"):
default_platform = platform.replace("linux", "manylinux1") default_platform = default_platform.replace("linux", "manylinux1")
def get_abi_tag(): def get_abi_tag():
@ -75,6 +75,10 @@ def is_mach_o_file(path):
b'\xFE\xED\xFA\xCE', b'\xCE\xFA\xED\xFE', b'\xFE\xED\xFA\xCE', b'\xCE\xFA\xED\xFE',
b'\xFE\xED\xFA\xCF', b'\xCF\xFA\xED\xFE') b'\xFE\xED\xFA\xCF', b'\xCF\xFA\xED\xFE')
def is_fat_file(path):
return os.path.isfile(path) and \
open(path, 'rb').read(4) in (b'\xCA\xFE\xBA\xBE', b'\xBE\xBA\xFE\bCA')
if sys.platform in ('win32', 'cygwin'): if sys.platform in ('win32', 'cygwin'):
is_executable = is_exe_file is_executable = is_exe_file
@ -262,6 +266,7 @@ class WheelFile(object):
def __init__(self, name, version, platform): def __init__(self, name, version, platform):
self.name = name self.name = name
self.version = version self.version = version
self.platform = platform
wheel_name = "{0}-{1}-{2}-{3}-{4}.whl".format( wheel_name = "{0}-{1}-{2}-{3}-{4}.whl".format(
name, version, PY_VERSION, ABI_TAG, platform) name, version, PY_VERSION, ABI_TAG, platform)
@ -285,7 +290,7 @@ class WheelFile(object):
self.dep_paths[dep] = None self.dep_paths[dep] = None
if dep.lower().startswith("python"): if dep.lower().startswith("python") or os.path.basename(dep).startswith("libpython"):
# Don't include the Python library. # Don't include the Python library.
return return
@ -339,6 +344,18 @@ class WheelFile(object):
suffix = '.dylib' suffix = '.dylib'
temp = tempfile.NamedTemporaryFile(suffix=suffix, prefix='whl', delete=False) temp = tempfile.NamedTemporaryFile(suffix=suffix, prefix='whl', delete=False)
# On macOS, if no fat wheel was requested, extract the right architecture.
if sys.platform == "darwin" and is_fat_file(source_path) and not self.platform.endswith("_intel"):
if self.platform.endswith("_x86_64"):
arch = 'x86_64'
else:
arch = self.platform.split('_')[-1]
subprocess.call(['lipo', source_path, '-extract', arch, '-output', temp.name])
else:
# Otherwise, just copy it over.
temp.write(open(source_path, 'rb').read())
temp.write(open(source_path, 'rb').read()) temp.write(open(source_path, 'rb').read())
os.fchmod(temp.fileno(), os.fstat(temp.fileno()).st_mode | 0o111) os.fchmod(temp.fileno(), os.fstat(temp.fileno()).st_mode | 0o111)
temp.close() temp.close()
@ -578,4 +595,4 @@ if __name__ == "__main__":
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
SetVerbose(options.verbose) SetVerbose(options.verbose)
makewheel(options.version, options.outputdir) makewheel(options.version, options.outputdir, options.platform)