Bug 619258 - Release l10n repacks fail due to missing env variable. r=bhearsum
authorRail Aliev <rail@mozilla.com>
Wed, 15 Dec 2010 13:23:53 -0800
changeset 1007 2f2bcc5d348e5038377a5a1c9595ce51cc3e9ce2
parent 1006 3cb98f456c67dc2d3b7eb988b613d95a26435d0b
child 1008 0df9584ea07525f3278177a824b4b37e6b9f70bb
push id708
push userraliiev@mozilla.com
push dateWed, 15 Dec 2010 21:24:19 +0000
reviewersbhearsum
bugs619258
Bug 619258 - Release l10n repacks fail due to missing env variable. r=bhearsum
lib/python/build/l10n.py
--- a/lib/python/build/l10n.py
+++ b/lib/python/build/l10n.py
@@ -1,14 +1,15 @@
-import os
+import os, sys
 from os import path
 import shutil
 
 from util.commands import run_cmd
 from util.hg import mercurial, update
+from util.paths import windows2msys
 
 import logging
 log = logging.getLogger(__name__)
 
 def compareLocales(repo, locale, l10nRepoDir, localeSrcDir, l10nIni,
                    revision="default", merge=True):
     mercurial(repo, "compare-locales")
     update("compare-locales", revision=revision)
@@ -38,10 +39,12 @@ def repackLocale(locale, l10nRepoDir, l1
     localeDir = path.join(l10nRepoDir, locale)
     mercurial(repo, localeDir)
     update(localeDir, revision=revision)
     
     compareLocales(compareLocalesRepo, locale, l10nRepoDir, localeSrcDir,
                    l10nIni, revision=revision, merge=merge)
     env["AB_CD"] = locale
     env["LOCALE_MERGEDIR"] = path.abspath(path.join(localeSrcDir, "merged"))
+    if sys.platform.startswith('win'):
+        env["LOCALE_MERGEDIR"] = windows2msys(env["LOCALE_MERGEDIR"])
     run_cmd(["make", "installers-%s" % locale], cwd=localeSrcDir, env=env)
     run_cmd(["make", "l10n-upload-%s" % locale], cwd=localeSrcDir, env=env)