mozilla-inbound: changeset 277915:cce5cfe52a3db8bbabf8539c5715f62793715c9f

author	Mike Hommey <mh+mozilla@glandium.org>
	Thu, 24 Dec 2015 14:26:55 +0900
changeset 277915	cce5cfe52a3db8bbabf8539c5715f62793715c9f
parent 277914	40ae4d686d46eccff4710ec13f0103fe370be66d
child 277916	7880d2168cf7f4f4158c0ee34e0566ce10b29995
push id	69650
push user	mh@glandium.org
push date	Wed, 30 Dec 2015 22:08:21 +0000
treeherder	mozilla-inbound@70708efd7d3b [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	gps
bugs	1235021
milestone	46.0a1
first release with	nightly linux32 ce643acfab14 / 46.0a1 / 20160102030217 / files nightly linux64 ce643acfab14 / 46.0a1 / 20160102030217 / files nightly mac ce643acfab14 / 46.0a1 / 20160102030217 / files nightly win32 ce643acfab14 / 46.0a1 / 20160102030217 / files nightly win64 ce643acfab14 / 46.0a1 / 20160102030217 / files
last release without	nightly linux32 c690c50b2b54 / 46.0a1 / 20151230030234 / files nightly linux64 c690c50b2b54 / 46.0a1 / 20151230030234 / files nightly mac c690c50b2b54 / 46.0a1 / 20151230030234 / files nightly win32 c690c50b2b54 / 46.0a1 / 20151230030234 / files nightly win64 c690c50b2b54 / 46.0a1 / 20151230030234 / files

Bug 1235021 - Normalize paths from jar manifests before putting them in an install manifest in the FasterMake backend. r=gps This is not necessary in itself, but allows to confirm that further changes, which are going to normalize paths as a side effect, are idempotent.

python/mozbuild/mozbuild/backend/fastermake.py

file | annotate | diff | comparison | revisions

--- a/python/mozbuild/mozbuild/backend/fastermake.py
+++ b/python/mozbuild/mozbuild/backend/fastermake.py
@@ -148,16 +148,17 @@ class FasterMakeBackend(CommonBackend):
                         path = mozpath.dirname(obj.path.full_path)
                     src = mozpath.join( path, 'en-US', e.source)
                 elif e.source.startswith('/'):
                     src = mozpath.join(self.environment.topsrcdir,
                                        e.source[1:])
                 else:
                     src = mozpath.join(mozpath.dirname(obj.path.full_path), e.source)
 
+                src = mozpath.normpath(src)
                 if '*' in e.source:
                     if e.preprocess:
                         raise Exception('%s: Wildcards are not supported with '
                                         'preprocessing' % obj.path)
                     def _prefix(s):
                         for p in s.split('/'):
                             if '*' not in p:
                                 yield p + '/'