Bug 1257326 - Move MOZ_PLACES to Python configure. draft
authorChris Manchester <cmanchester@mozilla.com>
Mon, 09 May 2016 15:20:16 -0700
changeset 365029 07bbdd23ad0c071281f9242f8afa09bbfcfab0a6
parent 365028 f1ab1ae4ca4dd92fcc0e82dfb14b2e60a2637a23
child 365030 97240b3cba027c0f272cbe10c125a3f5a63fc47e
push id17617
push usercmanchester@mozilla.com
push dateMon, 09 May 2016 22:22:03 +0000
bugs1257326
milestone49.0a1
Bug 1257326 - Move MOZ_PLACES to Python configure. MozReview-Commit-ID: 9bs9waY0XVP
b2g/confvars.sh
browser/moz.configure
embedding/ios/confvars.sh
embedding/ios/moz.configure
mobile/android/confvars.sh
old-configure.in
python/mozbuild/mozbuild/configure/__init__.py
toolkit/moz.configure
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -46,17 +46,16 @@ MOZ_XULRUNNER=
 
 MOZ_APP_ID={3c2e2abc-06d4-11e1-ac3b-374f68613e61}
 
 MOZ_TIME_MANAGER=1
 
 MOZ_SIMPLEPUSH=1
 MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
-MOZ_PLACES=
 MOZ_B2G=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_NUWA_PROCESS=1
 MOZ_B2G_LOADER=1
 MOZ_ENABLE_WARNINGS_AS_ERRORS=1
 fi
 
--- a/browser/moz.configure
+++ b/browser/moz.configure
@@ -1,7 +1,9 @@
 # -*- 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/.
 
+imply_option('MOZ_PLACES', True)
+
 include('../toolkit/moz.configure')
--- a/embedding/ios/confvars.sh
+++ b/embedding/ios/confvars.sh
@@ -2,14 +2,13 @@
 # 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/.
 
 MOZ_APP_NAME=geckoembed
 MOZ_APP_DISPLAYNAME=GeckoEmbed
 MOZ_UPDATER=
 MOZ_APP_VERSION=$MOZILLA_VERSION
-MOZ_PLACES=1
 MOZ_EXTENSIONS_DEFAULT=" gio"
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_SYNC=1
 MOZ_SERVICES_HEALTHREPORT=1
--- a/embedding/ios/moz.configure
+++ b/embedding/ios/moz.configure
@@ -1,5 +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/.
+
+imply_option('MOZ_PLACES', True)
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -26,17 +26,16 @@ MOZ_ANDROID_SEARCH_INTENT_CLASS=org.mozi
 MOZ_SAFE_BROWSING=1
 
 MOZ_NO_SMART_CARDS=1
 
 MOZ_XULRUNNER=
 
 MOZ_CAPTURE=1
 MOZ_RAW=1
-MOZ_PLACES=
 MOZ_SOCIAL=
 MOZ_ANDROID_HISTORY=1
 
 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
 
 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 
--- a/old-configure.in
+++ b/old-configure.in
@@ -2687,17 +2687,16 @@ MOZ_WEBSPEECH_TEST_BACKEND=1
 VPX_USE_YASM=
 VPX_ASFLAGS=
 VPX_AS_CONVERSION=
 VPX_X86_ASM=
 VPX_ARM_ASM=
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 MOZ_PERMISSIONS=1
-MOZ_PLACES=1
 MOZ_SOCIAL=1
 MOZ_PREF_EXTENSIONS=1
 MOZ_REFLOW_PERF=
 MOZ_SAFE_BROWSING=
 MOZ_HELP_VIEWER=
 MOZ_SPELLCHECK=1
 MOZ_TOOLKIT_SEARCH=1
 MOZ_UI_LOCALE=en-US
@@ -6615,21 +6614,16 @@ MOZ_ARG_DISABLE_BOOL(ctypes,
 [  --disable-ctypes        Disable js-ctypes],
     BUILD_CTYPES=,
     BUILD_CTYPES=1)
 AC_SUBST(BUILD_CTYPES)
 if test "$BUILD_CTYPES"; then
     AC_DEFINE(BUILD_CTYPES)
 fi
 
-dnl Build Places if required
-if test "$MOZ_PLACES"; then
-  AC_DEFINE(MOZ_PLACES)
-fi
-
 dnl Build SocialAPI if required
 if test "$MOZ_SOCIAL"; then
   AC_DEFINE(MOZ_SOCIAL)
 fi
 
 dnl Build Common JS modules provided by services.
 AC_SUBST(MOZ_SERVICES_COMMON)
 if test -n "$MOZ_SERVICES_COMMON"; then
@@ -6694,17 +6688,16 @@ AC_SUBST(BIN_FLAGS)
 AC_SUBST(MOZ_AUTH_EXTENSION)
 AC_SUBST(MOZ_PREF_EXTENSIONS)
 AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_SYMBOLS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST_SET(MOZ_EXTENSIONS)
 AC_SUBST(LIBICONV)
-AC_SUBST(MOZ_PLACES)
 AC_SUBST(MOZ_SOCIAL)
 AC_SUBST(MOZ_TOOLKIT_SEARCH)
 AC_SUBST(MOZ_FEEDS)
 AC_SUBST(NS_PRINTING)
 AC_SUBST(MOZ_HELP_VIEWER)
 
 AC_SUBST(JAVA)
 AC_SUBST(JAVAC)
--- a/python/mozbuild/mozbuild/configure/__init__.py
+++ b/python/mozbuild/mozbuild/configure/__init__.py
@@ -313,16 +313,17 @@ class ConfigureSandbox(dict):
 
     @memoize
     def _value_for_option(self, option):
         implied = {}
         for implied_option in self._implied_options[:]:
             if implied_option.name not in (option.name, option.env):
                 continue
             self._implied_options.remove(implied_option)
+            print(implied_option.reason)
 
             value = self._resolve(implied_option.value,
                                   need_help_dependency=False)
 
             if value is not None:
                 if isinstance(value, OptionValue):
                     pass
                 elif value is True:
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -390,14 +390,19 @@ def omnijar_name(toolkit):
     # as rooted at / and not as rooted at assets/ (which again is
     # not the case on desktop: there are omnijars rooted at webrtc/,
     # etc). packager.mk handles changing the rooting of the single
     # omnijar.
     return 'assets/omni.ja' if toolkit == 'android' else 'omni.ja'
 
 set_config('OMNIJAR_NAME', omnijar_name)
 
+project_flag('MOZ_PLACES',
+             help='Build Places if required',
+             set_for_old_configure=True,
+             set_as_define=True)
+
 # Miscellaneous programs
 # ==============================================================
 
 check_prog('TAR', ('gnutar', 'gtar', 'tar'))
 check_prog('UNZIP', ('unzip',))
 check_prog('ZIP', ('zip',))