Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 19:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge mozilla-central to mozilla-inbound. r=merge a=merge

Browse Source
This commit is contained in:
Sebastian Hengst 2017-11-16 18:44:51 +02:00
commit f9ef12a248
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/mozbuild/mozpack/manifests.py
View File

@ -282,7 +282,7 @@ class InstallManifest(object):
<base>/foo/bar.h -> <dest>/foo/bar.h <base>/foo/bar.h -> <dest>/foo/bar.h
""" """
self._add_entry(mozpath.join(dest, pattern), self._add_entry(mozpath.join(base, pattern, dest),
(self.PATTERN_LINK, base, pattern, dest)) (self.PATTERN_LINK, base, pattern, dest))
def add_pattern_copy(self, base, pattern, dest): def add_pattern_copy(self, base, pattern, dest):
@ -290,7 +290,7 @@ class InstallManifest(object):
See ``add_pattern_link()`` for usage. See ``add_pattern_link()`` for usage.
""" """
self._add_entry(mozpath.join(dest, pattern), self._add_entry(mozpath.join(base, pattern, dest),
(self.PATTERN_COPY, base, pattern, dest)) (self.PATTERN_COPY, base, pattern, dest))
def add_preprocess(self, source, dest, deps, marker='#', defines={}, def add_preprocess(self, source, dest, deps, marker='#', defines={},