|
@@ -1030,12 +1030,9 @@ class build_apps(setuptools.Command):
|
|
|
self.warn("Detected use of tkinter, but tkinter is not specified in requirements.txt!")
|
|
self.warn("Detected use of tkinter, but tkinter is not specified in requirements.txt!")
|
|
|
|
|
|
|
|
# Copy extension modules
|
|
# Copy extension modules
|
|
|
- whl_modules = []
|
|
|
|
|
- whl_modules_ext = ''
|
|
|
|
|
|
|
+ whl_modules = {}
|
|
|
if use_wheels:
|
|
if use_wheels:
|
|
|
# Get the module libs
|
|
# Get the module libs
|
|
|
- whl_modules = []
|
|
|
|
|
-
|
|
|
|
|
for i in p3dwhl.namelist():
|
|
for i in p3dwhl.namelist():
|
|
|
if not i.startswith('deploy_libs/'):
|
|
if not i.startswith('deploy_libs/'):
|
|
|
continue
|
|
continue
|
|
@@ -1050,8 +1047,7 @@ class build_apps(setuptools.Command):
|
|
|
|
|
|
|
|
base = os.path.basename(i)
|
|
base = os.path.basename(i)
|
|
|
module, _, ext = base.partition('.')
|
|
module, _, ext = base.partition('.')
|
|
|
- whl_modules.append(module)
|
|
|
|
|
- whl_modules_ext = ext
|
|
|
|
|
|
|
+ whl_modules[module] = i
|
|
|
|
|
|
|
|
# Make sure to copy any builtins that have shared objects in the
|
|
# Make sure to copy any builtins that have shared objects in the
|
|
|
# deploy libs, assuming they are not already in freezer_extras.
|
|
# deploy libs, assuming they are not already in freezer_extras.
|
|
@@ -1103,7 +1099,7 @@ class build_apps(setuptools.Command):
|
|
|
else:
|
|
else:
|
|
|
# Builtin module, but might not be builtin in wheel libs, so double check
|
|
# Builtin module, but might not be builtin in wheel libs, so double check
|
|
|
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, whl_modules[module])
|
|
|
basename = os.path.basename(source_path)
|
|
basename = os.path.basename(source_path)
|
|
|
#XXX should we remove python version string here too?
|
|
#XXX should we remove python version string here too?
|
|
|
else:
|
|
else:
|
rdb