1
0
Fork 0
forked from len0rd/rockbox

deploy: Add missing Windows system libraries to known list.

Building with mxe failed due to the toolchain (and Qt5) introducing
dependencies to system libraries we don't know about. Commit 3083abeb95
thus ignored the actual problem. Revert that and instead add the missing
system libraries to the list of known libraries.

Change-Id: I29ac296765e580b751d3d906d58ab563d05efde2
This commit is contained in:
Dominik Riebeling 2019-11-17 11:25:37 +01:00
parent 504f488cce
commit aefbc13e19

View file

@ -57,11 +57,21 @@ except ImportError:
# == Global stuff == # == Global stuff ==
# DLL files to ignore when searching for required DLL files. # DLL files to ignore when searching for required DLL files.
systemdlls = ['advapi32.dll', systemdlls = [
'advapi32.dll',
'comdlg32.dll', 'comdlg32.dll',
'crypt32.dll',
'd3d9.dll',
'dwmapi.dll',
'dxva2.dll',
'evr.dll',
'gdi32.dll', 'gdi32.dll',
'imm32.dll', 'imm32.dll',
'imm32.dll',
'iphlpapi.dll',
'kernel32.dll', 'kernel32.dll',
'mf.dll',
'mfplat.dll',
'msvcrt.dll', 'msvcrt.dll',
'msvcrt.dll', 'msvcrt.dll',
'netapi32.dll', 'netapi32.dll',
@ -70,9 +80,14 @@ systemdlls = ['advapi32.dll',
'setupapi.dll', 'setupapi.dll',
'shell32.dll', 'shell32.dll',
'user32.dll', 'user32.dll',
'userenv.dll',
'uxtheme.dll',
'version.dll',
'winmm.dll', 'winmm.dll',
'winspool.drv', 'winspool.drv',
'ws2_32.dll'] 'ws2_32.dll',
'wtsapi32.dll'
]
gitrepo = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) gitrepo = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
@ -347,7 +362,7 @@ def zipball(programfiles, versionstring, buildfolder, platform=sys.platform):
for f in programfiles: for f in programfiles:
if re.match(r'^(/|[a-zA-Z]:)', f) != None: if re.match(r'^(/|[a-zA-Z]:)', f) != None:
shutil.copy(f, outfolder) shutil.copy(f, outfolder)
elif len(f) > 0: else:
shutil.copy(buildfolder + "/" + f, outfolder) shutil.copy(buildfolder + "/" + f, outfolder)
# create zipball from output folder # create zipball from output folder
zf = zipfile.ZipFile(archivename, mode='w', compression=zipfile.ZIP_DEFLATED) zf = zipfile.ZipFile(archivename, mode='w', compression=zipfile.ZIP_DEFLATED)