Backed out changeset 818165fa787b (bug 1257415) for breaking l10n nightly's
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 17 Mar 2016 16:03:55 +0100
changeset 314306 3e04659fdf6aef792f7cf9840189c6c38d08d1e8
parent 314305 2eb638fcc480cb7ed83a3a37f1fe488ef0bd3c01
child 314335 cfc060dca9c59e5265379c871b0ce176e592fb08
child 314430 36f776f1b40f8b513a5bfe1efa747f47eb43c0c0
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-esr52@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1257415
milestone48.0a1
backs out818165fa787be468db341547028cbeae2898bd39
Backed out changeset 818165fa787b (bug 1257415) for breaking l10n nightly's
build/moz.configure/init.configure
build/moz.configure/old.configure
old-configure.in
toolkit/moz.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -250,17 +250,16 @@ def wanted_mozconfig_variables(help):
          'AUTOCONF',
          'AWK',
          'DISABLE_EXPORT_JS',
          'DISABLE_SHARED_JS',
          'DOXYGEN',
          'DSYMUTIL',
          'EXTERNAL_SOURCE_DIR',
          'GENISOIMAGE',
-         'L10NBASEDIR',
          'MOZILLABUILD',
          'MOZ_ARTIFACT_BUILDS',
          'MOZ_BUILD_APP',
          'MOZ_FMP4',
          'MOZ_INSTRUMENT_EVENT_LOOP',
          'PERL',
          'RPMBUILD',
          'TAR',
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -330,16 +330,17 @@ def old_configure_options(*options):
     '--with-gonk-toolchain-prefix',
     '--with-google-api-keyfile',
     '--with-google-oauth-api-keyfile',
     '--with-gradle',
     '--with-intl-api',
     '--with-ios-sdk',
     '--with-java-bin-path',
     '--with-jitreport-granularity',
+    '--with-l10n-base',
     '--with-linux-headers',
     '--with-macbundlename-prefix',
     '--with-macos-private-frameworks',
     '--with-macos-sdk',
     '--with-mozilla-api-keyfile',
     '--with-nspr-prefix',
     '--with-nspr-cflags',
     '--with-nspr-libs',
--- a/old-configure.in
+++ b/old-configure.in
@@ -91,16 +91,30 @@ dnl ====================================
 _topsrcdir=`cd \`dirname $0\`; pwd -W 2>/dev/null || pwd -P`
 _objdir=`pwd -P`
 
 MOZ_BUILD_ROOT=`pwd -W 2>/dev/null || pwd -P`
 DIST="$MOZ_BUILD_ROOT/dist"
 
 MOZ_DEFAULT_COMPILER
 
+MOZ_ARG_WITH_STRING(l10n-base,
+[  --with-l10n-base=DIR    path to l10n repositories],
+    L10NBASEDIR=$withval)
+if test -n "$L10NBASEDIR"; then
+    if test "$L10NBASEDIR" = "yes" -o "$L10NBASEDIR" = "no"; then
+        AC_MSG_ERROR([--with-l10n-base must specify a path])
+    elif test -d "$L10NBASEDIR"; then
+        L10NBASEDIR=`cd "$L10NBASEDIR" && pwd -P`
+    else
+        AC_MSG_ERROR([Invalid value --with-l10n-base, $L10NBASEDIR doesn't exist])
+    fi
+fi
+AC_SUBST(L10NBASEDIR)
+
 if test -n "$MOZTTDIR" -a ! -d "$MOZTTDIR" ; then
     AC_MSG_ERROR([MOZTTDIR '$MOZTTDIR' isn't a valid directory])
 fi
 
 AC_SUBST(MOZTTDIR)
 if test -n "$MOZTTDIR" ; then
     AC_DEFINE(PACKAGE_MOZTT)
 fi
@@ -1779,16 +1793,24 @@ case "$target" in
     AC_DEFINE(HW_THREADS)
     AC_DEFINE(STDC_HEADERS)
     AC_DEFINE(WIN32_LEAN_AND_MEAN)
     dnl See http://support.microsoft.com/kb/143208 to use STL
     AC_DEFINE(NOMINMAX)
     BIN_SUFFIX='.exe'
     MOZ_USER_DIR="Mozilla"
 
+    case "$host" in
+    *-mingw*)
+        if test -n "$L10NBASEDIR"; then
+            L10NBASEDIR=`cd $L10NBASEDIR && pwd -W`
+        fi
+        ;;
+    esac
+
     case "$host_os" in
     cygwin*|msvc*|mks*)
         AC_MSG_ERROR([Using a Cygwin build environment is unsupported. Configure cannot check for presence of necessary headers. Please upgrade to MozillaBuild; see https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
         ;;
     esac
 
     case "$target" in
     i*86-*)
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -2,30 +2,16 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include('../js/moz.configure')
 
 
-# L10N
-# ==============================================================
-option('--with-l10n-base', env='L10NBASEDIR', help='Path to l10n repositories')
-
-@depends('--with-l10n-base')
-def l10n_base(value):
-    if value:
-        path = value[0]
-        if not os.path.isdir(path):
-            error("Invalid value --with-l10n-base, %s doesn't exist" % path)
-
-        set_config('L10NBASEDIR', os.path.realpath(os.path.abspath(path)))
-
-
 # Default toolkit
 # ==============================================================
 # Normally, we'd want to use the `default` field on the option, but that
 # requires --target to be resolved at --help time, which requires to run
 # config.guess, which we want to avoid. Even better, we could actually set
 # `choices` depending on the target, but that doesn't pan out for the same
 # reason.
 option('--enable-default-toolkit', nargs=1,