wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1240323 - Fix installation of binary components in a subdir of dist/bin for linux artifact builds. r=nalexander

Browse Source 
A recent change regressed this behavior -- while an artifact build runs, it
doesn't load certain "about:" pages due to missing libraries in subdirectories
of dist/bin.
This commit is contained in:
Chris Manchester 2016-01-16 18:13:47 -08:00
parent f993b282e3
commit 36a966a9e4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/mozbuild/mozbuild/artifacts.py
View File

@ -193,7 +193,7 @@ class LinuxArtifactJob(ArtifactJob):
'firefox/plugin-container',
'firefox/updater',
'firefox/webapprt-stub',
'firefox/*.so',
'firefox/**/*.so',
}
def process_package_artifact(self, filename, processed_filename):
@ -208,11 +208,13 @@ class LinuxArtifactJob(ArtifactJob):
if not any(mozpath.match(f.name, p) for p in self.package_artifact_patterns):
continue
basename = mozpath.basename(f.name)
# We strip off the relative "firefox/" bit from the path,
# but otherwise preserve it.
destpath = mozpath.relpath(f.name, "firefox")
self.log(logging.INFO, 'artifact',
{'basename': basename},
'Adding {basename} to processed archive')
writer.add(basename.encode('utf-8'), reader.extractfile(f), mode=f.mode)
{'destpath': destpath},
'Adding {destpath} to processed archive')
writer.add(destpath.encode('utf-8'), reader.extractfile(f), mode=f.mode)
added_entry = True
if not added_entry: