Bug 1122772 - Remove the code used to support unified builds from mozharness; r=jlund
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 16 Jan 2015 17:48:35 -0500 (2015-01-16)
changeset 3581 af14615211909fcac2435798be7939f875370fd8
parent 3580 89f0bc25dcfe1d9e6f03521d76d71ddb0c7a20f0
child 3582 ba4e69ddd4e7d0e02d3416807db91ad59e9e3f3f
child 3583 6bd3653426f8f49ce14737fbaf838da88dfa6799
push id2796
push usereakhgari@mozilla.com
push dateThu, 22 Jan 2015 01:34:07 +0000 (2015-01-22)
reviewersjlund
bugs1122772
Bug 1122772 - Remove the code used to support unified builds from mozharness; r=jlund
configs/builds/releng_sub_linux_configs/64_debug_and_non_unified.py
configs/builds/releng_sub_linux_configs/64_non_unified.py
configs/builds/releng_sub_mac_configs/64_debug_and_non_unified.py
configs/builds/releng_sub_mac_configs/64_non_unified.py
configs/builds/releng_sub_windows_configs/32_debug_and_non_unified.py
configs/builds/releng_sub_windows_configs/32_non_unified.py
mozharness/mozilla/building/buildbase.py
scripts/b2g_build.py
deleted file mode 100644
--- a/configs/builds/releng_sub_linux_configs/64_debug_and_non_unified.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
-config = {
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        'setup-mock',
-        'build',
-        # 'generate-build-stats',
-        'update',  # decided by query_is_nightly()
-    ],
-    'debug_build': True,
-    'stage_platform': 'linux64-debug-nonunified',
-    'enable_signing': False,
-    'enable_talos_sendchange': False,
-    'enable_unittest_sendchange': False,
-    'enable_check_test': False,
-    #### 64 bit build specific #####
-    'env': {
-        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
-        'MOZ_AUTOMATION': '1',
-        'DISPLAY': ':2',
-        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        'MOZ_OBJDIR': MOZ_OBJDIR,
-        'MOZ_CRASHREPORTER_NO_REPORT': '1',
-        'CCACHE_DIR': '/builds/ccache',
-        'CCACHE_COMPRESS': '1',
-        'CCACHE_UMASK': '002',
-        'LC_ALL': 'C',
-        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-        # 64 bit specific
-        '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',
-        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:\
-%s/dist/bin' % (MOZ_OBJDIR,),
-    },
-    'src_mozconfig': 'browser/config/mozconfigs/linux64/debug-nonunified',
-    #######################
-}
deleted file mode 100644
--- a/configs/builds/releng_sub_linux_configs/64_non_unified.py
+++ /dev/null
@@ -1,17 +0,0 @@
-config = {
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        'setup-mock',
-        'build',
-        'generate-build-stats',
-        'update',  # decided by query_is_nightly()
-    ],
-    'stage_platform': 'linux64-nonunified',
-    'enable_talos_sendchange': False,
-    'enable_unittest_sendchange': False,
-    'enable_check_test': False,
-    #### 64 bit build specific #####
-    'src_mozconfig': 'browser/config/mozconfigs/linux64/nightly-nonunified',
-    #######################
-}
deleted file mode 100644
--- a/configs/builds/releng_sub_mac_configs/64_debug_and_non_unified.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
-config = {
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        # 'setup-mock',
-        'build',
-        # 'generate-build-stats',
-        'update',  # decided by query_is_nightly()
-    ],
-    'debug_build': True,
-    'stage_platform': 'macosx64-debug-nonunified',
-    'enable_talos_sendchange': False,
-    'enable_unittest_sendchange': False,
-    'enable_check_test': False,
-    'objdir': 'obj-firefox',
-    #### 64 bit build specific #####
-    'env': {
-        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
-        'MOZ_AUTOMATION': '1',
-        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        'MOZ_OBJDIR': 'obj-firefox',
-        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/builds',
-        'MOZ_CRASHREPORTER_NO_REPORT': '1',
-        'CCACHE_DIR': '/builds/ccache',
-        'CCACHE_COMPRESS': '1',
-        'CCACHE_UMASK': '002',
-        'LC_ALL': 'C',
-        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-        ## 64 bit specific
-        'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:'
-                '/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
-        ##
-    },
-    'src_mozconfig': 'browser/config/mozconfigs/macosx64/debug-nonunified',
-    #######################
-}
deleted file mode 100644
--- a/configs/builds/releng_sub_mac_configs/64_non_unified.py
+++ /dev/null
@@ -1,17 +0,0 @@
-config = {
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        # 'setup-mock',
-        'build',
-        'generate-build-stats',
-        'update',  # decided by query_is_nightly()
-    ],
-    'stage_platform': 'macosx64-nonunified',
-    'enable_talos_sendchange': False,
-    'enable_unittest_sendchange': False,
-    'enable_check_test': False,
-    #### 64 bit build specific #####
-    'src_mozconfig': 'browser/config/mozconfigs/macosx-universal/nightly-nonunified',
-    #######################
-}
deleted file mode 100644
--- a/configs/builds/releng_sub_windows_configs/32_debug_and_non_unified.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import os
-
-MOZ_OBJDIR = 'obj-firefox'
-
-config = {
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        # 'setup-mock', windows do not use mock
-        'build',
-        # 'generate-build-stats',
-        'update',  # decided by query_is_nightly()
-    ],
-    'stage_platform': 'win32-debug-nonunified',
-    'debug_build': True,
-    'enable_talos_sendchange': False,
-    'enable_unittest_sendchange': False,
-    'enable_check_test': False,
-    #### 32 bit build specific #####
-    'env': {
-        'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
-        'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
-        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
-        'MOZ_AUTOMATION': '1',
-        'MOZ_CRASHREPORTER_NO_REPORT': '1',
-        'MOZ_OBJDIR': 'obj-firefox',
-        'PATH': 'C:/mozilla-build/nsis-3.0a2;C:/mozilla-build/nsis-2.46u;C:/mozilla-build/python27;'
-                'C:/mozilla-build/buildbotve/scripts;'
-                '%s' % (os.environ.get('path')),
-        'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
-        'TINDERBOX_OUTPUT': '1',
-        'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-    },
-    'src_mozconfig': 'browser/config/mozconfigs/win32/debug-nonunified',
-    'purge_minsize': 9,
-    #######################
-}
deleted file mode 100644
--- a/configs/builds/releng_sub_windows_configs/32_non_unified.py
+++ /dev/null
@@ -1,17 +0,0 @@
-config = {
-    'default_actions': [
-        'clobber',
-        'clone-tools',
-        # 'setup-mock', windows do not use mock
-        'build',
-        'generate-build-stats',
-        'update',  # decided by query_is_nightly()
-    ],
-    'stage_platform': 'win32-nonunified',
-    'enable_talos_sendchange': False,
-    'enable_unittest_sendchange': False,
-    'enable_check_test': False,
-    #### 64 bit build specific #####
-    'src_mozconfig': 'browser/config/mozconfigs/win32/nightly-nonunified',
-    #######################
-}
--- a/mozharness/mozilla/building/buildbase.py
+++ b/mozharness/mozilla/building/buildbase.py
@@ -263,29 +263,26 @@ class BuildOptionParser(object):
     platform = None
     bits = None
     config_file_search_path = [
         '.', os.path.join(sys.path[0], '..', 'configs'),
         os.path.join(sys.path[0], '..', '..', 'configs')
     ]
 
     # add to this list and you can automagically do things like
-    # --custom-build-variant non-unified
+    # --custom-build-variant asan
     # and the script will pull up the appropriate path for the config
     # against the current platform and bits.
     # *It will warn and fail if there is not a config for the current
     # platform/bits
     build_variants = {
         'asan': 'builds/releng_sub_%s_configs/%s_asan.py',
         'debug': 'builds/releng_sub_%s_configs/%s_debug.py',
         'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py',
         'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
-        'non-unified': 'builds/releng_sub_%s_configs/%s_non_unified.py',
-        'debug-and-non-unified':
-                'builds/releng_sub_%s_configs/%s_debug_and_non_unified.py',
         'mulet': 'builds/releng_sub_%s_configs/%s_mulet.py',
         'code-coverage': 'builds/releng_sub_%s_configs/%s_code_coverage.py',
     }
     build_pools = {
         'staging': 'builds/build_pool_specifics.py',
         'production': 'builds/build_pool_specifics.py',
     }
     branch_cfg_file = 'builds/branch_specifics.py'
--- a/scripts/b2g_build.py
+++ b/scripts/b2g_build.py
@@ -96,21 +96,16 @@ class B2GBuild(LocalesMixin, PurgeMixin,
             "dest": "additional_source_tarballs",
             "help": "Additional source tarballs to extract",
         }],
         [["--debug"], {
             "dest": "debug_build",
             "action": "store_true",
             "help": "Set B2G_DEBUG=1 (debug build)",
         }],
-        [["--non-unified"], {
-            "dest": "nonunified_build",
-            "action": "store_true",
-            "help": "Set MOZ_NON_UNIFIED=1 (non-unified build)",
-        }],
         [["--repotool-repo"], {
             "dest": "repo_repo",
             "help": "where to pull repo tool source from",
         }],
         [["--repotool-revision"], {
             "dest": "repo_rev",
             "help": "which revision of repo tool to use",
         }],
@@ -262,32 +257,28 @@ class B2GBuild(LocalesMixin, PurgeMixin,
             return 0
 
     def query_do_upload(self):
         # always upload nightlies, but not dep builds for some platforms
         if self.query_is_nightly():
             return True
         if self.config['target'] in self.config['upload']['default'].get('upload_dep_target_exclusions', []):
             return False
-        if self.config.get('nonunified_build'):
-            return False
         return True
 
     def query_build_env(self):
         env = super(B2GBuild, self).query_build_env()
 
         # Force B2G_UPDATER so that eng builds (like the emulator) will get
         # the updater included. Otherwise the xpcshell updater tests won't run.
         env['B2G_UPDATER'] = '1'
         # Bug 1059992 -- see gonk-misc/Android.mk
         env['FORCE_GECKO_BUILD_OUTPUT'] = '1'
         if self.config.get('debug_build'):
             env['B2G_DEBUG'] = '1'
-        if self.config.get('nonunified_build'):
-            env['MOZ_NON_UNIFIED'] = '1'
         return env
 
     def query_dotconfig(self):
         if self.dotconfig:
             return self.dotconfig
         dirs = self.query_abs_dirs()
         dotconfig_file = os.path.join(dirs['abs_work_dir'], '.config')
         self.dotconfig = {}