try: -b o -p macosx64 -u all -t none draft
authorPhilipp Kewisch <mozilla@kewis.ch>
Tue, 14 Apr 2015 11:46:20 +0200
changeset 29051 71b6385232b949853a9a85e7cc64e32556ea26f3
parent 29048 66d3ae949aee20b7345ac026a94da8ea2d46f35d
push id2331
push usermozilla@kewis.ch
push dateTue, 14 Apr 2015 09:46:32 +0000
treeherdertry-comm-central@71b6385232b9 [default view] [failures only]
try: -b o -p macosx64 -u all -t none
build/client.py-args
mozilla-extral10n.patch
mozilla-unifier.patch
--- a/build/client.py-args
+++ b/build/client.py-args
@@ -1,1 +1,1 @@
---hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --hgtool1=../scripts/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print
+--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print 
new file mode 100644
--- /dev/null
+++ b/mozilla-extral10n.patch
@@ -0,0 +1,16 @@
+# HG changeset patch
+# Date 1428663913 -7200
+# Parent  d13016a31d6f5c7b84f75cd43c6612b0f2de1d72
+Fix bug 1153192 - Cannot pass extra arguments to l10n-repack.py. r=gps
+
+diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
+--- a/toolkit/locales/l10n.mk
++++ b/toolkit/locales/l10n.mk
+@@ -112,6 +112,7 @@
+ 	$(STUB_HOOK)
+ endif
+ 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py $(STAGEDIST) $(DIST)/xpi-stage/locale-$(AB_CD) \
++		$(MOZ_PKG_EXTRAL10N) \
+ 		$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
+ 
+ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
new file mode 100644
--- /dev/null
+++ b/mozilla-unifier.patch
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User Philipp Kewisch <mozilla@kewis.ch>
+# Date 1428839698 -7200
+# Parent  4251a1f9d12d5ee1c4f65a235bb2bb7091223c49
+
+diff --git a/python/mozbuild/mozpack/unify.py b/python/mozbuild/mozpack/unify.py
+--- a/python/mozbuild/mozpack/unify.py
++++ b/python/mozbuild/mozpack/unify.py
+@@ -18,8 +18,10 @@
+ import mozpack.path as mozpath
+ import struct
+ import os
++import re
+ import subprocess
+ from collections import OrderedDict
++import xml.dom.minidom as minidom
+ 
+ 
+ def may_unify_binary(file):
+@@ -167,7 +169,8 @@
+         '''
+         Unify buildconfig.html contents, or defer to UnifiedFinder.unify_file.
+         '''
+-        if mozpath.basename(path) == 'buildconfig.html':
++        basename = mozpath.basename(path)
++        if basename == 'buildconfig.html':
+             content1 = file1.open().readlines()
+             content2 = file2.open().readlines()
+             # Copy everything from the first file up to the end of its <body>,
+@@ -178,7 +181,25 @@
+                 ['<hr> </hr>\n'] +
+                 content2[content2.index('<h1>about:buildconfig</h1>\n') + 1:]
+             ))
+-        if path.endswith('.xpi'):
++        elif basename == 'install.rdf':
++            content1 = file1.open().read()
++            content2 = file2.open().read()
++
++            findTargetPlatform = re.compile(r'<em:targetPlatform>([^<]*)</em:targetPlatform>')
++
++            tp2 = findTargetPlatform.search(content2)
++            if tp2:
++                # If the second file has a target platform, add it to the first
++                # if it also has one.
++                findTargetPlatform.sub(lambda m: m.group(0) + tp2.group(0), content1)
++            else:
++                # If not, then just remove the target platform from the first file
++                findTargetPlatform.sub('', content1)
++
++            # We've done replacing in the first content file
++            return GeneratedFile(content1)
++
++        if path.endswith('.xpi'):
+             finder1 = JarFinder(os.path.join(self._finder1.base, path),
+                                 JarReader(fileobj=file1.open()))
+             finder2 = JarFinder(os.path.join(self._finder2.base, path),