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

deploy-ng: fix module duplication in build dir (observed on macOS)

Browse Source
This commit is contained in:
rdb 2017-12-21 15:09:44 +01:00
parent 5b2f3bc9bf
commit 4e1fc27d6b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
direct/src/showutil/dist.py
View File

@ -340,7 +340,11 @@ class build_apps(distutils.core.Command):
whl_modules_ext = '.'.join(whl_modules[0].split('.')[1:]) whl_modules_ext = '.'.join(whl_modules[0].split('.')[1:])
whl_modules = [i.split('.')[0] for i in whl_modules] whl_modules = [i.split('.')[0] for i in whl_modules]
# Make sure to copy any builtins that have shared objects in the deploy libs # Make sure to copy any builtins that have shared objects in the
# deploy libs, assuming they are not already in freezer_extras.
for mod, source_path in freezer_extras:
freezer_modules.discard(mod)
for mod in freezer_modules: for mod in freezer_modules:
if mod in whl_modules: if mod in whl_modules:
freezer_extras.add((mod, None)) freezer_extras.add((mod, None))
@ -374,6 +378,7 @@ class build_apps(distutils.core.Command):
if module in whl_modules: if module in whl_modules:
source_path = os.path.join(p3dwhlfn, 'deploy_libs/{}.{}'.format(module, whl_modules_ext))#'{0}/deploy_libs/{1}.{2}'.format(p3dwhlfn, module, whl_modules_ext) source_path = os.path.join(p3dwhlfn, 'deploy_libs/{}.{}'.format(module, whl_modules_ext))#'{0}/deploy_libs/{1}.{2}'.format(p3dwhlfn, module, whl_modules_ext)
basename = os.path.basename(source_path) basename = os.path.basename(source_path)
#XXX should we remove python version string here too?
else: else:
continue continue