Bug 774991 - Remove macosx/macosx-debug (and mozconfig dirs) from all builds. r=Callek seamonkey-production
authorEdmund Wong <ewong@pw-wspx.org>
Mon, 04 Feb 2013 22:01:10 +0800
branchseamonkey-production
changeset 7794 1e7b2fc1cb9728a672fc6c3eaec2b3772a6722b0
parent 7793 183f5314fa962a3023908d608a9ccbc0112b6048
child 7796 5f78d4e0b4dec85f07e060dfda869d672f3ecee8
push id5969
push userewong@pw-wspx.org
push dateMon, 04 Feb 2013 14:01:54 +0000
reviewersCallek
bugs774991
Bug 774991 - Remove macosx/macosx-debug (and mozconfig dirs) from all builds. r=Callek
seamonkey/config.py
seamonkey/l10nbuilds.ini
seamonkey/macosx/comm-1.9.1/nightly/mozconfig
seamonkey/macosx/comm-1.9.1/release/mozconfig
seamonkey/macosx/comm-1.9.1/unittest/mozconfig
seamonkey/macosx/comm-2.0/debug/mozconfig
seamonkey/macosx/comm-2.0/nightly/mozconfig
seamonkey/macosx/comm-2.0/release/mozconfig
seamonkey/macosx/comm-2.0/unittest/mozconfig
seamonkey/macosx/comm-aurora/debug/mozconfig
seamonkey/macosx/comm-aurora/nightly/mozconfig
seamonkey/macosx/comm-aurora/release/mozconfig
seamonkey/macosx/comm-aurora/unittest/mozconfig
seamonkey/macosx/comm-beta/debug/mozconfig
seamonkey/macosx/comm-beta/nightly/mozconfig
seamonkey/macosx/comm-beta/release-l10n/mozconfig
seamonkey/macosx/comm-beta/release/mozconfig
seamonkey/macosx/comm-beta/unittest/mozconfig
seamonkey/macosx/comm-central-trunk/debug/mozconfig
seamonkey/macosx/comm-central-trunk/nightly/mozconfig
seamonkey/macosx/comm-central-trunk/release/mozconfig
seamonkey/macosx/comm-central-trunk/unittest/mozconfig
seamonkey/macosx/comm-release/debug/mozconfig
seamonkey/macosx/comm-release/nightly/mozconfig
seamonkey/macosx/comm-release/release-l10n/mozconfig
seamonkey/macosx/comm-release/release/mozconfig
seamonkey/macosx/comm-release/unittest/mozconfig
seamonkey/master.cfg
seamonkey/release-comm-1.9.1.py
seamonkey/release_master.py
--- a/seamonkey/config.py
+++ b/seamonkey/config.py
@@ -1,17 +1,16 @@
 from copy import deepcopy
 
 SLAVES = {
     'linux': ['sea-vm-linux32-%i' % x for x in range(1,7)],
     'linux64': ['cb-seamonkey-linux64-%02i' % x for x in [1]] +
                ['sea-vm-linux64-%i' % x for x in [1]],
     'win32': ['sea-win32-%02i' % x for x in [1,2,3,4]] + #iX machines
              ['sea-vm-win32-%i' % x for x in range(1,5)],
-    'macosx': ['cb-sea-miniosx%02i' % x for x in [1,2]],
     'macosx64': #['cb-sea-miniosx64-%02i' % x for x in [1,2,3]] +
                 ['sea-mini-osx64-%i' % x for x in range(1,5)],
 }
 
 
 GLOBAL_VARS = {
     # It's a little unfortunate to have both of these but some things (HgPoller)
     # require an URL while other things (BuildSteps) require only the host.
@@ -57,17 +56,16 @@ GLOBAL_VARS = {
     'geriatric_masters': [],
     'geriatric_branches': {},
     'platforms': {
         'linux': {},
         'linux64': {},
         'win32': {},
         'macosx64': {},
         'linux-debug': {},
-        'macosx-debug': {},
         'macosx64-debug': {},
         'win32-debug': {},
     },
     'pgo_strategy': None,
     'pgo_platforms': list(),
     'enable_shark': False,
     'enable_codecoverage': False,
     'enable_blocklist_update': False,
@@ -199,56 +197,16 @@ PLATFORM_VARS = {
                 'PATH': '/tools/python-2.6.5/bin:${PATH}',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'tooltool_manifest_src': 'suite/config/tooltool-manifests/linux64/releng.manifest',
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'stage_product': 'seamonkey',
         },
-        'macosx': {
-            'product_name': 'seamonkey',
-            'app_name': 'suite',
-            'brand_name': 'SeaMonkey',
-            'base_name': 'OS X 10.5 %(branch)s',
-            'mozconfig': 'macosx/%(branch)s/nightly',
-            'src_mozconfig': 'suite/config/mozconfigs/macosx-universal/nightly',
-            'profiled_build': False,
-            'builds_before_reboot': BUILDS_BEFORE_REBOOT,
-            'build_space': 8,
-            'upload_symbols': True,
-            'download_symbols': True,
-            'packageTests': True,
-            'slaves': SLAVES['macosx'],
-            'platform_objdir': "%s/ppc" % OBJDIR,
-            'stage_platform': 'macosx',
-            'update_platform': 'Darwin_Universal-gcc3',
-            'enable_ccache': True,
-            'env': {
-                'MOZ_OBJDIR': OBJDIR,
-                'SYMBOL_SERVER_HOST': 'symbolpush.mozilla.org',
-                'SYMBOL_SERVER_USER': 'seabld',
-                'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-                'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-                'SYMBOL_SERVER_SSH_KEY': "/Users/seabld/.ssh/seabld_dsa",
-                'TINDERBOX_OUTPUT': '1',
-                'MOZ_CRASHREPORTER_NO_REPORT': '1',
-                'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_COMPRESS': '1',
-                'CCACHE_UMASK': '002',
-                'CHOWN_ROOT': '~/bin/chown_root',
-                'CHOWN_REVERT': '~/bin/chown_revert',
-                'MOZ_PKG_PLATFORM': 'mac',
-                'LC_ALL': 'C',
-            },
-            'enable_opt_unittests': False,
-            'enable_checktests': True,
-            'talos_masters': GLOBAL_VARS['talos_masters'],
-            'stage_product': 'seamonkey',
-        },
         'macosx64': {
             'product_name': 'seamonkey',
             'app_name': 'suite',
             'brand_name': 'SeaMonkey',
             'base_name': 'OS X 10.6 %(branch)s',
             'mozconfig': 'macosx64/%(branch)s/nightly',
             'src_mozconfig': 'suite/config/mozconfigs/macosx-universal/nightly',
             'profiled_build': False,
@@ -352,45 +310,16 @@ PLATFORM_VARS = {
                 'PATH': '/tools/python-2.6.5/bin:${PATH}',
             },
             'enable_unittests': True,
             'enable_checktests': True,
             'tooltool_manifest_src': 'suite/config/tooltool-manifests/linux32/releng.manifest',
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'stage_product': 'seamonkey',
         },
-        'macosx-debug': {
-            'product_name': 'seamonkey',
-            'app_name': 'suite',
-            'brand_name': 'SeaMonkey',
-            'base_name': 'OS X 10.5 %(branch)s leak test',
-            'mozconfig': 'macosx/%(branch)s/debug',
-            'src_mozconfig': 'suite/config/mozconfigs/macosx32/debug',
-            'profiled_build': False,
-            'builds_before_reboot': BUILDS_BEFORE_REBOOT,
-            'download_symbols': True,
-            'build_space': 5,
-            'slaves': SLAVES['macosx'],
-            'platform_objdir': OBJDIR,
-            'stage_platform': 'macosx-debug',
-            'enable_ccache': True,
-            'env': {
-                'MOZ_OBJDIR': OBJDIR,
-                'XPCOM_DEBUG_BREAK': 'stack-and-abort',
-                'MOZ_CRASHREPORTER_NO_REPORT': '1',
-                'CCACHE_DIR': '/builds/ccache',
-                'CCACHE_COMPRESS': '1',
-                'CCACHE_UMASK': '002',
-                'LC_ALL': 'C',
-            },
-            'enable_unittests': True,
-            'enable_checktests': True,
-            'talos_masters': GLOBAL_VARS['talos_masters'],
-            'stage_product': 'seamonkey',
-        },
         'macosx64-debug': {
             'product_name': 'seamonkey',
             'app_name': 'suite',
             'brand_name': 'SeaMonkey',
             'base_name': 'OS X 10.6 %(branch)s leak test',
             'mozconfig': 'macosx64/%(branch)s/debug',
             'src_mozconfig': 'suite/config/mozconfigs/macosx64/debug',
             'profiled_build': False,
@@ -453,17 +382,16 @@ BRANCHES = {
     'comm-2.0': {},
     'comm-aurora': {},
     'comm-beta': {},
     'comm-release': {},
     'comm-1.9.1': {'platforms': {
             'linux': {},
             'linux64': {},
             'win32': {},
-            'macosx': {},
         }},
 }
 
 # Copy global vars in first, then platform vars
 for branch in BRANCHES.keys():
     for key, value in GLOBAL_VARS.items():
         # Don't override platforms if it's set
         if key == 'platforms' and 'platforms' in BRANCHES[branch]:
@@ -481,28 +409,27 @@ for branch in BRANCHES.keys():
 ######## comm-central-trunk
 # This is a path, relative to HGURL, where the repository is located
 # HGURL + repo_path should be a valid repository
 BRANCHES['comm-central-trunk']['repo_path'] = 'comm-central'
 BRANCHES['comm-central-trunk']['mozilla_repo_path'] = 'mozilla-central'
 BRANCHES['comm-central-trunk']['l10n_repo_path'] = 'l10n-central'
 BRANCHES['comm-central-trunk']['start_hour'] = [0]
 BRANCHES['comm-central-trunk']['start_minute'] = [30]
-BRANCHES['comm-central-trunk']['platforms']['macosx-debug']['opt_base_name'] = 'OS X 10.5 comm-central-trunk'
 BRANCHES['comm-central-trunk']['enable_mac_a11y'] = True
 BRANCHES['comm-central-trunk']['unittest_build_space'] = 6
 BRANCHES['comm-central-trunk']['enable_blocklist_update'] = True
 BRANCHES['comm-central-trunk']['blocklist_update_on_closed_tree'] = True
 # And code coverage
 BRANCHES['comm-central-trunk']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-central-trunk']['enable_l10n'] = True
 BRANCHES['comm-central-trunk']['enable_l10n_onchange'] = True
 BRANCHES['comm-central-trunk']['l10nNightlyUpdate'] = True
-BRANCHES['comm-central-trunk']['l10n_platforms'] = ['linux','win32','macosx','macosx64']
+BRANCHES['comm-central-trunk']['l10n_platforms'] = ['linux','win32','macosx64']
 BRANCHES['comm-central-trunk']['l10nDatedDirs'] = True
 BRANCHES['comm-central-trunk']['l10n_tree'] = 'sea22x'
 #make sure it has an ending slash
 BRANCHES['comm-central-trunk']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/seamonkey/nightly/latest-comm-central-trunk-l10n/'
 BRANCHES['comm-central-trunk']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-central-trunk'
 BRANCHES['comm-central-trunk']['allLocalesFile'] = 'suite/locales/all-locales'
@@ -525,28 +452,27 @@ BRANCHES['comm-central-trunk']['packaged
 # This is a path, relative to HGURL, where the repository is located
 # HGURL + repo_path should be a valid repository
 BRANCHES['comm-aurora']['repo_path'] = 'releases/comm-aurora'
 BRANCHES['comm-aurora']['mozilla_repo_path'] = 'releases/mozilla-aurora'
 BRANCHES['comm-aurora']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
 BRANCHES['comm-aurora']['enable_nightly'] = True
 BRANCHES['comm-aurora']['start_hour'] = [1]
 BRANCHES['comm-aurora']['start_minute'] = [30]
-BRANCHES['comm-aurora']['platforms']['macosx-debug']['opt_base_name'] = 'OS X 10.5 comm-aurora'
 BRANCHES['comm-aurora']['enable_mac_a11y'] = True
 BRANCHES['comm-aurora']['unittest_build_space'] = 6
 BRANCHES['comm-aurora']['enable_blocklist_update'] = True
 BRANCHES['comm-aurora']['blocklist_update_on_closed_tree'] = True
 # And code coverage
 BRANCHES['comm-aurora']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-aurora']['enable_l10n'] = True
 BRANCHES['comm-aurora']['enable_l10n_onchange'] = True
 BRANCHES['comm-aurora']['l10nNightlyUpdate'] = True
-BRANCHES['comm-aurora']['l10n_platforms'] = ['linux','win32','macosx','macosx64']
+BRANCHES['comm-aurora']['l10n_platforms'] = ['linux','win32','macosx64']
 BRANCHES['comm-aurora']['l10nDatedDirs'] = True
 BRANCHES['comm-aurora']['l10n_tree'] = 'sea_aurora'
 #make sure it has an ending slash
 BRANCHES['comm-aurora']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/seamonkey/nightly/latest-comm-aurora-l10n/'
 BRANCHES['comm-aurora']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-aurora'
 BRANCHES['comm-aurora']['allLocalesFile'] = 'suite/locales/all-locales'
@@ -569,28 +495,27 @@ BRANCHES['comm-aurora']['packaged_unitte
 # This is a path, relative to HGURL, where the repository is located
 # HGURL + repo_path should be a valid repository
 BRANCHES['comm-beta']['repo_path'] = 'releases/comm-beta'
 BRANCHES['comm-beta']['mozilla_repo_path'] = 'releases/mozilla-beta'
 BRANCHES['comm-beta']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
 BRANCHES['comm-beta']['enable_nightly'] = False
 BRANCHES['comm-beta']['start_hour'] = [0]
 BRANCHES['comm-beta']['start_minute'] = [30]
-BRANCHES['comm-beta']['platforms']['macosx-debug']['opt_base_name'] = 'OS X 10.5 comm-beta'
 BRANCHES['comm-beta']['enable_mac_a11y'] = True
 BRANCHES['comm-beta']['unittest_build_space'] = 6
 BRANCHES['comm-beta']['enable_blocklist_update'] = False # for now
 BRANCHES['comm-beta']['blocklist_update_on_closed_tree'] = True
 # And code coverage
 BRANCHES['comm-beta']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-beta']['enable_l10n'] = False
 BRANCHES['comm-beta']['enable_l10n_onchange'] = True
 BRANCHES['comm-beta']['l10nNightlyUpdate'] = True
-BRANCHES['comm-beta']['l10n_platforms'] = ['linux','win32','macosx','macosx64']
+BRANCHES['comm-beta']['l10n_platforms'] = ['linux','win32','macosx64']
 BRANCHES['comm-beta']['l10nDatedDirs'] = True
 BRANCHES['comm-beta']['l10n_tree'] = 'sea_beta'
 #make sure it has an ending slash
 BRANCHES['comm-beta']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/seamonkey/nightly/latest-comm-beta-l10n/'
 BRANCHES['comm-beta']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-beta'
 BRANCHES['comm-beta']['allLocalesFile'] = 'suite/locales/all-locales'
@@ -613,28 +538,27 @@ BRANCHES['comm-beta']['packaged_unittest
 # This is a path, relative to HGURL, where the repository is located
 # HGURL + repo_path should be a valid repository
 BRANCHES['comm-release']['repo_path'] = 'releases/comm-release'
 BRANCHES['comm-release']['mozilla_repo_path'] = 'releases/mozilla-release'
 BRANCHES['comm-release']['l10n_repo_path'] = 'releases/l10n/mozilla-release'
 BRANCHES['comm-release']['enable_nightly'] = False
 BRANCHES['comm-release']['start_hour'] = [0]
 BRANCHES['comm-release']['start_minute'] = [30]
-BRANCHES['comm-release']['platforms']['macosx-debug']['opt_base_name'] = 'OS X 10.5 comm-release'
 BRANCHES['comm-release']['enable_mac_a11y'] = True
 BRANCHES['comm-release']['unittest_build_space'] = 6
 BRANCHES['comm-release']['enable_blocklist_update'] = False # for now
 BRANCHES['comm-release']['blocklist_update_on_closed_tree'] = True
 # And code coverage
 BRANCHES['comm-release']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-release']['enable_l10n'] = False
 BRANCHES['comm-release']['enable_l10n_onchange'] = True
 BRANCHES['comm-release']['l10nNightlyUpdate'] = True
-BRANCHES['comm-release']['l10n_platforms'] = ['linux','win32','macosx','macosx64']
+BRANCHES['comm-release']['l10n_platforms'] = ['linux','win32','macosx64']
 BRANCHES['comm-release']['l10nDatedDirs'] = True
 BRANCHES['comm-release']['l10n_tree'] = 'sea_release'
 #make sure it has an ending slash
 BRANCHES['comm-release']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/seamonkey/nightly/latest-comm-release-l10n/'
 BRANCHES['comm-release']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-release'
 BRANCHES['comm-release']['allLocalesFile'] = 'suite/locales/all-locales'
@@ -657,29 +581,28 @@ BRANCHES['comm-release']['packaged_unitt
 # This is a path, relative to HGURL, where the repository is located
 # HGURL + repo_path should be a valid repository
 BRANCHES['comm-2.0']['repo_path'] = 'releases/comm-2.0'
 BRANCHES['comm-2.0']['mozilla_repo_path'] = 'releases/mozilla-2.0'
 BRANCHES['comm-2.0']['l10n_repo_path'] = 'releases/l10n-mozilla-2.0'
 BRANCHES['comm-2.0']['enable_nightly'] = False
 BRANCHES['comm-2.0']['start_hour'] = [1]
 BRANCHES['comm-2.0']['start_minute'] = [0]
-BRANCHES['comm-2.0']['platforms']['macosx-debug']['opt_base_name'] = 'OS X 10.5 comm-2.0'
 BRANCHES['comm-2.0']['enable_mac_a11y'] = True
 BRANCHES['comm-2.0']['unittest_build_space'] = 6
 # We only need one c-c blocklist update.
 BRANCHES['comm-2.0']['enable_blocklist_update'] = False
 BRANCHES['comm-2.0']['blocklist_update_on_closed_tree'] = False
 # And code coverage
 BRANCHES['comm-2.0']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-2.0']['enable_l10n'] = True
 BRANCHES['comm-2.0']['enable_l10n_onchange'] = False
 BRANCHES['comm-2.0']['l10nNightlyUpdate'] = True
-BRANCHES['comm-2.0']['l10n_platforms'] = ['linux','win32','macosx','macosx64']
+BRANCHES['comm-2.0']['l10n_platforms'] = ['linux','win32','macosx64']
 BRANCHES['comm-2.0']['l10nDatedDirs'] = True
 BRANCHES['comm-2.0']['l10n_tree'] = 'sea21x'
 #make sure it has an ending slash
 BRANCHES['comm-2.0']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/seamonkey/nightly/latest-comm-2.0-l10n/'
 BRANCHES['comm-2.0']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-2.0'
 BRANCHES['comm-2.0']['allLocalesFile'] = 'suite/locales/all-locales'
@@ -717,34 +640,30 @@ BRANCHES['comm-1.9.1']['unittest_suites'
 ]
 BRANCHES['comm-1.9.1']['platforms']['linux']['enable_unittests'] = True
 BRANCHES['comm-1.9.1']['platforms']['linux']['enable_opt_unittests'] = False
 BRANCHES['comm-1.9.1']['platforms']['linux']['enable_checktests'] = False
 BRANCHES['comm-1.9.1']['platforms']['linux']['packageTests'] = False
 BRANCHES['comm-1.9.1']['platforms']['linux64']['enable_opt_unittests'] = False
 BRANCHES['comm-1.9.1']['platforms']['linux64']['enable_checktests'] = False
 BRANCHES['comm-1.9.1']['platforms']['linux64']['packageTests'] = False
-BRANCHES['comm-1.9.1']['platforms']['macosx']['enable_unittests'] = True
-BRANCHES['comm-1.9.1']['platforms']['macosx']['enable_opt_unittests'] = False
-BRANCHES['comm-1.9.1']['platforms']['macosx']['enable_checktests'] = False
-BRANCHES['comm-1.9.1']['platforms']['macosx']['packageTests'] = False
 BRANCHES['comm-1.9.1']['platforms']['win32']['enable_unittests'] = True
 BRANCHES['comm-1.9.1']['platforms']['win32']['enable_opt_unittests'] = False
 BRANCHES['comm-1.9.1']['platforms']['win32']['enable_checktests'] = False
 BRANCHES['comm-1.9.1']['platforms']['win32']['packageTests'] = False
 BRANCHES['comm-1.9.1']['unittest_exec_xpcshell_suites'] = True
 BRANCHES['comm-1.9.1']['enable_mac_a11y'] = False
 BRANCHES['comm-1.9.1']['unittest_build_space'] = 6
 # And code coverage
 BRANCHES['comm-1.9.1']['enable_codecoverage'] = False
 # L10n configuration
 BRANCHES['comm-1.9.1']['enable_l10n'] = True
 BRANCHES['comm-1.9.1']['enable_l10n_onchange'] = False
 BRANCHES['comm-1.9.1']['l10nNightlyUpdate'] = False
-BRANCHES['comm-1.9.1']['l10n_platforms'] = ['linux','win32','macosx']
+BRANCHES['comm-1.9.1']['l10n_platforms'] = ['linux','win32']
 BRANCHES['comm-1.9.1']['l10nDatedDirs'] = False
 BRANCHES['comm-1.9.1']['l10n_tree'] = 'sea20x'
 #make sure it has an ending slash
 BRANCHES['comm-1.9.1']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/seamonkey/nightly/latest-comm-1.9.1-l10n/'
 BRANCHES['comm-1.9.1']['enUS_binaryURL'] = \
     GLOBAL_VARS['download_base_url'] + '/nightly/latest-comm-1.9.1'
 BRANCHES['comm-1.9.1']['allLocalesFile'] = 'suite/locales/all-locales'
--- a/seamonkey/l10nbuilds.ini
+++ b/seamonkey/l10nbuilds.ini
@@ -3,37 +3,37 @@ app = suite
 type = hg
 locales = all
 #locales = af ar as be bg bn-IN ca cs cy da de el en-GB eo es-AR es-ES et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ja-JP-mac ka kn ko ku lt lv mk ml mn mr ms nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE ta te th tr uk vi zh-CN zh-TW 
 mozilla = comm-central
 l10n = releases/l10n-mozilla-1.9.1
 repo = http://hg.mozilla.org/
 l10nbase = http://hg.mozilla.org/releases/l10n-mozilla-1.9.1
 l10n.ini = suite/locales/l10n.ini
-builders = Seamonkey\ comm-1.9.1\ linux\ l10n\ dep Seamonkey\ comm-1.9.1\ macosx\ l10n\ dep Seamonkey\ comm-1.9.1\ win32\ l10n\ dep
+builders = Seamonkey\ comm-1.9.1\ linux\ l10n\ dep Seamonkey\ comm-1.9.1\ win32\ l10n\ dep
 en_us_binary = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-1.9.1/
 
 [sea21x]
 app = suite
 type = hg
 locales = all
 #locales = af ar as be bg bn-IN ca cs cy da de el en-GB eo es-AR es-ES et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ja-JP-mac ka kn ko ku lt lv mk ml mn mr ms nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE ta te th tr uk vi zh-CN zh-TW 
 mozilla = comm-central
 l10n = releases/l10n-mozilla-2.0
 repo = http://hg.mozilla.org/
 l10nbase = http://hg.mozilla.org/releases/l10n-mozilla-2.0
 l10n.ini = suite/locales/l10n.ini
-builders = Seamonkey\ comm-2.0\ linux\ l10n\ dep Seamonkey\ comm-2.0\ macosx\ l10n\ dep Seamonkey\ comm-2.0\ win32\ l10n\ dep
+builders = Seamonkey\ comm-2.0\ linux\ l10n\ dep Seamonkey\ comm-2.0\ win32\ l10n\ dep
 en_us_binary = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-2.0/
 
 [sea22x]
 app = suite
 type = hg
 locales = all
 #locales = af ar as be bg bn-IN ca cs cy da de el en-GB eo es-AR es-ES et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ja-JP-mac ka kn ko ku lt lv mk ml mn mr ms nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE ta te th tr uk vi zh-CN zh-TW 
 mozilla = comm-central
 l10n = l10n-central
 repo = http://hg.mozilla.org/
 l10nbase = http://hg.mozilla.org/l10n-central
 l10n.ini = suite/locales/l10n.ini
-builders = Seamonkey\ comm-central-trunk\ linux\ l10n\ dep Seamonkey\ comm-central-trunk\ macosx\ l10n\ dep Seamonkey\ comm-central-trunk\ win32\ l10n\ dep
+builders = Seamonkey\ comm-central-trunk\ linux\ l10n\ dep Seamonkey\ comm-central-trunk\ win32\ l10n\ dep
 en_us_binary = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-central-trunk/
 
deleted file mode 100644
--- a/seamonkey/macosx/comm-1.9.1/nightly/mozconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-else
-. $topsrcdir/build/macosx/universal/mozconfig
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-tests
-ac_add_options --enable-codesighs
-
-ac_add_options --enable-static
-ac_add_options --disable-shared
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
deleted file mode 100644
--- a/seamonkey/macosx/comm-1.9.1/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-else
-. $topsrcdir/build/macosx/universal/mozconfig
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-tests
-
-ac_add_options --enable-static
-ac_add_options --disable-shared
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-1.9.1/unittest/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-optimize
-ac_add_options --enable-logrefcnt
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/macosx/comm-2.0/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-#. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-#else
-#. $topsrcdir/build/macosx/universal/mozconfig
-#fi
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-codesighs
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/seamonkey/macosx/comm-2.0/release/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-2.0/unittest/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-optimize
-ac_add_options --enable-logrefcnt
-ac_add_options --enable-accessibility
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/macosx/comm-aurora/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-#. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-#else
-#. $topsrcdir/build/macosx/universal/mozconfig
-#fi
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-codesighs
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/seamonkey/macosx/comm-aurora/release/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-aurora/unittest/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-optimize
-ac_add_options --enable-logrefcnt
-ac_add_options --enable-accessibility
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/macosx/comm-beta/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-#. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-#else
-#. $topsrcdir/build/macosx/universal/mozconfig
-#fi
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-beta/nightly/mozconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-codesighs
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/seamonkey/macosx/comm-beta/release-l10n/mozconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-ac_add_options --with-l10n-base=../../releases/l10n/mozilla-beta
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
deleted file mode 100644
--- a/seamonkey/macosx/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-beta/unittest/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-optimize
-ac_add_options --enable-logrefcnt
-ac_add_options --enable-accessibility
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/macosx/comm-central-trunk/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-#. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-#else
-#. $topsrcdir/build/macosx/universal/mozconfig
-#fi
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-central-trunk/nightly/mozconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-codesighs
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/seamonkey/macosx/comm-central-trunk/release/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-central-trunk/unittest/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-optimize
-ac_add_options --enable-logrefcnt
-ac_add_options --enable-accessibility
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/macosx/comm-release/debug/mozconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Don't use the standard mozconfig. We don't want universal for a debug build. 
-#if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-#. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-#else
-#. $topsrcdir/build/macosx/universal/mozconfig
-#fi
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-release/nightly/mozconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-ac_add_options --enable-codesighs
-ac_add_options --disable-install-strip
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
deleted file mode 100644
--- a/seamonkey/macosx/comm-release/release-l10n/mozconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-ac_add_options --with-l10n-base=../../releases/l10n/mozilla-release
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
deleted file mode 100644
--- a/seamonkey/macosx/comm-release/release/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-else
-  # Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-  # mixed up with host/target CPUs when trying to work out how to do the
-  # universal build. When we redo the build system (bug 648979) this will
-  # go away.
-  unset CC
-  unset CXX
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_PLATFORM=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/macosx/comm-release/unittest/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-optimize
-ac_add_options --enable-logrefcnt
-ac_add_options --enable-accessibility
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
--- a/seamonkey/master.cfg
+++ b/seamonkey/master.cfg
@@ -11,17 +11,16 @@ from config import SLAVES
 from buildbotcustom.misc import generateCCBranchObjects
 
 
 ACTIVE_BRANCHES = ['comm-central-trunk', 'comm-2.0', 'comm-aurora', 'comm-beta', 'comm-release', 'comm-1.9.1']
 L10N_SLAVES = {
     'linux': SLAVES['linux'],
     'linux64': SLAVES['linux64'],
     'win32': SLAVES['win32'],
-    'macosx': SLAVES['macosx'],
     'macosx64': SLAVES['macosx64'],
 }
 
 execfile("master-main.cfg")
 
 # Required for sendchange
 from buildbot.changes.pb import PBChangeSource
 c['change_source'].append(PBChangeSource())
--- a/seamonkey/release-comm-1.9.1.py
+++ b/seamonkey/release-comm-1.9.1.py
@@ -50,24 +50,24 @@ releaseConfig['chatzillaRelbranchOverrid
 #  L10n repositories
 releaseConfig['l10nRepoPath']               = 'releases/l10n-mozilla-1.9.1'
 releaseConfig['l10nRevisionFile']           = 'l10n-changesets'
 releaseConfig['l10nRelbranchOverride']      = 'COMM_1_9_1_BRANCH'
 #  Support repositories
 #   not used yet
 
 # Platform configuration
-releaseConfig['enUSPlatforms']              = ('linux', 'linux64', 'win32', 'macosx')
+releaseConfig['enUSPlatforms']              = ('linux', 'linux64', 'win32')
 releaseConfig['talosTestPlatforms']         = ()
 
 # Unittests
 releaseConfig['unittestPlatforms']          = ()
 
 # L10n configuration
-releaseConfig['l10nPlatforms']              = ('linux', 'win32', 'macosx')
+releaseConfig['l10nPlatforms']              = ('linux', 'win32')
 releaseConfig['mergeLocales']               = False
 
 # Mercurial account
 releaseConfig['hgUsername']                 = 'seabld'
 releaseConfig['hgSshKey']                   = '~seabld/.ssh/seabld_dsa'
 
 # Update-specific configuration
 releaseConfig['cvsroot']                    = ':ext:seabld@cvs.mozilla.org:/cvsroot' # for patcher, etc.
@@ -88,17 +88,16 @@ releaseConfig['verifyConfigs']          
 }
 
 # Major update configuration
 releaseConfig['majorUpdateRepoPath']        = 'releases/mozilla-release'
 releaseConfig['majorPatcherToolsTag']       = 'UPDATE_PACKAGING_R11_1_MU'
 releaseConfig['majorUpdateSourceRepoPath']  = 'releases/comm-release'
 releaseConfig['majorUpdatePatcherConfig']   = 'moz191-seamonkey-branch-major-patcher2.cfg'
 releaseConfig['majorUpdateVerifyConfigs']   = {'linux':  'moz191-seamonkey-linux-major.cfg',
-                                               'macosx': 'moz191-seamonkey-mac-major.cfg',
                                                'win32':  'moz191-seamonkey-win32-major.cfg'}
 releaseConfig['majorUpdateToVersion']       = '2.6.1'
 releaseConfig['majorUpdateAppVersion']      = '2.6.1'
 releaseConfig['majorUpdateBaseTag']         = 'SEAMONKEY_2_6_1'
 releaseConfig['majorUpdateBuildNumber']     = 1
 releaseConfig['majorUpdateReleaseNotesUrl'] = 'https://www.mozilla.org/start/unsupported/%locale%/index.html'
 
 # Tuxedo/Bouncer related - XXX: atm not allowed for SeaMonkey
--- a/seamonkey/release_master.py
+++ b/seamonkey/release_master.py
@@ -401,18 +401,16 @@ for platform in releaseConfig['l10nPlatf
         buildNumber=releaseConfig['buildNumber'],
         oldVersion=releaseConfig['oldVersion'],
         oldBuildNumber=releaseConfig['oldBuildNumber'],
         clobberURL=branchConfig['base_clobber_url'],
         platform=platform,
     )
 
     verifySlavePlat = 'macosx64'
-    if releaseConfig['sourceRepoName'] == 'comm-1.9.1':
-       verifySlavePlat = 'macosx'
 
     builders.append({
         'name': '%s_l10n_verification' % platform,
         'slavenames': branchConfig['platforms'][verifySlavePlat]['slaves'],
         'category': 'release',
         'builddir': builderPrefix('%s_l10n_verification' % platform),
         'slavebuilddir': reallyShort(builderPrefix('%s_l10n_verification' % platform)),
         'factory': l10n_verification_factory,