Base import of Tycho code (warning: huge commit)

1 files changed, 56 insertions, 12 deletions

diff --git a/moz.build b/moz.build
index 2c71a699b..abd2f5ebf 100644
--- a/moz.build
+++ b/moz.build
@@ -4,26 +4,70 @@
 # 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']
+CONFIGURE_SUBST_FILES += [
+    'config/autoconf.mk',
+    'config/emptyvars.mk',
+]
 
 if CONFIG['ENABLE_CLANG_PLUGIN']:
-  add_tier_dir('base', 'build/clang-plugin', static=True)
+    DIRS += ['build/clang-plugin']
 
-add_tier_dir('base', ['config', 'build', 'probes', 'mfbt', 'python'])
+DIRS += [
+    'config',
+    'python',
+]
+
+if not CONFIG['JS_STANDALONE']:
+    CONFIGURE_SUBST_FILES += [
+        'mozilla-config.h',
+        'tools/update-packaging/Makefile',
+    ]
+
+    DIRS += [
+        'build',
+        'probes',
+    ]
 
 if not CONFIG['LIBXUL_SDK']:
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
-        add_tier_dir('base', ['other-licenses/android'])
+    DIRS += [
+        'mfbt',
+        'config/external/zlib',
+    ]
+
+    if not CONFIG['JS_STANDALONE']:
+        if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+            DIRS += ['other-licenses/android']
+
+        if CONFIG['MOZ_MEMORY']:
+            DIRS += ['memory']
+
+        DIRS += [
+            'mozglue',
+            'memory/fallible',
+            'memory/mozalloc',
+            'memory/volatile',
+        ]
+
+if not CONFIG['JS_STANDALONE']:
+    DIRS += ['xpcom/xpidl']
 
-    if CONFIG['MOZ_MEMORY']:
-        add_tier_dir('base', ['memory'])
+if CONFIG['COMPILE_ENVIRONMENT'] and not CONFIG['LIBXUL_SDK']:
+    DIRS += ['config/external/nspr']
 
-    if not CONFIG['MOZ_NATIVE_ZLIB']:
-        add_tier_dir('base', ['modules/zlib'])
+    if not CONFIG['JS_STANDALONE']:
+        DIRS += [
+            'config/external',
+            'config/external/nss',
+        ]
 
-    add_tier_dir('base', ['mozglue', 'memory/mozalloc'])
+    if CONFIG['BUILD_CTYPES']:
+        DIRS += ['config/external/ffi']
+    if CONFIG['USE_ICU']:
+        DIRS += ['config/external/icu']
+    DIRS += ['js/src']
 
-# Bring in the configuration for the configured application.
-if CONFIG['COMPILE_ENVIRONMENT']:
+if not CONFIG['JS_STANDALONE']:
+    # Bring in the configuration for the configured application.
     include('/' + CONFIG['MOZ_BUILD_APP'] + '/app.mozbuild')
 
+include('build/templates.mozbuild')