Backed out changeset 8e9ad372486b (bug 1257416)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 17 Mar 2016 16:03:32 +0100
changeset 327004 2eb638fcc480cb7ed83a3a37f1fe488ef0bd3c01
parent 327003 f4095779c96f0a10f6fc659d013458506e95cfa9
child 327005 3e04659fdf6aef792f7cf9840189c6c38d08d1e8
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1257416
milestone48.0a1
backs out8e9ad372486b3a6957a812b0a58c606760bb0d79
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8e9ad372486b (bug 1257416)
b2g/common.configure
b2g/dev/moz.configure
b2g/graphene/moz.configure
b2g/moz.configure
build/moz.configure/init.configure
mobile/android/b2gdroid/moz.configure
old-configure.in
deleted file mode 100644
--- a/b2g/common.configure
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-# Truetype fonts for B2G
-# ==============================================================
-option(env='MOZTTDIR', nargs=1, help='Path to truetype fonts for B2G')
-
-@depends('MOZTTDIR')
-def mozttdir(value):
-    if value:
-        path = value[0]
-        if not os.path.isdir(path):
-            error('MOZTTDIR "%s" is not a valid directory' % path)
-        set_config('MOZTTDIR', path)
-        set_define('PACKAGE_MOZTT', '1')
-
-
-include('../toolkit/moz.configure')
--- a/b2g/dev/moz.configure
+++ b/b2g/dev/moz.configure
@@ -1,7 +1,7 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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('../common/moz.configure')
+include('../../toolkit/moz.configure')
--- a/b2g/graphene/moz.configure
+++ b/b2g/graphene/moz.configure
@@ -1,7 +1,7 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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('../common.configure')
+include('../../toolkit/moz.configure')
--- a/b2g/moz.configure
+++ b/b2g/moz.configure
@@ -6,9 +6,9 @@
 
 option('--with-gonk', nargs=1, help='Path to the gonk base directory')
 
 @depends('--with-gonk')
 def gonkdir(value):
     return value[0] if value else ''
 
 
-include('common.configure')
+include('../toolkit/moz.configure')
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -256,17 +256,16 @@ def wanted_mozconfig_variables(help):
          'EXTERNAL_SOURCE_DIR',
          'GENISOIMAGE',
          'L10NBASEDIR',
          'MOZILLABUILD',
          'MOZ_ARTIFACT_BUILDS',
          'MOZ_BUILD_APP',
          'MOZ_FMP4',
          'MOZ_INSTRUMENT_EVENT_LOOP',
-         'MOZTTDIR',
          'PERL',
          'RPMBUILD',
          'TAR',
          'UNZIP',
          'USE_FC_FREETYPE',
          'WITHOUT_X',
          'XARGS',
          'ZIP',
--- a/mobile/android/b2gdroid/moz.configure
+++ b/mobile/android/b2gdroid/moz.configure
@@ -1,7 +1,7 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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('../../../b2g/common.configure')
+include('../../../toolkit/moz.configure')
--- a/old-configure.in
+++ b/old-configure.in
@@ -91,16 +91,25 @@ 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
 
+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
+
 MOZ_ARG_WITH_STRING(gonk-toolchain-prefix,
 [  --with-gonk-toolchain-prefix=DIR
                           prefix to gonk toolchain commands],
     gonk_toolchain_prefix=$withval)
 
 if test -n "$gonkdir" ; then
     dnl export for js/src/configure. We can't pass the option down normally,
     dnl because it's a `--enable-project=b2g`-only option.