TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

makewheel: add Python DLL before adding panda3d modules

Browse Source 
This should ensure that dependencies of Python (such as VCRUNTIME140.DLL) make it into the deploy_libs folder, rather than the panda3d folder.
This commit is contained in:
rdb 2020-09-14 11:56:25 +02:00
parent c646924f03
commit 7711757d3d
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
makepanda/makewheel.py
View File

@ -604,6 +604,26 @@ def makewheel(version, output_dir, platform=None):
whl.ignore_deps.update(MANYLINUX_LIBS) whl.ignore_deps.update(MANYLINUX_LIBS)
# Add libpython for deployment.
if sys.platform in ('win32', 'cygwin'):
pylib_name = 'python{0}{1}.dll'.format(*sys.version_info)
pylib_path = os.path.join(get_config_var('BINDIR'), pylib_name)
elif sys.platform == 'darwin':
pylib_name = 'libpython{0}.{1}.dylib'.format(*sys.version_info)
pylib_path = os.path.join(get_config_var('LIBDIR'), pylib_name)
else:
pylib_name = get_config_var('LDLIBRARY')
pylib_arch = get_config_var('MULTIARCH')
libdir = get_config_var('LIBDIR')
if pylib_arch and os.path.exists(os.path.join(libdir, pylib_arch, pylib_name)):
pylib_path = os.path.join(libdir, pylib_arch, pylib_name)
else:
pylib_path = os.path.join(libdir, pylib_name)
# If Python was linked statically, we don't need to include this.
if not pylib_name.endswith('.a'):
whl.write_file('deploy_libs/' + pylib_name, pylib_path)
# Add the trees with Python modules. # Add the trees with Python modules.
whl.write_directory('direct', direct_dir) whl.write_directory('direct', direct_dir)
@ -723,26 +743,6 @@ __version__ = '{0}'
whl.write_file(info_dir + '/README.md', readme_src) whl.write_file(info_dir + '/README.md', readme_src)
whl.write_file_data(info_dir + '/top_level.txt', 'direct\npanda3d\npandac\npanda3d_tools\n') whl.write_file_data(info_dir + '/top_level.txt', 'direct\npanda3d\npandac\npanda3d_tools\n')
# Add libpython for deployment
if sys.platform in ('win32', 'cygwin'):
pylib_name = 'python{0}{1}.dll'.format(*sys.version_info)
pylib_path = os.path.join(get_config_var('BINDIR'), pylib_name)
elif sys.platform == 'darwin':
pylib_name = 'libpython{0}.{1}.dylib'.format(*sys.version_info)
pylib_path = os.path.join(get_config_var('LIBDIR'), pylib_name)
else:
pylib_name = get_config_var('LDLIBRARY')
pylib_arch = get_config_var('MULTIARCH')
libdir = get_config_var('LIBDIR')
if pylib_arch and os.path.exists(os.path.join(libdir, pylib_arch, pylib_name)):
pylib_path = os.path.join(libdir, pylib_arch, pylib_name)
else:
pylib_path = os.path.join(libdir, pylib_name)
# If Python was linked statically, we don't need to include this.
if not pylib_name.endswith('.a'):
whl.write_file('deploy_libs/' + pylib_name, pylib_path)
whl.close() whl.close()