Bug 1011562 - Make mulet use its own tooltool manifests. r=mshal
authorJan Keromnes <janx@linux.com>
Fri, 07 Nov 2014 09:51:57 -0500 (2014-11-07)
changeset 11373 bd6998682ead771b05df99cd091aebdf4c54bf4e
parent 11371 b6b8b27e43aed083fc47a7aff4363df6b190197c
child 11374 6e5e3620a79815e2605ec21a036eb4233a58f1a1
child 11377 fcd92d76847bff670c32e481885219ae4eda8395
push id8318
push usermshal@mozilla.com
push dateFri, 07 Nov 2014 14:52:39 +0000 (2014-11-07)
reviewersmshal
bugs1011562
Bug 1011562 - Make mulet use its own tooltool manifests. r=mshal
mozilla/b2g_config.py
--- a/mozilla/b2g_config.py
+++ b/mozilla/b2g_config.py
@@ -473,17 +473,17 @@ PLATFORM_VARS = {
             'TOOLTOOL_HOME': '/builds',
             'MOZ_OBJDIR': OBJDIR,
             'CCACHE_DIR': '/builds/ccache',
             'CCACHE_COMPRESS': '1',
             'CCACHE_UMASK': '002',
             'LC_ALL': 'C',
             'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
         },
-        'tooltool_manifest_src': 'browser/config/tooltool-manifests/linux64/releng.manifest',
+        'tooltool_manifest_src': 'b2g/dev/config/tooltool-manifests/linux64/releng.manifest',
         'tooltool_script': ['/builds/tooltool.py'],
         'use_mock': True,
         'mock_target': 'mozilla-centos6-x86_64',
         'mock_packages': \
                    ['autoconf213', 'python', 'zip', 'mozilla-python27-mercurial', 'git', 'ccache',
                     'glibc-static', 'libstdc++-static', 'perl-Test-Simple', 'perl-Config-General',
                     'gtk2-devel', 'libnotify-devel', 'yasm',
                     'alsa-lib-devel', 'libcurl-devel',
@@ -656,17 +656,17 @@ PLATFORM_VARS = {
             'CCACHE_DIR': '/builds/ccache',
             'CCACHE_COMPRESS': '1',
             'CCACHE_UMASK': '002',
         },
         'enable_opt_unittests': False,
         'enable_checktests': True,
         'talos_masters': None,
         'test_pretty_names': False,
-        'tooltool_manifest_src': 'browser/config/tooltool-manifests/macosx64/releng.manifest',
+        'tooltool_manifest_src': 'b2g/dev/config/tooltool-manifests/macosx64/releng.manifest',
         'tooltool_l10n_manifest_src': 'browser/config/tooltool-manifests/macosx64/l10n.manifest',
         'enable_ccache': True,
     },
     'win32_gecko': {
         'product_name': 'b2g',
         'app_name': 'b2g',
         'base_name': builder_prefix + '_%(branch)s_%(platform)s',
         'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
@@ -908,17 +908,17 @@ PLATFORM_VARS = {
             'WGET_OPTS': '-q -c',
         },
         'enable_opt_unittests': False,
         'enable_checktests': True,
         'talos_masters': None,
         'test_pretty_names': False,
         'l10n_check_test': False,
         'multi_locale': False,
-        'tooltool_manifest_src': 'browser/config/tooltool-manifests/win32/releng.manifest',
+        'tooltool_manifest_src': 'b2g/dev/config/tooltool-manifests/win32/releng.manifest',
         'tooltool_script': ['python', '/c/mozilla-build/tooltool.py'],
     },
     'linux64_gecko_localizer': {
         'product_name': 'b2g',
         'app_name': 'b2g',
         'base_name': builder_prefix + '_%(branch)s_%(platform)s',
         'mozconfig': 'NOT-IN-BB-CONF/%(branch)s/nightly',
         'src_mozconfig': 'b2g/config/mozconfigs/linux64_gecko/nightly',