Follow-up to bug 999524 - Stop L10n builds using hgtool as this currently doesn't work correctly. a=Standard8,ba=Standard8 CLOSED TREE SEAMONKEY_2_32b1_BUILD1 SEAMONKEY_2_32b1_RELEASE
authorMark Banner <standard8@mozilla.com>
Wed, 23 Apr 2014 08:34:19 +0100
changeset 21063 219e12aa22c12358d14d4fea1421084886c20380
parent 21062 bdeb33bc6bc7a90ab0da54fd1740d170181cb669
child 21064 8158519c5e3ba69986c73b113c19858f111ad04a
child 21066 1a6452fefaa89335937e1df55ddf99f41231c180
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs999524
Follow-up to bug 999524 - Stop L10n builds using hgtool as this currently doesn't work correctly. a=Standard8,ba=Standard8 CLOSED TREE
build/client.py-l10n-args
build/pymake/make.py
--- a/build/client.py-l10n-args
+++ b/build/client.py-l10n-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
--- a/build/pymake/make.py
+++ b/build/pymake/make.py
@@ -12,17 +12,17 @@ import subprocess
 import shlex
 
 def getpath(relpath):
     thisdir = os.path.dirname(__file__)
     return os.path.abspath(os.path.join(thisdir, *relpath))
 
 PYMAKE = getpath(["..", "..", "mozilla", "build", "pymake", "make.py"])
 CLIENT_PY = getpath(["..", "..", "client.py"])
-CLIENT_PY_ARGS = getpath(["..", "client.py-args"])
+CLIENT_PY_ARGS = getpath(["..", "client.py-l10n-args"])
 
 def main(args):
     if 'TINDERBOX_OUTPUT' in os.environ:
         # When building on mozilla build slaves, execute mozmake instead. Until bug
         # 978211, this is the easiest, albeit hackish, way to do this.
         mozmake = os.path.join(os.path.dirname(__file__), '..', '..',
             'mozmake.exe')
         if os.path.exists(mozmake):