Backed out changeset 9475e3ef6a44 (bug 1217276)

This commit is contained in:
Wes Kocher 2015-10-30 10:11:43 -07:00
parent 9b4b36e1bc
commit 51bf70ed8a

View File

@ -215,12 +215,10 @@ class FasterMakeBackend(CommonBackend):
install_target = mozpath.join(install_target, jarinfo.base) install_target = mozpath.join(install_target, jarinfo.base)
for e in jarinfo.entries: for e in jarinfo.entries:
if e.is_locale: if e.is_locale:
if jarinfo.relativesrcdir: src = mozpath.join(
path = mozpath.join(self.environment.topsrcdir, jarinfo.relativesrcdir or mozpath.dirname(obj.path),
jarinfo.relativesrcdir) 'en-US',
else: e.source)
path = mozpath.dirname(obj.path)
src = mozpath.join( path, 'en-US', e.source)
elif e.source.startswith('/'): elif e.source.startswith('/'):
src = mozpath.join(self.environment.topsrcdir, src = mozpath.join(self.environment.topsrcdir,
e.source[1:]) e.source[1:])