moz.build
author Nathan Froyd <froydnj@mozilla.com>
Thu, 11 Apr 2013 16:57:54 -0400
changeset 128513 ebcfc07b631511d2a5c9bd52abbe2ff76428a10f
parent 126870 5f4f68f0041964124afe3ee7012de446c946c2df
child 140647 77fcbb01366c192ba85567cf361de2a073eb45c3
permissions -rw-r--r--
Bug 860860 - followup: fix json.dump call and be more explicit about object ordering; r=gps It turns out the simple s/simplejson/json/ didn't work because build_tooltool_manifest used item_sort_key to ensure that the objects read in were written out in the same order. This scheme was brittle, since it only understand a couple of keys from the manifest file, and it doesn't work with the stdlib json. Instead, use object_pairs_hook=collections.OrderedDict with json.load, which ensures that current objects get written out in the same order they were read in *and* that any future keys will be handled automagically. DONTBUILD because NPOTB

# -*- 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/.

CONFIGURE_SUBST_FILES += ['tools/update-packaging/Makefile']

if CONFIG['ENABLE_CLANG_PLUGIN']:
  add_tier_dir('base', 'build/clang-plugin', static=True)

add_tier_dir('base', ['config', 'build', 'probes', 'mfbt', 'python'])

if not CONFIG['LIBXUL_SDK']:
    if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
        add_tier_dir('base', ['other-licenses/android'])

    if CONFIG['MOZ_MEMORY']:
        add_tier_dir('base', ['memory'])

    if not CONFIG['MOZ_NATIVE_ZLIB']:
        add_tier_dir('base', ['modules/zlib'])

    add_tier_dir('base', ['mozglue', 'memory/mozalloc'])

# Bring in the configuration for the configured application.
if CONFIG['COMPILE_ENVIRONMENT']:
    include('/' + CONFIG['MOZ_BUILD_APP'] + '/app.mozbuild')