Follow-up to bug 999524 - Stop L10n builds using hgtool as this currently doesn't work correctly. a=Standard8 DONTBUILD
authorMark Banner <standard8@mozilla.com>
Wed, 23 Apr 2014 08:34:19 +0100
changeset 19446 f33a09c318a931a48057d03b9fa4077afb39fe68
parent 19445 e48898cc52b557cec255dbd5302e24543695d795
child 19447 11652d472686f3875124b518c8a93f27ce0a4bfc
child 19449 2ec489b6bdcd8e42bff90722088eb3d3e16f77cd
child 19452 a1d2ffe4fa60368dab298c819103526b6126dd97
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 DONTBUILD
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 --skip-venkman --tinderbox-print
+--hg-options='--time' --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --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 not os.path.exists(PYMAKE):
         clientpyargs = open(CLIENT_PY_ARGS, "r").read().strip()
         clientpyargs = shlex.split(clientpyargs)
         subprocess.check_call([sys.executable, CLIENT_PY, "checkout"] +
                               clientpyargs)