Bug 900526, part 5: Move DIST_SUBDIR to moz.build, r=gps
authorJoshua Cranmer <Pidgeot18@gmail.com>
Mon, 21 Oct 2013 13:10:04 -0500
changeset 166367 ec37f434044acfde23203d4a8b267689becc8109
parent 166366 5452527770cb322cb7f50e8abedccf2eb6c8a4a0
child 166368 ce54c42790f64757ed5cdc69b3fe61a7a9fbf477
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs900526
milestone27.0a1
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
Bug 900526, part 5: Move DIST_SUBDIR to moz.build, r=gps
browser/branding/aurora/moz.build
browser/branding/nightly/moz.build
browser/branding/official/moz.build
browser/branding/unofficial/moz.build
browser/defs.mk
browser/installer/Makefile.in
browser/metro/base/Makefile.in
browser/metro/base/moz.build
browser/metro/defs.mk
browser/metro/moz.build
browser/metro/shell/commandexecutehandler/Makefile.in
browser/metro/shell/commandexecutehandler/moz.build
browser/metro/shell/linktool/Makefile.in
browser/metro/shell/linktool/moz.build
browser/metro/shell/testing/Makefile.in
browser/metro/shell/testing/moz.build
browser/moz.build
python/mozbuild/mozbuild/frontend/reader.py
webapprt/Makefile.in
webapprt/defs.mk
webapprt/moz.build
--- a/browser/branding/aurora/moz.build
+++ b/browser/branding/aurora/moz.build
@@ -1,8 +1,10 @@
 # -*- 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/.
 
 DIRS += ['content', 'locales']
 
+DIST_SUBDIR = 'browser'
+export('DIST_SUBDIR')
--- a/browser/branding/nightly/moz.build
+++ b/browser/branding/nightly/moz.build
@@ -1,7 +1,10 @@
 # -*- 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/.
 
 DIRS += ['content', 'locales']
+
+DIST_SUBDIR = 'browser'
+export('DIST_SUBDIR')
--- a/browser/branding/official/moz.build
+++ b/browser/branding/official/moz.build
@@ -1,8 +1,10 @@
 # -*- 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/.
 
 DIRS += ['content', 'locales']
 
+DIST_SUBDIR = 'browser'
+export('DIST_SUBDIR')
--- a/browser/branding/unofficial/moz.build
+++ b/browser/branding/unofficial/moz.build
@@ -1,8 +1,10 @@
 # -*- 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/.
 
 DIRS += ['content', 'locales']
 
+DIST_SUBDIR = 'browser'
+export('DIST_SUBDIR')
--- a/browser/defs.mk
+++ b/browser/defs.mk
@@ -1,2 +1,1 @@
-DIST_SUBDIR=browser
 XPI_ROOT_APPID=$(MOZ_APP_ID)
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -1,13 +1,14 @@
 # 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/.
 
 STANDALONE_MAKEFILE := 1
+DIST_SUBDIR := browser
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 # Some files have been already bundled with xulrunner
 ifndef SYSTEM_LIBXUL
--- a/browser/metro/base/Makefile.in
+++ b/browser/metro/base/Makefile.in
@@ -1,12 +1,10 @@
 # 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 $(topsrcdir)/config/config.mk
 
-DIST_SUBDIR=metro
-
 DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) \
            -DPACKAGE=browser \
            -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
            $(NULL)
--- a/browser/metro/base/moz.build
+++ b/browser/metro/base/moz.build
@@ -1,8 +1,10 @@
 # -*- 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/.
 
 METRO_CHROME_MANIFESTS += ['tests/mochiperf/metro.ini', 'tests/mochitest/metro.ini']
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
+
+DIST_SUBDIR = 'metro'
--- a/browser/metro/defs.mk
+++ b/browser/metro/defs.mk
@@ -1,2 +1,1 @@
-DIST_SUBDIR=metro
 XPI_ROOT_APPID={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
--- a/browser/metro/moz.build
+++ b/browser/metro/moz.build
@@ -10,8 +10,10 @@ DIRS += [
     'modules',
     'theme',
     'profile',
     'locales',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['shell']
+
+DIST_SUBDIR = 'metro'
--- a/browser/metro/shell/commandexecutehandler/Makefile.in
+++ b/browser/metro/shell/commandexecutehandler/Makefile.in
@@ -1,19 +1,16 @@
 # 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/.
 
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 include $(topsrcdir)/config/config.mk
 
-# We want this exe in dist/bin
-DIST_SUBDIR =
-
 DIST_PROGRAM = CommandExecuteHandler$(BIN_SUFFIX)
 
 # Don't link against mozglue.dll
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
 
 OS_LIBS = \
 	kernel32.lib \
--- a/browser/metro/shell/commandexecutehandler/moz.build
+++ b/browser/metro/shell/commandexecutehandler/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PROGRAM = 'CommandExecuteHandler'
 
 CPP_SOURCES += [
     'CEHHelper.cpp',
     'CommandExecuteHandler.cpp',
 ]
+
+# We want this exe in dist/bin
+DIST_SUBDIR = ''
--- a/browser/metro/shell/linktool/Makefile.in
+++ b/browser/metro/shell/linktool/Makefile.in
@@ -1,18 +1,16 @@
 # 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/.
 
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 include $(topsrcdir)/config/config.mk
 
-DIST_SUBDIR = metro/install
-
 OS_LIBS = \
 	kernel32.lib \
 	user32.lib \
 	ole32.lib \
 	shlwapi.lib \
 	shell32.lib \
 	propsys.lib \
 	$(NULL)
--- a/browser/metro/shell/linktool/moz.build
+++ b/browser/metro/shell/linktool/moz.build
@@ -4,8 +4,10 @@
 # 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/.
 
 PROGRAM = 'linktool'
 
 CPP_SOURCES += [
     'linktool.cpp',
 ]
+
+DIST_SUBDIR = 'metro/install'
--- a/browser/metro/shell/testing/Makefile.in
+++ b/browser/metro/shell/testing/Makefile.in
@@ -8,19 +8,16 @@ USE_STATIC_LIBS = 1
 # don't use moz glue libs
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
 
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 include $(topsrcdir)/config/config.mk
 
-# We want this exe in dist/bin
-DIST_SUBDIR =
-
 OS_LIBS = \
 	kernel32.lib \
 	user32.lib \
 	ole32.lib \
 	shlwapi.lib \
 	propsys.lib \
 	advapi32.lib \
 	$(NULL)
--- a/browser/metro/shell/testing/moz.build
+++ b/browser/metro/shell/testing/moz.build
@@ -4,8 +4,11 @@
 # 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/.
 
 PROGRAM = 'metrotestharness'
 
 CPP_SOURCES += [
     'metrotestharness.cpp',
 ]
+
+# We want this exe in dist/bin
+DIST_SUBDIR = ''
--- a/browser/moz.build
+++ b/browser/moz.build
@@ -22,8 +22,10 @@ DIRS += [
 ]
 
 if CONFIG['MOZ_METRO']:
     DIRS += ['metro']
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
+DIST_SUBDIR = 'browser'
+export('DIST_SUBDIR')
--- a/python/mozbuild/mozbuild/frontend/reader.py
+++ b/python/mozbuild/mozbuild/frontend/reader.py
@@ -705,17 +705,17 @@ class BuildReader(object):
                         'Directory (%s) registered multiple times in %s' % (
                             d, var))
 
                 recurse_info[d] = {'tier': metadata.get('tier', None),
                                    'parent': sandbox['RELATIVEDIR'],
                                    'var': var}
                 if 'exports' in sandbox.metadata:
                     sandbox.recompute_exports()
-                    recurse_info[d]['exports'] = sandbox.metadata['exports']
+                    recurse_info[d]['exports'] = dict(sandbox.metadata['exports'])
 
         # We also have tiers whose members are directories.
         if 'TIERS' in sandbox:
             if not read_tiers:
                 raise SandboxValidationError(
                     'TIERS defined but it should not be')
 
             for tier, values in sandbox['TIERS'].items():
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -1,18 +1,15 @@
 # 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 config.mk explicitly so we can override FINAL_TARGET.
 include $(topsrcdir)/config/config.mk
 
-# Place webapprt resources in a separate app dir
-DIST_SUBDIR = webapprt
-
 PREF_JS_EXPORTS = $(srcdir)/prefs.js \
                   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
--- a/webapprt/defs.mk
+++ b/webapprt/defs.mk
@@ -1,2 +1,1 @@
-DIST_SUBDIR=webapprt
 XPI_ROOT_APPID=webapprt@mozilla.org
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -27,8 +27,11 @@ EXTRA_JS_MODULES += [
     'WebRTCHandler.jsm',
     'WebappRT.jsm',
     'WebappsHandler.jsm',
 ]
 
 MOCHITEST_WEBAPPRT_CHROME_MANIFESTS += ['test/chrome/webapprt.ini']
 MOCHITEST_MANIFESTS += ['test/content/mochitest.ini']
 
+# Place webapprt resources in a separate app dir
+DIST_SUBDIR = 'webapprt'
+export('DIST_SUBDIR')