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

deploy-ng: don't warn about missing Windows system libraries

Browse Source
This commit is contained in:
rdb 2017-11-22 20:05:50 +01:00
parent da2ad0f0bc
commit 80b6021d22
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,14 @@ class build_apps(distutils.core.Command):
self.build_scripts= { self.build_scripts= {
'.egg': ('.bam', 'egg2bam -o {1} {0}'), '.egg': ('.bam', 'egg2bam -o {1} {0}'),
} }
self.exclude_dependencies = [] self.exclude_dependencies = [
'kernel32.dll', 'user32.dll', 'wsock32.dll', 'ws2_32.dll',
'advapi32.dll', 'opengl32.dll', 'glu32.dll', 'gdi32.dll',
'shell32.dll', 'ntdll.dll', 'ws2help.dll', 'rpcrt4.dll',
'imm32.dll', 'ddraw.dll', 'shlwapi.dll', 'secur32.dll',
'dciman32.dll', 'comdlg32.dll', 'comctl32.dll', 'ole32.dll',
'oleaut32.dll', 'gdiplus.dll', 'winmm.dll', 'iphlpapi.dll',
'msvcrt.dll', 'kernelbase.dll', 'msimg32.dll', 'msacm32.dll']
# We keep track of the zip files we've opened. # We keep track of the zip files we've opened.
self._zip_files = {} self._zip_files = {}
@ -347,7 +354,7 @@ class build_apps(distutils.core.Command):
# We've already added it earlier. # We've already added it earlier.
return return
if name in self.exclude_dependencies: if name.lower() in self.exclude_dependencies:
return return
for dir in search_path: for dir in search_path:
@ -395,7 +402,7 @@ class build_apps(distutils.core.Command):
# Warn if we can't find it, but only once. # Warn if we can't find it, but only once.
self.warn("could not find dependency {0} (referenced by {1})".format(name, referenced_by)) self.warn("could not find dependency {0} (referenced by {1})".format(name, referenced_by))
self.exclude_dependencies.append(name) self.exclude_dependencies.append(name.lower())
def copy_with_dependencies(self, source_path, target_path, search_path): def copy_with_dependencies(self, source_path, target_path, search_path):
""" Copies source_path to target_path. It also scans source_path for """ Copies source_path to target_path. It also scans source_path for
@ -434,7 +441,9 @@ class build_apps(distutils.core.Command):
# It's a Windows DLL or EXE file. # It's a Windows DLL or EXE file.
pe = pefile.PEFile() pe = pefile.PEFile()
pe.read(fp) pe.read(fp)
deps = pe.imports for lib in pe.imports:
if not lib.lower().startswith('api-ms-win-'):
deps.append(lib)
elif magic == b'\x7FELF': elif magic == b'\x7FELF':
# Elf magic. Used on (among others) Linux and FreeBSD. # Elf magic. Used on (among others) Linux and FreeBSD.