Bug 1230067 - Normalize install target when processing JarManifestParser data in FasterMake backend. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 03 Dec 2015 17:08:56 +0900
changeset 309855 adbd5c905a16bec519550eb3b9f5f83cbe972608
parent 309854 a788c06e448a1082edc1818552953422a61a8ba2
child 309856 48f854ba48c09b38b05208ce8513cbc452af35fc
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1230067
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1230067 - Normalize install target when processing JarManifestParser data in FasterMake backend. r=gps The loop addon jar.mn data uses '.' as base, and join(path, '.') returns '{path}/.'. So normalize that so that it becomes '{path}'.
python/mozbuild/mozbuild/backend/fastermake.py
--- a/python/mozbuild/mozbuild/backend/fastermake.py
+++ b/python/mozbuild/mozbuild/backend/fastermake.py
@@ -133,17 +133,18 @@ class FasterMakeBackend(CommonBackend):
         )
         pp.out = JarManifestParser()
         pp.do_include(obj.path)
         self.backend_input_files |= pp.includes
 
         for jarinfo in pp.out:
             install_target = obj.install_target
             if jarinfo.base:
-                install_target = mozpath.join(install_target, jarinfo.base)
+                install_target = mozpath.normpath(
+                    mozpath.join(install_target, jarinfo.base))
             for e in jarinfo.entries:
                 if e.is_locale:
                     if jarinfo.relativesrcdir:
                         path = mozpath.join(self.environment.topsrcdir,
                                             jarinfo.relativesrcdir)
                     else:
                         path = mozpath.dirname(obj.path)
                     src = mozpath.join( path, 'en-US', e.source)