deleted file mode 100644
--- a/seamonkey/ccfactory.py
+++ /dev/null
@@ -1,232 +0,0 @@
-from datetime import datetime
-import os.path, re
-from time import strftime
-
-from twisted.python import log
-
-from buildbot.process.factory import BuildFactory
-from buildbot.steps.shell import ShellCommand, WithProperties, SetProperty
-from buildbot.steps.source import Mercurial
-from buildbot.steps.transfer import FileDownload
-
-#import buildbotcustom.steps.misc
-#import buildbotcustom.steps.release
-#import buildbotcustom.steps.test
-#import buildbotcustom.steps.transfer
-#import buildbotcustom.steps.updates
-#import buildbotcustom.steps.talos
-#import buildbotcustom.steps.unittest
-#import buildbotcustom.env
-#reload(buildbotcustom.steps.misc)
-#reload(buildbotcustom.steps.release)
-#reload(buildbotcustom.steps.test)
-#reload(buildbotcustom.steps.transfer)
-#reload(buildbotcustom.steps.updates)
-#reload(buildbotcustom.steps.talos)
-#reload(buildbotcustom.steps.unittest)
-#reload(buildbotcustom.env)
-
-from buildbotcustom.steps.misc import SetMozillaBuildProperties, \
- TinderboxShellCommand, SendChangeStep, GetBuildID, MozillaClobberer, \
- FindFile, DownloadFile, UnpackFile, SetBuildProperty, GetHgRevision
-from buildbotcustom.steps.release import UpdateVerify, L10nVerifyMetaDiff
-from buildbotcustom.steps.test import AliveTest, CompareBloatLogs, \
- CompareLeakLogs, GraphServerPost
-from buildbotcustom.steps.transfer import MozillaStageUpload
-from buildbotcustom.steps.updates import CreateCompleteUpdateSnippet
-from buildbotcustom.env import MozillaEnvironments
-
-import buildbotcustom.steps.unittest as unittest_steps
-
-import buildbotcustom.steps.talos as talos_steps
-
-# we're basically just extending buildbotcustom.process.factory
-#import buildbotcustom.process.factory
-#reload(buildbotcustom.process.factory)
-from buildbotcustom.process.factory import *
-
-class CCReleaseTaggingFactory(ReleaseTaggingFactory):
- def __init__(self, chatzillaTimestamp, cvsroot, **kwargs):
- ReleaseTaggingFactory.__init__(self, **kwargs)
-
- # need to repeat those definitions here
- buildTag = '%s_BUILD%s' % (kwargs['baseTag'], str(kwargs['buildNumber']))
- releaseTag = '%s_RELEASE' % kwargs['baseTag']
-
- if cvsroot and chatzillaTimestamp:
- self.addStep(ShellCommand,
- command=['cvs', '-d', cvsroot, '-q',
- 'checkout', '-P', '-D', chatzillaTimestamp,
- '-d', 'chatzilla', 'mozilla/extensions/irc'],
- workdir='.',
- description=['check out ChatZilla'],
- haltOnFailure=True,
- timeout=30*60 # 30 minutes
- )
- for tag in (buildTag, releaseTag):
- self.addStep(ShellCommand,
- command=['cvs', '-d', cvsroot, 'tag',
- '-D', chatzillaTimestamp,
- '-F', tag],
- workdir='chatzilla',
- description=['tag ChatZilla'],
- haltOnFailure=True
- )
-
-class CCSourceFactory(ReleaseFactory):
- def __init__(self, productName, version, baseTag, stagingServer,
- stageUsername, stageSshKey, buildNumber, mozRepoPath,
- inspectorRepoPath='', venkmanRepoPath='', cvsroot='',
- autoconfDirs=['.'], buildSpace=1, **kwargs):
- ReleaseFactory.__init__(self, buildSpace=buildSpace, **kwargs)
- releaseTag = '%s_RELEASE' % (baseTag)
- sourceTarball = 'source/%s-%s.source.tar.bz2' % (productName,
- version)
- # '-c' is for "release to candidates dir"
- postUploadCmd = 'post_upload.py -p %s -v %s -n %s -c' % \
- (productName, version, buildNumber)
- uploadEnv = {'UPLOAD_HOST': stagingServer,
- 'UPLOAD_USER': stageUsername,
- 'UPLOAD_SSH_KEY': '~/.ssh/%s' % stageSshKey,
- 'UPLOAD_TO_TEMP': '1',
- 'POST_UPLOAD_CMD': postUploadCmd}
-
- self.addStep(ShellCommand,
- command=['rm', '-rf', 'source'],
- workdir='.',
- haltOnFailure=True
- )
- self.addStep(ShellCommand,
- command=['mkdir', 'source'],
- workdir='.',
- haltOnFailure=True
- )
- self.addStep(ShellCommand,
- command=['hg', 'clone', self.repository, self.branchName],
- workdir='.',
- description=['clone %s' % self.branchName],
- haltOnFailure=True,
- timeout=30*60 # 30 minutes
- )
- # build up the checkout command that will bring us up to the release version
- co_command = ['python', 'client.py', 'checkout',
- '--comm-rev=%s' % releaseTag,
- '--mozilla-repo=%s' % self.getRepository(mozRepoPath),
- '--mozilla-rev=%s' % releaseTag]
- if inspectorRepoPath:
- co_command.append('--inspector-repo=%s' % self.getRepository(inspectorRepoPath))
- co_command.append('--inspector-rev=%s' % releaseTag)
- else:
- co_command.append('--skip-inspector')
- if venkmanRepoPath:
- co_command.append('--venkman-repo=%s' % self.getRepository(venkmanRepoPath))
- co_command.append('--venkman-rev=%s' % releaseTag)
- else:
- co_command.append('--skip-venkman')
- if cvsroot:
- co_command.append('--cvsroot=%s' % cvsroot)
- else:
- co_command.append('--skip-chatzilla')
- # execute the checkout
- self.addStep(ShellCommand,
- command=co_command,
- workdir=self.branchName,
- description=['update to', releaseTag],
- haltOnFailure=True
- )
- if cvsroot:
- # Update ChatZilla to release tag
- self.addStep(ShellCommand,
- command=['cvs', 'up', '-r', releaseTag],
- workdir='%s/mozilla/extensions/irc' % self.branchName,
- description=['update to', releaseTag],
- haltOnFailure=True
- )
- # the autoconf and actual tarring steps
- # should be replaced by calling the build target
- for dir in autoconfDirs:
- self.addStep(ShellCommand,
- command=['autoconf-2.13'],
- workdir='%s/%s' % (self.branchName, dir),
- haltOnFailure=True
- )
- self.addStep(ShellCommand,
- command=['tar', '-cj', '--owner=0', '--group=0', '--numeric-owner',
- '--mode=go-w', '--exclude=.hg*', '--exclude=CVS',
- '--exclude=.cvs*', '-f', sourceTarball, self.branchName],
- workdir='.',
- description=['create tarball'],
- haltOnFailure=True
- )
- self.addStep(ShellCommand,
- command=['python', '%s/mozilla/build/upload.py' % self.branchName,
- '--base-path', '.', sourceTarball],
- workdir='.',
- env=uploadEnv,
- description=['upload files'],
- )
-
-class CCReleaseBuildFactory(CCMercurialBuildFactory, ReleaseBuildFactory):
- def __init__(self, mozRepoPath='', inspectorRepoPath='',
- venkmanRepoPath='', cvsroot='', **kwargs):
- self.skipBlankRepos = True
- self.mozRepoPath = mozRepoPath
- self.inspectorRepoPath = inspectorRepoPath
- self.venkmanRepoPath = venkmanRepoPath
- self.cvsroot = cvsroot
- # ReleaseBuildFactory.__init__ turns prettynames on!
- ReleaseBuildFactory.__init__(self, mozillaDir='mozilla', **kwargs)
-
-class CCReleaseRepackFactory(CCBaseRepackFactory, ReleaseRepackFactory):
- def __init__(self, mozRepoPath='', inspectorRepoPath='',
- venkmanRepoPath='', cvsroot='', **kwargs):
- self.skipBlankRepos = True
- self.mozRepoPath = mozRepoPath
- self.inspectorRepoPath = inspectorRepoPath
- self.venkmanRepoPath = venkmanRepoPath
- self.cvsroot = cvsroot
- # ReleaseRepackFactory.__init__ turns prettynames on!
- ReleaseRepackFactory.__init__(self, mozillaDir='mozilla', **kwargs)
-
- def updateSources(self):
- ReleaseRepackFactory.updateSources(self)
- self.addStep(ShellCommand,
- command=['hg', 'up', '-C', '-r', self.buildRevision],
- workdir='build/'+self.mozillaSrcDir,
- description=['update mozilla',
- 'to %s' % self.buildRevision],
- haltOnFailure=True
- )
- if self.venkmanRepoPath:
- self.addStep(ShellCommand,
- command=['hg', 'up', '-C', '-r', self.buildRevision],
- workdir='build/'+self.mozillaSrcDir+'/extensions/venkman',
- description=['update venkman',
- 'to %s' % self.buildRevision],
- haltOnFailure=True
- )
- if self.inspectorRepoPath:
- self.addStep(ShellCommand,
- command=['hg', 'up', '-C', '-r', self.buildRevision],
- workdir='build/'+self.mozillaSrcDir+'/extensions/inspector',
- description=['update inspector',
- 'to %s' % self.buildRevision],
- haltOnFailure=True
- )
- if self.cvsroot:
- self.addStep(ShellCommand,
- command=['cvs', 'up', '-r', self.buildRevision],
- workdir='build/'+self.mozillaSrcDir+'/extensions/irc',
- description=['update chatzilla',
- 'to %s' % self.buildRevision],
- haltOnFailure=True
- )
-
- def downloadBuilds(self):
- # XXX: the current ReleaseRepackFactory.downloadBuilds ONLY works for prettynames!
- ReleaseRepackFactory.downloadBuilds(self)
-
- # unsure why we need to explicitely do this but after bug 478436 we stopped
- # executing the actual repackaging without this def here
- def doRepack(self):
- ReleaseRepackFactory.doRepack(self)deleted file mode 100644
--- a/seamonkey/config.py
+++ /dev/null
@@ -1,727 +0,0 @@
-from copy import deepcopy
-
-SLAVES = {
- 'linux': ['cb-seamonkey-linux-%02i' % x for x in [1,2,3]] +
- ['cn-sea-qm-centos5-%02i' % x for x in [1]] +
- ['cb-sea-linux-tbox'],
- 'linux64': ['cb-seamonkey-linux64-%02i' % x for x in [1]],
- 'win32': ['cb-seamonkey-win32-%02i' % x for x in [1,2,3]] +
- ['cn-sea-qm-win2k3-%02i' % x for x in [1]] +
- ['cb-sea-win32-tbox'] +
- ['sea-win32-%02i' % x for x in [2,3,4]], #iX machines
- 'macosx': ['cb-sea-miniosx%02i' % x for x in [1,2]],
- 'macosx64': ['cb-sea-miniosx64-%02i' % x for x in [1,2,3]],
-}
-
-
-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.
- # Since they're both right here it shouldn't be
- # a problem to keep them in sync.
- 'hgurl': 'https://hg.mozilla.org/',
- 'hghost': 'hg.mozilla.org',
- 'cvsroot': ':ext:seabld@cvs.mozilla.org:/cvsroot', #?
- 'config_subdir': 'seamonkey',
- 'irc_bot_name': 'sea-build-bot', #?
- 'irc_bot_channels': ['mozbot'], #?
- 'objdir': 'objdir',
- 'objdir_unittests': 'objdir',
- 'stage_username': 'seabld',
- 'stage_base_path': '/home/ftp/pub',
- 'stage_group': 'seamonkey',
- 'stage_ssh_key': 'seabld_dsa',
- 'symbol_server_path': '/mnt/netapp/breakpad/symbols_sea/',
- 'symbol_server_post_upload_cmd': '/usr/local/bin/post-symbol-upload.py',
- 'aus2_user': 'seabld',
- 'aus2_ssh_key': 'seabld_dsa',
- 'hg_username': 'seabld',
- 'hg_ssh_key': '~seabld/.ssh/seabld_dsa',
- 'graph_selector': '/server/collect.cgi',
- 'compare_locales_repo_path': 'build/compare-locales',
- 'compare_locales_tag': 'RELEASE_AUTOMATION',
- 'default_build_space': 5,
- 'default_l10n_space': 3,
- 'default_clobber_time': 24*7, # 1 week
- 'unittest_suites': [
- ('mochitests', dict(suite='mochitest-plain', chunkByDir=4, totalChunks=5)),
- ('mochitest-other', ['mochitest-chrome', 'mochitest-browser-chrome',
- 'mochitest-a11y']),
- ('reftest', ['reftest']),
- ('crashtest', ['crashtest']),
- ('xpcshell', ['xpcshell']),
- ],
- # Unittest suites to run directly in the unittest build cycle
- 'unittest_exec_xpcshell_suites': False,
- 'unittest_exec_reftest_suites': False,
- 'unittest_exec_mochi_suites': False,
- 'unittest_exec_mozmill_suites': False,
- 'platforms': {
- 'linux': {},
- 'linux64': {},
- 'win32': {},
- 'macosx64': {},
- 'linux-debug': {},
- 'macosx-debug': {},
- 'macosx64-debug': {},
- 'win32-debug': {},
- },
- 'pgo_strategy': None,
- 'pgo_platforms': list(),
- 'enable_codecoverage': False,
- 'enable_blocklist_update': False,
- 'blocklist_update_on_closed_tree': False,
- 'enable_nightly': True,
- 'enable_valgrind': False,
- 'enable_xulrunner': False,
-
- # if true, this branch will get bundled and uploaded to ftp.m.o for users
- # to download and thereby accelerate their cloning
- 'enable_weekly_bundle': False,
-
- 'hash_type': 'sha512',
- 'create_snippet': False,
- 'create_partial': False,
- 'create_partial_l10n': False,
- 'l10n_modules': [
- 'suite', 'editor/ui',
- 'netwerk', 'dom', 'toolkit',
- 'security/manager',
- 'sync/services',
- ],
- 'use_old_updater': False,
- 'idle_timeout': 60*60*12, # 12 hours
-
- # staging/production-dependent settings - all is production for us
- 'config_repo_path': 'build/buildbot-configs',
- 'buildbotcustom_repo_path': 'build/buildbotcustom',
- 'stage_server': 'stage.mozilla.org',
- 'aus2_host': 'aus2-community.mozilla.org',
- 'download_base_url': 'https://ftp-ssl.mozilla.org/pub/mozilla.org/seamonkey',
- 'graph_server': 'graphs.mozilla.org',
- 'build_tools_repo_path': 'users/Callek_gmail.com/tools',
-# 'build_tools_repo_path': 'build/tools',
- 'base_clobber_url': 'http://cb-seamonkey-linuxmaster-01.mozilla.org/index.php',
- # List of talos masters to notify of new builds,
- # and if a failure to notify the talos master should result in a warning
- 'talos_masters': [],
- # List of unittest masters to notify of new builds to test,
- # if a failure to notify the master should result in a warning,
- # and sendchange retry count before give up
- 'unittest_masters': [('cb-seamonkey-linuxmaster-01.mozilla.org:9010', False, 5)],
- 'weekly_tinderbox_tree': 'Testing',
- 'l10n_tinderbox_tree': 'Mozilla-l10n',
- 'tinderbox_tree': 'MozillaTest',
- 'pgo_strategy': None,
- 'enabled_products': ['seamonkey'],
-}
-
-# shorthand, because these are used often
-OBJDIR = GLOBAL_VARS['objdir']
-SYMBOL_SERVER_PATH = GLOBAL_VARS['symbol_server_path']
-SYMBOL_SERVER_POST_UPLOAD_CMD = GLOBAL_VARS['symbol_server_post_upload_cmd']
-
-PLATFORM_VARS = {
- 'linux': {
- 'product_name': 'seamonkey',
- 'app_name': 'suite',
- 'brand_name': 'SeaMonkey',
- 'base_name': 'Linux %(branch)s',
- 'mozconfig': 'linux/%(branch)s/nightly',
- 'src_mozconfig': 'suite/config/mozconfigs/linux32/nightly',
- 'profiled_build': False,
- 'builds_before_reboot': None,
- 'build_space': 8,
- 'upload_symbols': True,
- 'download_symbols': True,
- 'packageTests': True,
- 'slaves': SLAVES['linux'],
- 'platform_objdir': OBJDIR,
- 'stage_platform': 'linux',
- 'update_platform': 'Linux_x86-gcc3',
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': 'dm-symbolpush01.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': "/home/seabld/.ssh/seabld_dsa",
- 'TINDERBOX_OUTPUT': '1',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'CCACHE_DIR': '/builds/ccache',
- 'CCACHE_UMASK': '002',
- 'DISPLAY': ':2',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- 'talos_masters': GLOBAL_VARS['talos_masters'],
- 'stage_product': 'seamonkey',
- },
- 'linux64': {
- 'product_name': 'seamonkey',
- 'app_name': 'suite',
- 'brand_name': 'SeaMonkey',
- 'base_name': 'Linux x86-64 %(branch)s',
- 'mozconfig': 'linux64/%(branch)s/nightly',
- 'src_mozconfig': 'suite/config/mozconfigs/linux64/nightly',
- 'profiled_build': False,
- 'builds_before_reboot': None,
- 'build_space': 6,
- 'upload_symbols': True,
- 'download_symbols': True,
- 'packageTests': True,
- 'slaves': SLAVES['linux64'],
- 'platform_objdir': OBJDIR,
- 'stage_platform': 'linux64',
- 'update_platform': 'Linux_x86_64-gcc3',
- 'enable_ccache': True,
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': 'dm-symbolpush01.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': "/home/seabld/.ssh/seabld_dsa",
- 'MOZ_SYMBOLS_EXTRA_BUILDID': 'linux64',
- 'TINDERBOX_OUTPUT': '1',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'CCACHE_DIR': '/builds/ccache',
- 'CCACHE_UMASK': '002',
- 'DISPLAY': ':2',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- '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': None,
- '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',
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': 'dm-symbolpush01.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',
- '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,
- 'builds_before_reboot': None,
- 'build_space': 8,
- 'upload_symbols': True,
- 'download_symbols': True,
- 'packageTests': True,
- 'slaves': SLAVES['macosx64'],
- 'platform_objdir': "%s/i386" % OBJDIR,
- 'stage_platform': 'macosx64',
- 'update_platform': 'Darwin_x86_64-gcc3',
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': 'dm-symbolpush01.mozilla.org',
- 'SYMBOL_SERVER_USER': 'seabld',
- 'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
- 'SYMBOL_SERVER_SSH_KEY': "/Users/seabld/.ssh/seabld_dsa",
- 'MOZ_SYMBOLS_EXTRA_BUILDID': 'macosx64',
- 'TINDERBOX_OUTPUT': '1',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'CHOWN_ROOT': '~/bin/chown_root',
- 'CHOWN_REVERT': '~/bin/chown_revert',
- 'LC_ALL': 'C',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- 'talos_masters': GLOBAL_VARS['talos_masters'],
- 'stage_product': 'seamonkey',
- },
- 'win32': {
- 'product_name': 'seamonkey',
- 'app_name': 'suite',
- 'brand_name': 'SeaMonkey',
- 'base_name': 'WINNT 5.2 %(branch)s',
- 'mozconfig': 'win32/%(branch)s/nightly',
- 'src_mozconfig': 'suite/config/mozconfigs/win32/nightly',
- 'profiled_build': False,
- 'builds_before_reboot': 25,
- 'build_space': 9,
- 'upload_symbols': True,
- 'download_symbols': True,
- 'packageTests': True,
- 'slaves': SLAVES['win32'],
- 'platform_objdir': OBJDIR,
- 'mochitest_leak_threshold': 484,
- 'crashtest_leak_threshold': 484,
- 'stage_platform': 'win32',
- 'update_platform': 'WINNT_x86-msvc',
- 'enable_shared_checkouts': True,
- 'env': {
- 'CVS_RSH': 'ssh',
- 'MOZ_OBJDIR': OBJDIR,
- 'SYMBOL_SERVER_HOST': 'dm-symbolpush01.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': "/c/Documents and Settings/seabld/.ssh/seabld_dsa",
- 'TINDERBOX_OUTPUT': '1',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- # Source server support, bug 506702
- 'PDBSTR_PATH': '/c/Program Files/Debugging Tools for Windows/srcsrv/pdbstr.exe',
- 'HG_SHARE_BASE_DIR': 'e:/builds/hg-shared',
- },
- 'enable_opt_unittests': False,
- 'enable_checktests': True,
- 'talos_masters': GLOBAL_VARS['talos_masters'],
- 'stage_product': 'seamonkey',
- },
- 'linux-debug': {
- 'product_name': 'seamonkey',
- 'app_name': 'suite',
- 'brand_name': 'SeaMonkey',
- 'base_name': 'Linux %(branch)s leak test',
- 'mozconfig': 'linux/%(branch)s/debug',
- 'src_mozconfig': 'suite/config/mozconfigs/linux32/debug',
- 'profiled_build': False,
- 'builds_before_reboot': None,
- 'download_symbols': True,
- 'build_space': 7,
- 'slaves': SLAVES['linux'],
- 'platform_objdir': OBJDIR,
- 'stage_platform': 'linux-debug',
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'DISPLAY': ':2',
- 'LD_LIBRARY_PATH': '%s/mozilla/dist/bin' % OBJDIR,
- 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'CCACHE_DIR': '/builds/ccache',
- 'CCACHE_UMASK': '002',
- },
- 'enable_unittests': True,
- 'enable_checktests': True,
- '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': None,
- 'download_symbols': True,
- 'build_space': 5,
- 'slaves': SLAVES['macosx'],
- 'platform_objdir': OBJDIR,
- 'stage_platform': 'macosx-debug',
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- '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,
- 'builds_before_reboot': None,
- 'download_symbols': True,
- 'build_space': 5,
- 'slaves': SLAVES['macosx64'],
- 'platform_objdir': OBJDIR,
- 'stage_platform': 'macosx64-debug',
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'LC_ALL': 'C',
- },
- 'enable_unittests': True,
- 'enable_checktests': True,
- 'talos_masters': GLOBAL_VARS['talos_masters'],
- 'stage_product': 'seamonkey',
- },
- 'win32-debug': {
- 'product_name': 'seamonkey',
- 'app_name': 'suite',
- 'brand_name': 'SeaMonkey',
- 'base_name': 'WINNT 5.2 %(branch)s leak test',
- 'mozconfig': 'win32/%(branch)s/debug',
- 'src_mozconfig': 'suite/config/mozconfigs/win32/debug',
- 'profiled_build': False,
- 'builds_before_reboot': 25,
- 'download_symbols': True,
- 'build_space': 8,
- 'slaves': SLAVES['win32'],
- 'platform_objdir': OBJDIR,
- 'enable_shared_checkouts': True,
- 'stage_platform': 'win32-debug',
- 'env': {
- 'MOZ_OBJDIR': OBJDIR,
- 'XPCOM_DEBUG_BREAK': 'stack-and-abort',
- 'MOZ_CRASHREPORTER_NO_REPORT': '1',
- 'HG_SHARE_BASE_DIR': 'e:/builds/hg-shared',
- },
- 'enable_unittests': True,
- 'enable_checktests': True,
- 'talos_masters': GLOBAL_VARS['talos_masters'],
- 'stage_product': 'seamonkey',
- },
-}
-
-# All branches that are to be built MUST be listed here, along with their
-# platforms (if different from the default set).
-BRANCHES = {
- 'comm-central-trunk': {},
- '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]:
- continue
- BRANCHES[branch][key] = deepcopy(value)
-
- for platform, platform_config in PLATFORM_VARS.items():
- if platform in BRANCHES[branch]['platforms']:
- for key, value in platform_config.items():
- value = deepcopy(value)
- if isinstance(value, str):
- value = value % locals()
- BRANCHES[branch]['platforms'][platform][key] = value
-
-######## 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']['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'
-BRANCHES['comm-central-trunk']['localesURL'] = \
- '%s/build/buildbot-configs/raw-file/seamonkey-production/seamonkey/l10n/all-locales.comm-central' % (GLOBAL_VARS['hgurl'])
-# If True, a complete update snippet for this branch will be generated and
-# uploaded to. Any platforms with 'debug' in them will not have snippets
-# generated.
-BRANCHES['comm-central-trunk']['create_snippet'] = True
-BRANCHES['comm-central-trunk']['update_channel'] = 'nightly'
-BRANCHES['comm-central-trunk']['create_partial'] = True
-BRANCHES['comm-central-trunk']['create_partial_l10n'] = True
-BRANCHES['comm-central-trunk']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/SeaMonkey/comm-central-trunk'
-BRANCHES['comm-central-trunk']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/SeaMonkey/comm-central-trunk'
-# staging/production-dependent settings - all is production for us
-BRANCHES['comm-central-trunk']['tinderbox_tree'] = 'SeaMonkey'
-BRANCHES['comm-central-trunk']['packaged_unittest_tinderbox_tree'] = 'SeaMonkey'
-
-######## comm-aurora
-# 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']['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'
-BRANCHES['comm-aurora']['localesURL'] = \
- '%s/build/buildbot-configs/raw-file/seamonkey-production/seamonkey/l10n/all-locales.comm-aurora' % (GLOBAL_VARS['hgurl'])
-# If True, a complete update snippet for this branch will be generated and
-# uploaded to. Any platforms with 'debug' in them will not have snippets
-# generated.
-BRANCHES['comm-aurora']['create_snippet'] = True
-BRANCHES['comm-aurora']['update_channel'] = 'aurora'
-BRANCHES['comm-aurora']['create_partial'] = True
-BRANCHES['comm-aurora']['create_partial_l10n'] = True
-BRANCHES['comm-aurora']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/SeaMonkey/comm-aurora'
-BRANCHES['comm-aurora']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/SeaMonkey/comm-aurora'
-# staging/production-dependent settings - all is production for us
-BRANCHES['comm-aurora']['tinderbox_tree'] = 'SeaMonkey-Aurora'
-BRANCHES['comm-aurora']['packaged_unittest_tinderbox_tree'] = 'SeaMonkey-Aurora'
-
-######## comm-beta
-# 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']['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'
-BRANCHES['comm-beta']['localesURL'] = \
- '%s/build/buildbot-configs/raw-file/seamonkey-production/seamonkey/l10n/all-locales.comm-beta' % (GLOBAL_VARS['hgurl'])
-# If True, a complete update snippet for this branch will be generated and
-# uploaded to. Any platforms with 'debug' in them will not have snippets
-# generated.
-BRANCHES['comm-beta']['create_snippet'] = True
-BRANCHES['comm-beta']['update_channel'] = 'beta'
-BRANCHES['comm-beta']['create_partial'] = True
-BRANCHES['comm-beta']['create_partial_l10n'] = True
-BRANCHES['comm-beta']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/SeaMonkey/comm-beta'
-BRANCHES['comm-beta']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/SeaMonkey/comm-beta'
-# staging/production-dependent settings - all is production for us
-BRANCHES['comm-beta']['tinderbox_tree'] = 'SeaMonkey-Beta'
-BRANCHES['comm-beta']['packaged_unittest_tinderbox_tree'] = 'SeaMonkey-Beta'
-
-######## comm-release
-# 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']['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'
-BRANCHES['comm-release']['localesURL'] = \
- '%s/build/buildbot-configs/raw-file/seamonkey-production/seamonkey/l10n/all-locales.comm-release' % (GLOBAL_VARS['hgurl'])
-# If True, a complete update snippet for this branch will be generated and
-# uploaded to. Any platforms with 'debug' in them will not have snippets
-# generated.
-BRANCHES['comm-release']['create_snippet'] = True
-BRANCHES['comm-release']['update_channel'] = 'release'
-BRANCHES['comm-release']['create_partial'] = True
-BRANCHES['comm-release']['create_partial_l10n'] = True
-BRANCHES['comm-release']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/SeaMonkey/comm-release'
-BRANCHES['comm-release']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/SeaMonkey/comm-release'
-# staging/production-dependent settings - all is production for us
-BRANCHES['comm-release']['tinderbox_tree'] = 'SeaMonkey-Release'
-BRANCHES['comm-release']['packaged_unittest_tinderbox_tree'] = 'SeaMonkey-Release'
-
-######## comm-2.0
-# 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']['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'
-BRANCHES['comm-2.0']['localesURL'] = \
- '%s/build/buildbot-configs/raw-file/seamonkey-production/seamonkey/l10n/all-locales.comm-2.0' % (GLOBAL_VARS['hgurl'])
-# If True, a complete update snippet for this branch will be generated and
-# uploaded to. Any platforms with 'debug' in them will not have snippets
-# generated.
-BRANCHES['comm-2.0']['create_snippet'] = True
-BRANCHES['comm-2.0']['update_channel'] = 'nightly'
-BRANCHES['comm-2.0']['create_partial'] = True
-BRANCHES['comm-2.0']['create_partial_l10n'] = True
-BRANCHES['comm-2.0']['aus2_base_upload_dir'] = '/opt/aus2/incoming/2/SeaMonkey/comm-2.0'
-BRANCHES['comm-2.0']['aus2_base_upload_dir_l10n'] = '/opt/aus2/incoming/2/SeaMonkey/comm-2.0'
-# staging/production-dependent settings - all is production for us
-BRANCHES['comm-2.0']['tinderbox_tree'] = 'SeaMonkey2.1'
-BRANCHES['comm-2.0']['packaged_unittest_tinderbox_tree'] = 'SeaMonkey2.1'
-
-######## comm-1.9.1
-# This is a path, relative to HGURL, where the repository is located
-# HGURL + repo_path should be a valid repository
-BRANCHES['comm-1.9.1']['repo_path'] = 'releases/comm-1.9.1'
-BRANCHES['comm-1.9.1']['mozilla_repo_path'] = 'releases/mozilla-1.9.1'
-BRANCHES['comm-1.9.1']['l10n_repo_path'] = 'releases/l10n-mozilla-1.9.1'
-BRANCHES['comm-1.9.1']['enable_nightly'] = False
-BRANCHES['comm-1.9.1']['start_hour'] = [0]
-BRANCHES['comm-1.9.1']['start_minute'] = [0]
-BRANCHES['comm-1.9.1']['use_old_updater'] = True
-BRANCHES['comm-1.9.1']['unittest_suites'] = [
- ('mochitests', ['mochitest-plain']),
- ('mochitest-other', ['mochitest-chrome', 'mochitest-browser-chrome',
- 'mochitest-a11y']),
- ('reftest', ['reftest']),
- ('crashtest', ['crashtest']),
-]
-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']['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'
-BRANCHES['comm-1.9.1']['localesURL'] = \
- '%s/build/buildbot-configs/raw-file/seamonkey-production/seamonkey/l10n/all-locales.comm-1.9.1' % (GLOBAL_VARS['hgurl'])
-# If True, a complete update snippet for this branch will be generated and
-# uploaded to. Any platforms with 'debug' in them will not have snippets
-# generated.
-BRANCHES['comm-1.9.1']['create_snippet'] = True
-BRANCHES['comm-1.9.1']['update_channel'] = 'nightly'
-BRANCHES['comm-1.9.1']['create_partial'] = True
-BRANCHES['comm-1.9.1']['aus2_base_upload_dir'] = '/opt/aus2/build/0/SeaMonkey/comm-1.9.1'
-BRANCHES['comm-1.9.1']['aus2_base_upload_dir_l10n'] = '/opt/aus2/build/0/SeaMonkey/comm-1.9.1'
-# staging/production-dependent settings - all is production for us
-BRANCHES['comm-1.9.1']['tinderbox_tree'] = 'SeaMonkey2.0'
-BRANCHES['comm-1.9.1']['packaged_unittest_tinderbox_tree'] = 'SeaMonkey2.0'deleted file mode 100644
--- a/seamonkey/l10n-changesets
+++ /dev/null
@@ -1,25 +0,0 @@
-be 033da6380bac
-ca 72490d9dd913
-cs a86b04f8a13b
-de b423f09081eb
-en-GB 963779540255
-es-AR e97db53b1e04
-es-ES 9c8f567323cf
-fi 126da4210ca4
-fr f5bc8febcdc8
-gl ad52229b51bb
-hu 47de448e1a43
-it e9c4f74202bc
-ja 2d5bb28479e4
-ja-JP-mac 2f9ab53ba356
-ka 73a673cf5229
-lt 5d3a0f820837
-nb-NO 875d584f247b
-nl d731467e4127
-pl 47545f262ca9
-pt-PT ce729d49d246
-ru 79fb4a40ceff
-sk d96a52f7bcc8
-sv-SE 949ef0fa01e2
-tr 5c08da56496d
-zh-CN 59cd2e327914
deleted file mode 100644
--- a/seamonkey/l10n-changesets-comm-2.0
+++ /dev/null
@@ -1,21 +0,0 @@
-be d16475909877
-ca 74c03c67e9dc
-cs 8a4d900732fc
-de 8f7adaf9f402
-en-GB 46017e17a287
-es-AR d6792f87ebe3
-es-ES a944e300930e
-fi 8df71ec4e3b5
-fr 5be6b2011285
-it 0b7f027bdd55
-ja ad494715ba53
-ja-JP-mac 2ed9aebd450f
-lt 2cc6e39efec3
-nb-NO 54fae66fe6bb
-nl 08192488fd38
-pl a341882c2e4a
-pt-PT 361c539aeb32
-ru e9938f7babae
-sk 4f2b5218628c
-sv-SE c4f9206cf1d2
-tr 77b88399d670
deleted file mode 100644
--- a/seamonkey/l10n-changesets-comm-beta
+++ /dev/null
@@ -1,26 +0,0 @@
-be 0ac21702819c
-ca ed7ec714b503
-cs f4eed0e2c385
-de f86b50aba7d9
-en-GB aca95e29b5aa
-es-AR 6e1cf9b2ed0d
-es-ES 60f08598b078
-fi 9d807c05227d
-fr e647d7f02f6e
-gl 5a72fb9a563d
-hu a755f5d42cf6
-it 62b03f25a88f
-ja 794c6ad68fd0
-ja-JP-mac eef9efc3ee80
-lt 5b604edb3670
-nb-NO b920a6c71bf6
-nl fd6bf3671973
-pl f384c1a8dde4
-pt-PT 393651b4b851
-ru 56eb06f0d9dd
-sk f96ac0196681
-sv-SE e9da611bbfde
-tr b70a6c0e577d
-uk f5e8f813d359
-zh-CN abd810f2c1e9
-zh-TW 5e2f794d5541
\ No newline at end of file
deleted file mode 100644
--- a/seamonkey/l10n-changesets-comm-release
+++ /dev/null
@@ -1,24 +0,0 @@
-be a89a8babed58
-ca ed7ec714b503
-cs aa271f1648b8
-de 80e13621ab73
-en-GB aca95e29b5aa
-es-AR 96d18cb2adec
-es-ES 2341684c1bcd
-fi 4cdec19b7a69
-fr d7aed5d76568
-gl 5a72fb9a563d
-hu a755f5d42cf6
-it 8f20ba0ec9a6
-ja de6afd96f962
-ja-JP-mac 4cc3486a708b
-lt e6f1f69218e8
-nb-NO b920a6c71bf6
-nl 9d60df1df145
-pl 3a6091064e35
-pt-PT 393651b4b851
-ru f084c7415aee
-sk 6ee40d970336
-sv-SE ac2e26b17500
-tr b70a6c0e577d
-zh-CN 4f6d883717d9
deleted file mode 100644
--- a/seamonkey/l10n-changesets_comm_central_trunk
+++ /dev/null
@@ -1,12 +0,0 @@
-be 0436e4c78cbc
-cs 29d9c7653a4c
-de 9928e131e3eb
-es-AR 7260c60dba44
-es-ES d32c6c3794a4
-fr 8b23fb1e2008
-lt 87e6b3f0d6cd
-nl 67c0d6bf75f5
-pl ee36c1b741d9
-pt-PT 1d845feb5201
-ru 16416eec73c1
-sk 85172039be85
deleted file mode 100644
--- a/seamonkey/l10n/all-locales.comm-2.0
+++ /dev/null
@@ -1,28 +0,0 @@
-be
-ca
-cs
-de
-en-GB
-es-AR
-es-ES
-fi
-fr
-gl
-hu
-it
-ja
-ja-JP-mac
-ka
-lt
-nb-NO
-nl
-pl
-pt-BR
-pt-PT
-ro
-ru
-si
-sk
-sv-SE
-tr
-zh-CN
deleted file mode 100644
--- a/seamonkey/l10n/all-locales.comm-aurora
+++ /dev/null
@@ -1,31 +0,0 @@
-be
-ca
-cs
-da
-de
-en-GB
-es-AR
-es-ES
-fi
-fr
-gl
-hu
-it
-ja
-ja-JP-mac
-ka
-lt
-nb-NO
-nl
-pl
-pt-BR
-pt-PT
-ro
-ru
-si
-sk
-sv-SE
-tr
-uk
-zh-CN
-zh-TW
deleted file mode 100644
--- a/seamonkey/l10n/all-locales.comm-beta
+++ /dev/null
@@ -1,29 +0,0 @@
-be
-ca
-cs
-da
-de
-en-GB
-es-AR
-es-ES
-fi
-fr
-gl
-hu
-it
-ja
-ja-JP-mac
-ka
-lt
-nb-NO
-nl
-pl
-pt-BR
-pt-PT
-ro
-ru
-si
-sk
-sv-SE
-tr
-zh-CN
deleted file mode 100644
--- a/seamonkey/l10n/all-locales.comm-central
+++ /dev/null
@@ -1,31 +0,0 @@
-be
-ca
-cs
-da
-de
-en-GB
-es-AR
-es-ES
-fi
-fr
-gl
-hu
-it
-ja
-ja-JP-mac
-ka
-lt
-nb-NO
-nl
-pl
-pt-BR
-pt-PT
-ro
-ru
-si
-sk
-sv-SE
-tr
-uk
-zh-CN
-zh-TW
deleted file mode 100644
--- a/seamonkey/l10n/all-locales.comm-release
+++ /dev/null
@@ -1,29 +0,0 @@
-be
-ca
-cs
-da
-de
-en-GB
-es-AR
-es-ES
-fi
-fr
-gl
-hu
-it
-ja
-ja-JP-mac
-ka
-lt
-nb-NO
-nl
-pl
-pt-BR
-pt-PT
-ro
-ru
-si
-sk
-sv-SE
-tr
-zh-CN
deleted file mode 100644
--- a/seamonkey/l10nbuilds.ini
+++ /dev/null
@@ -1,39 +0,0 @@
-[sea20x]
-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 = https://hg.mozilla.org/
-l10nbase = https://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
-en_us_binary = https://ftp-ssl.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 = https://hg.mozilla.org/
-l10nbase = https://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
-en_us_binary = https://ftp-ssl.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 = https://hg.mozilla.org/
-l10nbase = https://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
-en_us_binary = https://ftp-ssl.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-central-trunk/
-
deleted file mode 100644
--- a/seamonkey/linux/comm-1.9.1/debug/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc/bin/gcc
-CXX=/tools/gcc/bin/g++
-
-#export CFLAGS="-gstabs+"
-#export CXXFLAGS="-gstabs+"
-
-# 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/linux/comm-1.9.1/nightly/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --disable-tests
-
-ac_add_options --enable-static
-ac_add_options --disable-shared
-
-CC=/tools/gcc/bin/gcc
-CXX=/tools/gcc/bin/g++
-
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
-
-# 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/linux/comm-1.9.1/release/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --disable-tests
-
-ac_add_options --enable-static
-ac_add_options --disable-shared
-
-CC=/tools/gcc/bin/gcc
-CXX=/tools/gcc/bin/g++
-
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/linux/comm-1.9.1/unittest/mozconfig
+++ /dev/null
@@ -1,13 +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
-
-CC=/tools/gcc/bin/gcc
-CXX=/tools/gcc/bin/g++
-
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/linux/comm-2.0/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-2.0/release/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-2.0/unittest/mozconfig
+++ /dev/null
@@ -1,23 +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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-aurora/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-aurora/release/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-aurora/unittest/mozconfig
+++ /dev/null
@@ -1,23 +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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-beta/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-beta/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-beta/release-l10n/mozconfig
+++ /dev/null
@@ -1,7 +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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
deleted file mode 100644
--- a/seamonkey/linux/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-beta/unittest/mozconfig
+++ /dev/null
@@ -1,23 +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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-central-trunk/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-central-trunk/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-central-trunk/release/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-central-trunk/unittest/mozconfig
+++ /dev/null
@@ -1,23 +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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-release/debug/mozconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-
-ac_add_options --enable-tests
-ac_add_options --enable-trace-malloc
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j4"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-release/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-release/release-l10n/mozconfig
+++ /dev/null
@@ -1,7 +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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
deleted file mode 100644
--- a/seamonkey/linux/comm-release/release/mozconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux/comm-release/unittest/mozconfig
+++ /dev/null
@@ -1,23 +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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-1.9.1/nightly/mozconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --disable-tests
-
-ac_add_options --enable-static
-ac_add_options --disable-shared
-
-CC=/tools/gcc/bin/gcc
-CXX=/tools/gcc/bin/g++
-
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
-
-# 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/linux64/comm-1.9.1/release/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --disable-tests
-
-ac_add_options --enable-static
-ac_add_options --disable-shared
-
-CC=/tools/gcc/bin/gcc
-CXX=/tools/gcc/bin/g++
-
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/linux64/comm-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-2.0/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-aurora/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-beta/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-beta/release-l10n/mozconfig
+++ /dev/null
@@ -1,7 +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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
deleted file mode 100644
--- a/seamonkey/linux64/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-central-trunk/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-central-trunk/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-release/nightly/mozconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/linux64/comm-release/release-l10n/mozconfig
+++ /dev/null
@@ -1,7 +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
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
deleted file mode 100644
--- a/seamonkey/linux64/comm-release/release/mozconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-export LDFLAGS="-static-libstdc++"
-export HOST_LDFLAGS="-static-libstdc++"
-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 PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
deleted file mode 100644
--- a/seamonkey/macosx/comm-1.9.1/nightly/mozconfig
+++ /dev/null
@@ -1,22 +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-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,40 +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 --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,40 +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 --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,40 +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 --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,40 +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 --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,40 +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 --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"
deleted file mode 100644
--- a/seamonkey/macosx64/comm-2.0/debug/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-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/macosx64/comm-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,38 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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 --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/macosx64/comm-2.0/release/mozconfig
+++ /dev/null
@@ -1,35 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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/macosx64/comm-aurora/debug/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-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/macosx64/comm-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,38 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
- export topsrcdir=$oldtopsrcdir
-fi
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --enable-tests
-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/macosx64/comm-aurora/release/mozconfig
+++ /dev/null
@@ -1,35 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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/macosx64/comm-beta/debug/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-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/macosx64/comm-beta/nightly/mozconfig
+++ /dev/null
@@ -1,38 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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 --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/macosx64/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/macosx64/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,35 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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/macosx64/comm-central-trunk/debug/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-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/macosx64/comm-central-trunk/nightly/mozconfig
+++ /dev/null
@@ -1,38 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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 --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/macosx64/comm-central-trunk/release/mozconfig
+++ /dev/null
@@ -1,35 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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/macosx64/comm-release/debug/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-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/macosx64/comm-release/nightly/mozconfig
+++ /dev/null
@@ -1,38 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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 --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/macosx64/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/macosx64/comm-release/release/mozconfig
+++ /dev/null
@@ -1,35 +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
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-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/master-main.cfg
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- python -*-
-# ex: set syntax=python:
-
-# Shorthand
-c = BuildmasterConfig = {}
-
-import config
-from config import *
-
-####### BUILDSLAVES
-
-import BuildSlaves
-reload(BuildSlaves)
-from BuildSlaves import SlavePasswords
-
-from buildbot.buildslave import BuildSlave
-c['slaves'] = []
-for platform, names in SLAVES.items():
- for name in names:
- c['slaves'].append(BuildSlave(name, SlavePasswords[platform], max_builds=1))
-
-# Now setup the l10n slaves. L10N_SLAVES is defined in
-# master.cfg before we get exec'ed
-for branch in BRANCHES.keys():
- BRANCHES[branch]['l10n_slaves'] = L10N_SLAVES
-
-c['change_source'] = []
-c['schedulers'] = []
-c['builders'] = []
-c['status'] = []
-
-from buildbot.changes.pb import PBChangeSource
-
-c['change_source'].append(PBChangeSource())
-
-####### PROJECT IDENTITY
-
-# the 'projectName' string will be used to describe the project that this
-# buildbot is working on. For example, it is used as the title of the
-# waterfall HTML page. The 'projectURL' string will be used to provide a link
-# from buildbot HTML pages to your project's home page.
-
-c['projectName'] = "SeaMonkey 2"
-c['projectURL'] = "http://wiki.mozilla.org/SeaMonkey:hg-based_build"
-
-# Cap the log size at 50 MB
-c['logMaxSize'] = 50 * 1024 * 1024
-
-# Keep 100 changes
-c['changeHorizon'] = 600
-
-
-######## PULSE and Command Queue
-from mozilla_buildtools.queuedir import QueueDir
-commandsQueue = QueueDir('commands', '%s/commands' % "/dev/shm/queue")
-
-import passwords
-reload(passwords)
-if hasattr(passwords, 'PULSE_PASSWORD'):
- pulseQueue = QueueDir('pulse', '%s/pulse' % "/dev/shm/queue")
- # Send pulse messages
- import re
- import buildbotcustom.status.pulse
- reload(buildbotcustom.status.pulse)
- from buildbotcustom.status.pulse import PulseStatus
- c['status'].append(PulseStatus(
- pulseQueue,
- ignoreBuilders=[re.compile('fuzzer-.*')],
- send_logs=False,
- ))
-
-assert c is BuildmasterConfigdeleted file mode 100644
--- a/seamonkey/master.cfg
+++ /dev/null
@@ -1,76 +0,0 @@
-# import/reload dance so that reconfigs work
-# buildbotcustom.misc has to be imported/reloaded prior to config
-# so that the fastRegexes don't get reset
-import buildbotcustom.misc
-import config
-reload(buildbotcustom.misc)
-reload(config)
-
-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())
-
-# 'slavePortnum' defines the TCP port to listen on. This must match the value
-# configured into the buildslaves (with their --master option)
-
-c['slavePortnum'] = 9010
-
-####### STATUS TARGETS
-
-from buildbot.status import html
-
-c['status'].append(html.WebStatus(
- http_port=8010, allowForce=True
-))
-c['buildbotURL'] = 'http://cb-seamonkey-linuxmaster-01.mozilla.org:8010/'
-
-for branch in ACTIVE_BRANCHES:
- branchObjects = generateCCBranchObjects(BRANCHES[branch], branch)
- c['builders'].extend(branchObjects['builders'])
- c['schedulers'].extend(branchObjects['schedulers'])
- c['change_source'].extend(branchObjects['change_source'])
- c['status'].extend(branchObjects['status'])
-
-####### Release Automation
-
-import release_master
-reload(release_master)
-
-c['builders'].extend(release_master.builders)
-c['schedulers'].extend(release_master.schedulers)
-c['change_source'].extend(release_master.change_source)
-c['status'].extend(release_master.status)
-
-# Give the release builders priority over other builders
-def prioritizeBuilders(botmaster, builders):
- def sortkey(builder):
- if builder.builder_status.category == 'release':
- return 0, builder.getOldestRequestTime()
- else:
- return 1, builder.getOldestRequestTime()
- builders.sort(key=sortkey)
- return builders
-c['prioritizeBuilders'] = prioritizeBuilders
-
-
-c['mergeRequests'] = buildbotcustom.misc.mergeRequests
-
-# c is shorthand for BuildmasterConfig, so make sure they still refer to the
-# same thing
-assert c is BuildmasterConfigdeleted file mode 100644
--- a/seamonkey/public_html/default.css
+++ /dev/null
@@ -1,70 +0,0 @@
-body {
- background: url("http://www.mozilla.org/images/mozilla-banner.gif")
- no-repeat top left;
- font-family: Verdana, Courier, sans-sarif;
- font-size: 80%;
- padding-top: 80px;
-}
-
-a:link, a:visited {
- color: #000;
-}
-
-td.Event, td.BuildStep, td.Activity, td.Change, td.Time, td.Builder, td.LastBuild {
- border: 1px solid #777;
-}
-
-td.Event, td.Change, td.Time, td.Builder {
- background-color: #F3F3F3;
-}
-
-td.green {
- background-color: #72ff75;
-}
-
-.table {
- /* border-spacing: 2px; */
- border-spacing: 0px;
- width: 1%;
- border-collapse: seperate;
-}
-
-td {
- padding: 0.5ex 1ex;
- text-align: center;
- border: 1px solid #DDD;
-}
-
-/* Activity states */
-.idle {
- background-color: #F3F3F3;
-}
-.building {
- background-color: #FFFFF3;
-}
-.offline {
- background-color: #FFF3F3;
-}
-
-/* LastBuild, BuildStep states */
-.success {
- background-color: #72ff75;
-}
-.failure {
- background-color: red;
-}
-.warnings {
- background-color: orange;
-}
-.exception {
- background-color: #c000c0;
-}
-.start,.running {
- background-color: yellow;
-}
-
-/* color trunk/branch builder links differently */
-
-.Builder a[href*="trunk"] {
- color: #05e;
-}deleted file mode 100644
--- a/seamonkey/release-comm-1.9.1.py
+++ /dev/null
@@ -1,106 +0,0 @@
-releaseConfig = {}
-
-# Release Notification
-# not used yet
-# Basic product configuration
-# Names for the product/files
-releaseConfig['productName'] = 'seamonkey'
-releaseConfig['brandName'] = 'SeaMonkey'
-releaseConfig['appName'] = 'suite'
-releaseConfig['binaryName'] = releaseConfig['brandName']
-releaseConfig['oldBinaryName'] = releaseConfig['binaryName']
-# Current version info
-releaseConfig['version'] = '2.0.14'
-releaseConfig['appVersion'] = version
-releaseConfig['milestone'] = '1.9.1.19'
-releaseConfig['buildNumber'] = 2
-releaseConfig['baseTag'] = 'SEAMONKEY_2_0_14'
-# Old version info
-releaseConfig['oldVersion'] = '2.0.13'
-releaseConfig['oldAppVersion'] = oldVersion
-releaseConfig['oldBuildNumber'] = 1
-releaseConfig['oldBaseTag'] = 'SEAMONKEY_2_0_13'
-releaseConfig['oldRepoPath'] = 'releases/comm-1.9.1'
-# Next (nightly) version info
-# not yet available
-# Repository configuration, for tagging
-releaseConfig['skip_tag'] = False
-releaseConfig['relbranchPrefix'] = 'COMM'
-releaseConfig['sourceRepoName'] = 'comm-1.9.1' # buildbot branch name
-releaseConfig['sourceRepoPath'] = 'releases/comm-1.9.1'
-releaseConfig['sourceRepoRevision'] = 'b292e787146b'
-releaseConfig['relbranchOverride'] = 'COMM19119_20110416_RELBRANCH'
-releaseConfig['productVersionFile'] = 'suite/config/version-191.txt'
-# Mozilla
-releaseConfig['mozillaRepoPath'] = 'releases/mozilla-1.9.1'
-releaseConfig['mozillaRepoRevision'] = 'FIREFOX_3_5_19_RELEASE'
-releaseConfig['mozillaRelbranchOverride'] = 'GECKO19119_2011041408_RELBRANCH' # put Gecko relbranch here that we base upon
-# Inspector
-releaseConfig['inspectorRepoPath'] = 'dom-inspector' # leave empty if inspector is not to be tagged
-releaseConfig['inspectorRepoRevision'] = 'f6c78804ebb4'
-releaseConfig['inspectorRelbranchOverride'] = 'COMM_1_9_1_BRANCH'
-# Venkman
-releaseConfig['venkmanRepoPath'] = 'venkman' # leave empty if venkman is not to be tagged
-releaseConfig['venkmanRepoRevision'] = 'f13c813e4ec6'
-releaseConfig['venkmanRelbranchOverride'] = 'COMM_1_9_1_BRANCH'
-# Chatzilla
-releaseConfig['chatzillaRepoPath'] = 'chatzilla' # leave empty if chatzilla is not to be tagged
-releaseConfig['chatzillaRepoRevision'] = 'f5fd1b073bf8'
-releaseConfig['chatzillaRelbranchOverride'] = 'COMM_1_9_1_BRANCH'
-# 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['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-
-# L10n configuration
-releaseConfig['l10nPlatforms'] = ('linux', 'win32', 'macosx')
-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.
-releaseConfig['patcherConfig'] = 'moz191-seamonkey-branch-patcher2.cfg'
-releaseConfig['patcherToolsTag'] = 'UPDATE_PACKAGING_R11_1'
-releaseConfig['ftpServer'] = 'ftp.mozilla.org'
-releaseConfig['stagingServer'] = 'stage-old.mozilla.org'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus2-community.mozilla.org'
-releaseConfig['testOlderPartials'] = True
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['releaseChannel'] = 'release'
-releaseConfig['useBetaChannelForRelease'] = True
-releaseConfig['verifyConfigs'] = {
- 'linux': 'moz191-seamonkey-linux.cfg',
- 'macosx': 'moz191-seamonkey-mac.cfg',
- 'win32': 'moz191-seamonkey-win32.cfg'
-}
-
-# 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
-#releaseConfig['tuxedoConfig'] = 'seamonkey-tuxedo.ini'
-#releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api/'deleted file mode 100644
--- a/seamonkey/release-comm-2.0.py
+++ /dev/null
@@ -1,72 +0,0 @@
-releaseConfig = {}
-
-releaseConfig['hgUsername'] = 'seabld'
-releaseConfig['hgSshKey'] = '~seabld/.ssh/seabld_dsa'
-releaseConfig['relbranchPrefix'] = 'COMM'
-releaseConfig['sourceRepoName'] = 'comm-2.0' # buildbot branch name
-releaseConfig['sourceRepoPath'] = 'releases/comm-2.0'
-releaseConfig['sourceRepoRevision'] = '1e53b6fcfb1d'
-releaseConfig['relbranchOverride'] = 'COMM201_20110508_RELBRANCH'
-releaseConfig['mozillaRepoPath'] = 'releases/mozilla-2.0'
-releaseConfig['mozillaRepoRevision'] = 'ff616f6ced18'
-releaseConfig['mozillaRelbranchOverride'] = 'COMM20_053111_RELBRANCH' # put Gecko relbranch here that we base upon
-releaseConfig['inspectorRepoPath'] = 'dom-inspector' # leave empty if inspector is not to be tagged
-releaseConfig['inspectorRepoRevision'] = '0bb7db177214'
-releaseConfig['inspectorRelbranchOverride'] = 'COMM201_20110508_RELBRANCH'
-releaseConfig['venkmanRepoPath'] = 'venkman' # leave empty if venkman is not to be tagged
-releaseConfig['venkmanRepoRevision'] = '65c389ee756c'
-releaseConfig['venkmanRelbranchOverride'] = 'COMM201_20110508_RELBRANCH'
-releaseConfig['chatzillaRepoPath'] = 'chatzilla' # leave empty if chatzilla is not to be tagged
-releaseConfig['chatzillaRepoRevision'] = '210002e2b7e7'
-releaseConfig['chatzillaRelbranchOverride'] = 'COMM201_20110508_RELBRANCH'
-releaseConfig['l10nRepoPath'] = 'releases/l10n-mozilla-2.0'
-releaseConfig['l10nRelbranchOverride'] = 'default'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets-comm-2.0'
-releaseConfig['cvsroot'] = ':ext:seabld@cvs.mozilla.org:/cvsroot' # for patcher, etc.
-#productVersionFile = 'suite/config/version-20.txt'
-releaseConfig['productVersionFile'] = ''
-# mergeLocales allows missing localized strings to be filled in by their en-US
-# equivalent string. This is on (True) by default for nightly builds, but
-# should be False for releases *EXCEPT* alphas and early betas. If in doubt,
-# ask release-drivers.
-releaseConfig['mergeLocales'] = True
-releaseConfig['productName'] = 'seamonkey'
-releaseConfig['brandName'] = 'SeaMonkey'
-releaseConfig['appName'] = 'suite'
-# Sometimes we need the application version to be different from what we "call"
-# the build, eg public release candidates for a major release (3.1 RC1).
-# appVersion and oldAppVersion are optional definitions used in places that
-# don't care about what we call it. Eg, when version bumping we will bump to
-# appVersion, not version.
-releaseConfig['version'] = '2.1'
-releaseConfig['appVersion'] = '2.1'
-releaseConfig['milestone'] = '2.0.1'
-releaseConfig['buildNumber'] = 1
-releaseConfig['baseTag'] = 'SEAMONKEY_2_1'
-releaseConfig['oldVersion'] = '2.1rc2'
-releaseConfig['oldAppVersion'] = 2.1
-releaseConfig['oldBuildNumber'] = 2
-releaseConfig['oldBaseTag'] = 'SEAMONKEY_2_1rc2'
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['l10nPlatforms'] = ('linux', 'win32', 'macosx64')
-releaseConfig['patcherConfig'] = 'moz20-seamonkey-branch-patcher2.cfg'
-releaseConfig['patcherToolsTag'] = 'UPDATE_PACKAGING_R13'
-releaseConfig['binaryName'] = releaseConfig['brandName']
-releaseConfig['oldBinaryName'] = releaseConfig['binaryName']
-releaseConfig['ftpServer'] = 'ftp.mozilla.org'
-releaseConfig['stagingServer'] = 'stage-old.mozilla.org'
-releaseConfig['talosTestPlatforms'] = ()
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus2-community.mozilla.org'
-releaseConfig['testOlderPartials'] = False
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['verifyConfigs'] = {'linux': 'moz20-seamonkey-linux.cfg',
- 'macosx64': 'moz20-seamonkey-mac.cfg',
- 'win32': 'moz20-seamonkey-win32.cfg'}
-releaseConfig['majorUpdateRepoPath'] = None
-# Tuxedo/Bouncer related - XXX: atm not allowed for SeaMonkey
-#releaseConfig['tuxedoConfig'] = 'seamonkey-tuxedo.ini'
-#releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api/'
-releaseConfig['releaseChannel'] = 'release'
-releaseConfig['useBetaChannelForRelease'] = Truedeleted file mode 100644
--- a/seamonkey/release-comm-beta.py
+++ /dev/null
@@ -1,101 +0,0 @@
-releaseConfig = {}
-
-# Release Notification
-# not used yet
-# Basic product configuration
-# Names for the product/files
-releaseConfig['productName'] = 'seamonkey'
-releaseConfig['brandName'] = 'SeaMonkey'
-releaseConfig['appName'] = 'suite'
-# Current version info
-releaseConfig['version'] = '2.9b2'
-releaseConfig['appVersion'] = '2.9'
-releaseConfig['milestone'] = '12.0'
-releaseConfig['buildNumber'] = 1
-releaseConfig['baseTag'] = 'SEAMONKEY_2_9b2'
-# Old version info
-releaseConfig['oldVersion'] = '2.9b1'
-releaseConfig['oldAppVersion'] = '2.9'
-releaseConfig['oldBuildNumber'] = 1
-releaseConfig['oldBaseTag'] = 'SEAMONKEY_2_9b1'
-releaseConfig['oldRepoPath'] = 'releases/comm-beta'
-# Next (nightly) version info
-# not yet available
-# Repository configuration, for tagging
-releaseConfig['skip_tag'] = False
-releaseConfig['relbranchPrefix'] = 'SEA_COMM'
-releaseConfig['sourceRepoName'] = 'comm-beta' # buildbot branch name
-releaseConfig['sourceRepoPath'] = 'releases/comm-beta'
-releaseConfig['sourceRepoRevision'] = 'ad8f79a72aa2'
-releaseConfig['relbranchOverride'] = ''
-#releaseConfig['productVersionFile'] = 'suite/config/version-20.txt'
-releaseConfig['productVersionFile'] = ''
-# Mozilla
-releaseConfig['mozillaRepoPath'] = 'releases/mozilla-beta'
-releaseConfig['mozillaRepoRevision'] = 'FIREFOX_12_0b3_BUILD1'
-releaseConfig['mozillaRelbranchOverride'] = 'GECKO120_2012032804_RELBRANCH' # put Gecko relbranch here that we base upon
-# Inspector
-releaseConfig['inspectorRepoPath'] = 'dom-inspector' # leave empty if inspector is not to be tagged
-releaseConfig['inspectorRepoRevision'] = 'b72c3dc211a0'
-releaseConfig['inspectorRelbranchOverride'] = 'DOMI_2_0_10'
-# Venkman
-releaseConfig['venkmanRepoPath'] = 'venkman' # leave empty if venkman is not to be tagged
-releaseConfig['venkmanRepoRevision'] = 'VENKMAN_RELEASE_0_9_89'
-releaseConfig['venkmanRelbranchOverride'] = ''
-# Chatzilla
-releaseConfig['chatzillaRepoPath'] = 'chatzilla' # leave empty if chatzilla is not to be tagged
-releaseConfig['chatzillaRepoRevision'] = 'CHATZILLA_0_9_88_1_RELEASE'
-releaseConfig['chatzillaRelbranchOverride'] = ''
-# L10n repositories
-releaseConfig['l10nRepoPath'] = 'releases/l10n/mozilla-beta'
-releaseConfig['l10nRelbranchOverride'] = ''
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets-comm-beta'
-# Support repositories
-# not used yet
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-
-# L10n configuration
-releaseConfig['l10nPlatforms'] = ('linux', 'win32', 'macosx64')
-releaseConfig['mergeLocales'] = True
-
-# 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.
-releaseConfig['patcherConfig'] = 'mozBeta-seamonkey-branch-patcher2.cfg'
-releaseConfig['patcherToolsTag'] = 'UPDATE_PACKAGING_R14'
-releaseConfig['binaryName'] = releaseConfig['brandName']
-releaseConfig['oldBinaryName'] = releaseConfig['binaryName']
-releaseConfig['ftpServer'] = 'ftp.mozilla.org'
-releaseConfig['stagingServer'] = 'stage-old.mozilla.org'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus2-community.mozilla.org'
-releaseConfig['testOlderPartials'] = False
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['releaseChannel'] = 'beta'
-releaseConfig['verifyConfigs'] = {
- 'linux': 'mozBeta-seamonkey-linux.cfg',
- 'macosx64': 'mozBeta-seamonkey-mac64.cfg',
- 'win32': 'mozBeta-seamonkey-win32.cfg'
-}
-releaseConfig['mozconfigs'] = {
- 'linux': 'suite/config/mozconfigs/linux32/release',
- 'linux64': 'suite/config/mozconfigs/linux64/release',
- 'macosx64': 'suite/config/mozconfigs/macosx-universal/release',
- 'win32': 'suite/config/mozconfigs/win32/release',
-}
-
-# Major update configuration
-releaseConfig['majorUpdateRepoPath'] = None
-
-# Tuxedo/Bouncer related - XXX: atm not allowed for SeaMonkey
-#releaseConfig['tuxedoConfig'] = 'seamonkey-tuxedo.ini'
-#releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api/'deleted file mode 100644
--- a/seamonkey/release-comm-central-trunk.py
+++ /dev/null
@@ -1,69 +0,0 @@
-releaseConfig = {}
-
-releaseConfig['hgUsername'] = 'seabld'
-releaseConfig['hgSshKey'] = '~seabld/.ssh/seabld_dsa'
-releaseConfig['relbranchPrefix'] = 'COMM'
-releaseConfig['sourceRepoName'] = 'comm-2.0' # buildbot branch name
-releaseConfig['sourceRepoPath'] = 'comm-central'
-releaseConfig['sourceRepoRevision'] = 'a842a749a221'
-releaseConfig['relbranchOverride'] = 'COMM20_20110405_RELBRANCH'
-releaseConfig['mozillaRepoPath'] = 'releases/mozilla-2.0'
-releaseConfig['mozillaRepoRevision'] = '08724a0335a3'
-releaseConfig['mozillaRelbranchOverride'] = 'COMM20_20110405_RELBRANCH' # put Gecko relbranch here that we base upon
-releaseConfig['inspectorRepoPath'] = 'dom-inspector' # leave empty if inspector is not to be tagged
-releaseConfig['inspectorRepoRevision'] = 'fcfb387360fd'
-releaseConfig['inspectorRelbranchOverride'] = 'COMM20_20110405_RELBRANCH'
-releaseConfig['venkmanRepoPath'] = 'venkman' # leave empty if venkman is not to be tagged
-releaseConfig['venkmanRepoRevision'] = '9126bebdf047'
-releaseConfig['venkmanRelbranchOverride'] = 'COMM20_20110405_RELBRANCH'
-releaseConfig['chatzillaRepoPath'] = 'chatzilla' # leave empty if chatzilla is not to be tagged
-releaseConfig['chatzillaRepoRevision'] = '29d3c6d2a751'
-releaseConfig['chatzillaRelbranchOverride'] = 'COMM20_20110405_RELBRANCH'
-releaseConfig['l10nRepoPath'] = 'releases/l10n-mozilla-2.0'
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets_comm_central_trunk'
-releaseConfig['cvsroot'] = ':ext:seabld@cvs.mozilla.org:/cvsroot' # for patcher, etc.
-releaseConfig['productVersionFile'] = 'suite/config/version-20.txt'
-# mergeLocales allows missing localized strings to be filled in by their en-US
-# equivalent string. This is on (True) by default for nightly builds, but
-# should be False for releases *EXCEPT* alphas and early betas. If in doubt,
-# ask release-drivers.
-releaseConfig['mergeLocales'] = True
-releaseConfig['productName'] = 'seamonkey'
-releaseConfig['brandName'] = 'SeaMonkey'
-releaseConfig['appName'] = 'suite'
-# Sometimes we need the application version to be different from what we "call"
-# the build, eg public release candidates for a major release (3.1 RC1).
-# appVersion and oldAppVersion are optional definitions used in places that
-# don't care about what we call it. Eg, when version bumping we will bump to
-# appVersion, not version.
-releaseConfig['version'] = '2.1b3'
-releaseConfig['appVersion'] = version
-releaseConfig['milestone'] = '2.0'
-releaseConfig['buildNumber'] = 3
-releaseConfig['baseTag'] = 'SEAMONKEY_2_1b3'
-releaseConfig['oldVersion'] = '2.1b2'
-releaseConfig['oldAppVersion'] = oldVersion
-releaseConfig['oldBuildNumber'] = 2
-releaseConfig['oldBaseTag'] = 'SEAMONKEY_2_1b2'
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['l10nPlatforms'] = ('linux', 'win32', 'macosx64')
-releaseConfig['patcherConfig'] = 'moz20-seamonkey-branch-patcher2.cfg'
-releaseConfig['patcherToolsTag'] = 'UPDATE_PACKAGING_R13'
-releaseConfig['binaryName'] = releaseConfig['brandName']
-releaseConfig['oldBinaryName'] = releaseConfig['binaryName']
-releaseConfig['ftpServer'] = 'ftp.mozilla.org'
-releaseConfig['stagingServer'] = 'stage-old.mozilla.org'
-releaseConfig['talosTestPlatforms'] = ()
-releaseConfig['unittestPlatforms'] = ()
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus2-community.mozilla.org'
-releaseConfig['testOlderPartials'] = False
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['verifyConfigs'] = {'linux': 'moz20-seamonkey-linux.cfg',
- 'macosx64': 'moz20-seamonkey-mac.cfg',
- 'win32': 'moz20-seamonkey-win32.cfg'}
-releaseConfig['majorUpdateRepoPath'] = None
-# Tuxedo/Bouncer related - XXX: atm not allowed for SeaMonkey
-#releaseConfig['tuxedoConfig'] = 'seamonkey-tuxedo.ini'
-#releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api/'
-releaseConfig['releaseChannel'] = 'no-release-here'deleted file mode 100644
--- a/seamonkey/release-comm-release.py
+++ /dev/null
@@ -1,101 +0,0 @@
-releaseConfig = {}
-
-# Release Notification
-# not used yet
-# Basic product configuration
-# Names for the product/files
-releaseConfig['productName'] = 'seamonkey'
-releaseConfig['brandName'] = 'SeaMonkey'
-releaseConfig['appName'] = 'suite'
-releaseConfig['binaryName'] = releaseConfig['brandName']
-releaseConfig['oldBinaryName'] = releaseConfig['binaryName']
-# Current version info
-releaseConfig['version'] = '2.8'
-releaseConfig['appVersion'] = '2.8'
-releaseConfig['milestone'] = '11.0'
-releaseConfig['buildNumber'] = 1
-releaseConfig['baseTag'] = 'SEAMONKEY_2_8'
-# Old version info
-releaseConfig['oldVersion'] = '2.7.2'
-releaseConfig['oldAppVersion'] = '2.7.2'
-releaseConfig['oldBuildNumber'] = 1
-releaseConfig['oldBaseTag'] = 'SEAMONKEY_2_7_2'
-releaseConfig['oldRepoPath'] = 'releases/comm-release'
-# Next (nightly) version info
-# not yet available
-# Repository configuration, for tagging
-releaseConfig['skip_tag'] = False
-releaseConfig['relbranchPrefix'] = 'SEA_COMM'
-releaseConfig['sourceRepoName'] = 'comm-release' # buildbot branch name
-releaseConfig['sourceRepoPath'] = 'releases/comm-release'
-releaseConfig['sourceRepoRevision'] = 'a43f913afae4'
-releaseConfig['relbranchOverride'] = ''
-#releaseConfig['productVersionFile'] = 'suite/config/version.txt'
-releaseConfig['productVersionFile'] = ''
-# Mozilla
-releaseConfig['mozillaRepoPath'] = 'releases/mozilla-release'
-releaseConfig['mozillaRepoRevision'] = '75b17db9b6e9'
-releaseConfig['mozillaRelbranchOverride'] = 'COMM110_2012030910_RELBRANCH' # put Gecko relbranch here that we base upon
-# Inspector
-releaseConfig['inspectorRepoPath'] = 'dom-inspector' # leave empty if inspector is not to be tagged
-releaseConfig['inspectorRepoRevision'] = '0ff0b47c92b7'
-releaseConfig['inspectorRelbranchOverride'] = 'DOMI_2_0_10'
-# Venkman
-releaseConfig['venkmanRepoPath'] = 'venkman' # leave empty if venkman is not to be tagged
-releaseConfig['venkmanRepoRevision'] = '65ad515ebba6'
-releaseConfig['venkmanRelbranchOverride'] = ''
-# Chatzilla
-releaseConfig['chatzillaRepoPath'] = 'chatzilla' # leave empty if chatzilla is not to be tagged
-releaseConfig['chatzillaRepoRevision'] = 'CHATZILLA_0_9_88_1_RELEASE'
-releaseConfig['chatzillaRelbranchOverride'] = ''
-# L10n repositories
-releaseConfig['l10nRepoPath'] = 'releases/l10n/mozilla-release'
-releaseConfig['l10nRelbranchOverride'] = ''
-releaseConfig['l10nRevisionFile'] = 'l10n-changesets-comm-release'
-# Support repositories
-# not used yet
-
-# Platform configuration
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
-releaseConfig['talosTestPlatforms'] = ()
-
-# Unittests
-releaseConfig['unittestPlatforms'] = ()
-
-# L10n configuration
-releaseConfig['l10nPlatforms'] = ('linux', 'win32', 'macosx64')
-releaseConfig['mergeLocales'] = True
-
-# 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.
-releaseConfig['patcherConfig'] = 'mozRelease-seamonkey-branch-patcher2.cfg'
-releaseConfig['patcherToolsTag'] = 'UPDATE_PACKAGING_R14'
-releaseConfig['ftpServer'] = 'ftp.mozilla.org'
-releaseConfig['stagingServer'] = 'stage-old.mozilla.org'
-releaseConfig['bouncerServer'] = 'download.mozilla.org'
-releaseConfig['ausServerUrl'] = 'https://aus2-community.mozilla.org'
-releaseConfig['testOlderPartials'] = False
-releaseConfig['releaseNotesUrl'] = None
-releaseConfig['releaseChannel'] = 'release'
-releaseConfig['verifyConfigs'] = {
- 'linux': 'mozRelease-seamonkey-linux.cfg',
- 'macosx64': 'mozRelease-seamonkey-mac64.cfg',
- 'win32': 'mozRelease-seamonkey-win32.cfg'
-}
-releaseConfig['mozconfigs'] = {
- 'linux': 'suite/config/mozconfigs/linux32/release',
- 'linux64': 'suite/config/mozconfigs/linux64/release',
- 'macosx64': 'suite/config/mozconfigs/macosx-universal/release',
- 'win32': 'suite/config/mozconfigs/win32/release',
-}
-
-# Major update configuration
-releaseConfig['majorUpdateRepoPath'] = None
-
-# Tuxedo/Bouncer related - XXX: atm not allowed for SeaMonkey
-#releaseConfig['tuxedoConfig'] = 'seamonkey-tuxedo.ini'
-#releaseConfig['tuxedoServerUrl'] = 'https://bounceradmin.mozilla.com/api/'deleted file mode 120000
--- a/seamonkey/release_config.py
+++ /dev/null
@@ -1,1 +0,0 @@
-release-comm-beta.py
\ No newline at end of file
deleted file mode 100644
--- a/seamonkey/release_master.py
+++ /dev/null
@@ -1,623 +0,0 @@
-from buildbot.scheduler import Scheduler, Dependent, Triggerable
-from buildbot.status.tinderbox import TinderboxMailNotifier
-
-import buildbotcustom.l10n
-import buildbotcustom.misc
-import buildbotcustom.process.factory
-
-from buildbotcustom.l10n import DependentL10n
-from buildbotcustom.misc import get_l10n_repositories, isHgPollerTriggered, \
- generateTestBuilderNames, reallyShort
-from buildbotcustom.process.factory import StagingRepositorySetupFactory, \
- ReleaseTaggingFactory, CCSourceFactory, CCReleaseBuildFactory, \
- ReleaseUpdatesFactory, UpdateVerifyFactory, ReleaseFinalVerification, \
- L10nVerifyFactory, CCReleaseRepackFactory, UnittestPackagedBuildFactory, \
- MajorUpdateFactory, TuxedoEntrySubmitterFactory
-from buildbotcustom.changes.ftppoller import FtpPoller
-
-# this is where all of our important configuration is stored. build number,
-# version number, sign-off revisions, etc.
-import release_config
-reload(release_config)
-from release_config import *
-
-# for the 'build' step we use many of the same vars as the nightlies do.
-# we import those so we don't have to duplicate them in release_config
-import config as nightly_config
-
-branchConfig = nightly_config.BRANCHES[releaseConfig['sourceRepoName']]
-
-builders = []
-test_builders = []
-schedulers = []
-change_source = []
-status = []
-
-def builderPrefix(s, platform=None):
- # sourceRepoName is in release_config and imported into global scope
- if platform:
- return "release-%s-%s_%s" % (releaseConfig['sourceRepoName'], platform, s)
- else:
- return "release-%s-%s" % (releaseConfig['sourceRepoName'], s)
-
-##### Change sources and Schedulers
-change_source.append(FtpPoller(
- branch="post_signing",
- ftpURLs=["http://%s/pub/mozilla.org/%s/nightly/%s-candidates/build%s/" \
- % (releaseConfig['stagingServer'], releaseConfig['productName'],
- releaseConfig['version'], releaseConfig['buildNumber'])],
- pollInterval= 60*10,
- searchString='win32_signing_build'
-))
-
-tag_scheduler = Scheduler(
- name='tag',
- branch=releaseConfig['sourceRepoPath'],
- treeStableTimer=0,
- builderNames=['tag'],
- fileIsImportant=lambda c: not isHgPollerTriggered(c, branchConfig['hgurl'])
-)
-schedulers.append(tag_scheduler)
-source_scheduler = Dependent(
- name='source',
- upstream=tag_scheduler,
- builderNames=['source']
-)
-schedulers.append(source_scheduler)
-for platform in releaseConfig['enUSPlatforms']:
- build_scheduler = Dependent(
- name='%s_build' % platform,
- upstream=tag_scheduler,
- builderNames=['%s_build' % platform]
- )
- schedulers.append(build_scheduler)
- if platform in releaseConfig['l10nPlatforms']:
- repack_scheduler = DependentL10n(
- name='%s_repack' % platform,
- platform=platform,
- upstream=build_scheduler,
- builderNames=['%s_repack' % platform],
- branch=releaseConfig['sourceRepoPath'],
- baseTag='%s_RELEASE' % releaseConfig['baseTag'],
- localesFile='suite/locales/shipped-locales',
- )
- schedulers.append(repack_scheduler)
-
-for platform in releaseConfig['l10nPlatforms']:
- l10n_verify_scheduler = Scheduler(
- name='%s_l10n_verification' % platform,
- treeStableTimer=0,
- branch='post_signing',
- builderNames=['%s_l10n_verification' % platform]
- )
- schedulers.append(l10n_verify_scheduler)
-
-updates_scheduler = Scheduler(
- name='updates',
- treeStableTimer=0,
- branch='post_signing',
- builderNames=['updates']
-)
-schedulers.append(updates_scheduler)
-
-updateBuilderNames = []
-for platform in sorted(releaseConfig['verifyConfigs'].keys()):
- updateBuilderNames.append('%s_update_verify' % platform)
-update_verify_scheduler = Dependent(
- name='update_verify',
- upstream=updates_scheduler,
- builderNames=updateBuilderNames
-)
-schedulers.append(update_verify_scheduler)
-
-if releaseConfig['majorUpdateRepoPath']:
- majorUpdateBuilderNames = []
- for platform in sorted(releaseConfig['majorUpdateVerifyConfigs'].keys()):
- majorUpdateBuilderNames.append('%s_major_update_verify' % platform)
- major_update_verify_scheduler = Triggerable(
- name='major_update_verify',
- builderNames=majorUpdateBuilderNames
- )
- schedulers.append(major_update_verify_scheduler)
-
-for platform in releaseConfig['unittestPlatforms']:
- if branchConfig['platforms'][platform]['enable_opt_unittests']:
- platform_test_builders = []
- base_name = branchConfig['platforms'][platform]['base_name']
- for suites_name, suites in branchConfig['unittest_suites']:
- platform_test_builders.extend(generateTestBuilderNames('%s_test' % platform, suites_name, suites))
-
- s = Scheduler(
- name='%s_release_unittest' % platform,
- treeStableTimer=0,
- branch='release-%s-%s-opt-unittest' % (releaseConfig['sourceRepoName'], platform),
- builderNames=platform_test_builders,
- )
- schedulers.append(s)
-
-# Purposely, there is not a Scheduler for ReleaseFinalVerification
-# This is a step run very shortly before release, and is triggered manually
-# from the waterfall
-
-if releaseConfig['productVersionFile']:
- bumpFiles = [releaseConfig['productVersionFile']]
-else:
- bumpFiles = []
-
-##### Builders
-repositories = {
- releaseConfig['sourceRepoPath']: {
- 'revision': releaseConfig['sourceRepoRevision'],
- 'relbranchOverride': releaseConfig['relbranchOverride'],
- 'bumpFiles': bumpFiles
- },
- releaseConfig['mozillaRepoPath']: {
- 'revision': releaseConfig['mozillaRepoRevision'],
- 'relbranchOverride': releaseConfig['mozillaRelbranchOverride'],
- 'bumpFiles': []
- },
-}
-if releaseConfig['inspectorRepoPath']:
- repositories[releaseConfig['inspectorRepoPath']] = {
- 'revision': releaseConfig['inspectorRepoRevision'],
- 'relbranchOverride': releaseConfig['inspectorRelbranchOverride'],
- 'bumpFiles': []
- }
-if releaseConfig['venkmanRepoPath']:
- repositories[releaseConfig['venkmanRepoPath']] = {
- 'revision': releaseConfig['venkmanRepoRevision'],
- 'relbranchOverride': releaseConfig['venkmanRelbranchOverride'],
- 'bumpFiles': []
- }
-if releaseConfig['chatzillaRepoPath']:
- repositories[releaseConfig['chatzillaRepoPath']] = {
- 'revision': releaseConfig['chatzillaRepoRevision'],
- 'relbranchOverride': releaseConfig['chatzillaRelbranchOverride'],
- 'bumpFiles': []
- }
-
-if len(releaseConfig['l10nPlatforms']) > 0:
- l10n_repos = get_l10n_repositories(releaseConfig['l10nRevisionFile'], releaseConfig['l10nRepoPath'],
- releaseConfig['l10nRelbranchOverride'])
- repositories.update(l10n_repos)
-
-# dummy factory for TESTING purposes
-from buildbot.process.factory import BuildFactory
-from buildbot.steps.dummy import Dummy
-dummy_factory = BuildFactory()
-dummy_factory.addStep(Dummy())
-
-tag_factory = ReleaseTaggingFactory(
- hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- repositories=repositories,
- productName=releaseConfig['productName'],
- appName=releaseConfig['appName'],
- version=releaseConfig['version'],
- appVersion=releaseConfig['appVersion'],
- milestone=releaseConfig['milestone'],
- baseTag=releaseConfig['baseTag'],
- buildNumber=releaseConfig['buildNumber'],
- hgUsername=releaseConfig['hgUsername'],
- hgSshKey=releaseConfig['hgSshKey'],
- relbranchPrefix=releaseConfig['relbranchPrefix'],
- clobberURL=branchConfig['base_clobber_url'],
-)
-
-if releaseConfig['skip_tag']:
- tag_factory = dummy_factory
-
-builders.append({
- 'name': 'tag',
- 'slavenames': branchConfig['platforms']['linux']['slaves'],
- 'category': 'release',
- 'builddir': builderPrefix('tag'),
- 'slavebuilddir': reallyShort(builderPrefix('tag')),
- 'factory': tag_factory,
- 'properties': {'builddir': builderPrefix('tag'),
- 'slavebuilddir': reallyShort(builderPrefix('tag'))}
-})
-
-
-source_factory = CCSourceFactory(
- hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- repoPath=releaseConfig['sourceRepoPath'],
- productName=releaseConfig['productName'],
- version=releaseConfig['version'],
- baseTag=releaseConfig['baseTag'],
- stagingServer=branchConfig['stage_server'],
- stageUsername=branchConfig['stage_username'],
- stageSshKey=branchConfig['stage_ssh_key'],
- buildNumber=releaseConfig['buildNumber'],
- mozRepoPath=releaseConfig['mozillaRepoPath'],
- inspectorRepoPath=releaseConfig['inspectorRepoPath'],
- venkmanRepoPath=releaseConfig['venkmanRepoPath'],
- chatzillaRepoPath=releaseConfig['chatzillaRepoPath'],
- # Disable cvsroot on comm-central/comm-2.0 builds
- #cvsroot=releaseConfig['cvsroot'],
- autoconfDirs=['.', 'mozilla', 'mozilla/js/src'],
- clobberURL=branchConfig['base_clobber_url'],
-)
-
-builders.append({
- 'name': 'source',
- 'slavenames': branchConfig['platforms']['linux']['slaves'],
- 'category': 'release',
- 'builddir': builderPrefix('source'),
- 'slavebuilddir': reallyShort(builderPrefix('source')),
- 'factory': source_factory,
- 'properties': {'slavebuilddir': reallyShort(builderPrefix('source'))}
-})
-
-
-for platform in releaseConfig['enUSPlatforms']:
- # shorthand
- pf = branchConfig['platforms'][platform]
- mozconfig = '%s/%s/release' % (platform, releaseConfig['sourceRepoName'])
- l10nmozconfig = '%s/%s/release-l10n' % (platform, releaseConfig['sourceRepoName'])
- if platform in releaseConfig['talosTestPlatforms']:
- talosMasters = branchConfig['talos_masters']
- else:
- talosMasters = None
-
- if platform in releaseConfig['unittestPlatforms']:
- packageTests = True
- unittestMasters = branchConfig['unittest_masters']
- unittestBranch = 'release-%s-%s-opt-unittest' % (releaseConfig['sourceRepoName'],
- platform)
- else:
- packageTests = False
- unittestMasters = None
- unittestBranch = None
-
- platform_env = pf['env'].copy()
- if 'update_channel' in branchConfig:
- platform_env['MOZ_UPDATE_CHANNEL'] = branchConfig['update_channel']
-
- build_factory = CCReleaseBuildFactory(
- env=platform_env,
- objdir=pf['platform_objdir'],
- platform=platform,
- hgHost=branchConfig['hghost'],
- repoPath=releaseConfig['sourceRepoPath'],
- mozRepoPath=releaseConfig['mozillaRepoPath'],
- inspectorRepoPath=releaseConfig['inspectorRepoPath'],
- venkmanRepoPath=releaseConfig['venkmanRepoPath'],
- chatzillaRepoPath=releaseConfig['chatzillaRepoPath'],
- # Disable cvsroot on comm-central/comm-2.0 builds
- #cvsroot=releaseConfig['cvsroot'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- configRepoPath=branchConfig['config_repo_path'],
- configSubDir=branchConfig['config_subdir'],
- profiledBuild=pf['profiled_build'],
- mozconfig=mozconfig,
- srcMozconfig=releaseConfig.get('mozconfigs', {}).get(platform),
- buildRevision='%s_RELEASE' % releaseConfig['baseTag'],
- stageServer=branchConfig['stage_server'],
- stageUsername=branchConfig['stage_username'],
- stageGroup=branchConfig['stage_group'],
- stageSshKey=branchConfig['stage_ssh_key'],
- stageBasePath='%s/%s' % (branchConfig['stage_base_path'],
- pf['stage_product']),
- uploadPackages=True,
- uploadSymbols=True,
- createSnippet=False,
- doCleanup=True, # this will clean-up the mac build dirs, but not delete
- # the entire thing
- buildSpace=10,
- productName=releaseConfig['productName'],
- version=releaseConfig['version'],
- buildNumber=releaseConfig['buildNumber'],
- talosMasters=talosMasters,
- packageTests=packageTests,
- unittestMasters=unittestMasters,
- unittestBranch=unittestBranch,
- clobberURL=branchConfig['base_clobber_url'],
- )
-
- builders.append({
- 'name': '%s_build' % platform,
- 'slavenames': pf['slaves'],
- 'category': 'release',
- 'builddir': builderPrefix('%s_build' % platform),
- 'slavebuilddir': reallyShort(builderPrefix('%s_build' % platform)),
- 'factory': build_factory,
- 'properties': {'slavebuilddir': reallyShort(builderPrefix('%s_build' % platform))}
- })
-
- if platform in releaseConfig['l10nPlatforms']:
- repack_factory = CCReleaseRepackFactory(
- hgHost=branchConfig['hghost'],
- project=releaseConfig['productName'],
- appName=releaseConfig['appName'],
- brandName=releaseConfig['brandName'],
- repoPath=releaseConfig['sourceRepoPath'],
- mozRepoPath=releaseConfig['mozillaRepoPath'],
- inspectorRepoPath=releaseConfig['inspectorRepoPath'],
- venkmanRepoPath=releaseConfig['venkmanRepoPath'],
- chatzillaRepoPath=releaseConfig['chatzillaRepoPath'],
- # Disable cvsroot on comm-central/comm-2.0 builds
- #cvsroot=cvsroot,
- l10nRepoPath=releaseConfig['l10nRepoPath'],
- mergeLocales=releaseConfig['mergeLocales'],
- stageServer=branchConfig['stage_server'],
- stageUsername=branchConfig['stage_username'],
- stageSshKey=branchConfig['stage_ssh_key'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- compareLocalesRepoPath=branchConfig['compare_locales_repo_path'],
- compareLocalesTag=branchConfig['compare_locales_tag'],
- buildSpace=2,
- configRepoPath=branchConfig['config_repo_path'],
- configSubDir=branchConfig['config_subdir'],
- mozconfig=l10nmozconfig,
- platform=platform,
- buildRevision='%s_RELEASE' % releaseConfig['baseTag'],
- version=releaseConfig['version'],
- buildNumber=releaseConfig['buildNumber'],
- tree='release',
- clobberURL=branchConfig['base_clobber_url'],
- )
-
- builders.append({
- 'name': '%s_repack' % platform,
- 'slavenames': branchConfig['l10n_slaves'][platform],
- 'category': 'release',
- 'builddir': builderPrefix('%s_repack' % platform),
- 'slavebuilddir': reallyShort(builderPrefix('%s_repack' % platform)),
- 'factory': repack_factory,
- 'properties': {'slavebuilddir': reallyShort(builderPrefix('%s_repack' % platform))}
- })
-
- if pf['enable_opt_unittests']:
- mochitestLeakThreshold = pf.get('mochitest_leak_threshold', None)
- crashtestLeakThreshold = pf.get('crashtest_leak_threshold', None)
- for suites_name, suites in branchConfig['unittest_suites']:
- # Release builds on mac don't have a11y enabled, do disable the mochitest-a11y test
- if platform.startswith('macosx') and 'mochitest-a11y' in suites:
- suites = suites[:]
- suites.remove('mochitest-a11y')
-
- test_builders.extend(generateTestBuilder(
- branchConfig, 'release', platform, "%s_test" % platform,
- 'release-%s-%s-opt-unittest' % (sourceRepoName, platform),
- suites_name, suites, mochitestLeakThreshold,
- crashtestLeakThreshold))
-
-for platform in releaseConfig['l10nPlatforms']:
- l10n_verification_factory = L10nVerifyFactory(
- hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- cvsroot=releaseConfig['cvsroot'],
- stagingServer=releaseConfig['stagingServer'],
- productName=releaseConfig['productName'],
- version=releaseConfig['version'],
- 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,
- 'properties': {'slavebuilddir': reallyShort(builderPrefix('%s_l10n_verification' % platform))}
- })
-
-releaseChannel = releaseConfig.get('releaseChannel', branchConfig['update_channel'])
-updates_factory = ReleaseUpdatesFactory(
- hgHost=branchConfig['hghost'],
- repoPath=releaseConfig['sourceRepoPath'],
- mozRepoPath=releaseConfig['mozillaRepoPath'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- cvsroot=releaseConfig['cvsroot'],
- patcherToolsTag=releaseConfig['patcherToolsTag'],
- patcherConfig=releaseConfig['patcherConfig'],
- verifyConfigs=releaseConfig['verifyConfigs'],
- appName=releaseConfig['appName'],
- productName=releaseConfig['productName'],
- brandName=releaseConfig['brandName'],
- version=releaseConfig['version'],
- appVersion=releaseConfig['appVersion'],
- baseTag=releaseConfig['baseTag'],
- buildNumber=releaseConfig['buildNumber'],
- oldVersion=releaseConfig['oldVersion'],
- oldAppVersion=releaseConfig['oldAppVersion'],
- oldBaseTag=releaseConfig['oldBaseTag'],
- oldBuildNumber=releaseConfig['oldBuildNumber'],
- ftpServer=releaseConfig['ftpServer'],
- bouncerServer=releaseConfig['bouncerServer'],
- stagingServer=releaseConfig['stagingServer'],
- stageUsername=branchConfig['stage_username'],
- stageSshKey=branchConfig['stage_ssh_key'],
- ausUser=branchConfig['aus2_user'],
- ausSshKey=branchConfig['aus2_ssh_key'],
- ausHost=branchConfig['aus2_host'],
- ausServerUrl=releaseConfig['ausServerUrl'],
- hgSshKey=releaseConfig['hgSshKey'],
- hgUsername=releaseConfig['hgUsername'],
- releaseChannel=releaseChannel,
- clobberURL=branchConfig['base_clobber_url'],
- oldRepoPath=releaseConfig['oldRepoPath'],
- releaseNotesUrl=releaseConfig['releaseNotesUrl'],
- binaryName=releaseConfig['binaryName'],
- oldBinaryName=releaseConfig['oldBinaryName'],
- testOlderPartials=releaseConfig['testOlderPartials'],
- schema=releaseConfig.get("snippetSchema", 1), # Bug 682805
- useBetaChannelForRelease=releaseConfig.get('useBetaChannelForRelease', False),
-)
-
-builders.append({
- 'name': 'updates',
- 'slavenames': branchConfig['platforms']['linux']['slaves'],
- 'category': 'release',
- 'builddir': builderPrefix('updates'),
- 'slavebuilddir': reallyShort(builderPrefix('updates')),
- 'factory': updates_factory,
- 'properties': {'slavebuilddir': reallyShort(builderPrefix('updates'))}
-})
-
-
-for platform in sorted(releaseConfig['verifyConfigs'].keys()):
- update_verify_factory = UpdateVerifyFactory(
- hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- verifyConfig=releaseConfig['verifyConfigs'][platform],
- clobberURL=branchConfig['base_clobber_url'],
- useOldUpdater=branchConfig.get('use_old_updater', False),
- )
-
- builders.append({
- 'name': '%s_update_verify' % platform,
- 'slavenames': branchConfig['platforms'][platform]['slaves'],
- 'category': 'release',
- 'builddir': builderPrefix('%s_update_verify' % platform),
- 'slavebuilddir': reallyShort(builderPrefix('%s_update_verify' % platform)),
- 'factory': update_verify_factory,
- 'properties': {'slavebuilddir': reallyShort(builderPrefix('%s_update_verify' % platform))}
- })
-
-
-final_verification_factory = ReleaseFinalVerification(
- hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- verifyConfigs=releaseConfig['verifyConfigs'],
- clobberURL=branchConfig['base_clobber_url'],
-)
-
-builders.append({
- 'name': 'final_verification',
- 'slavenames': branchConfig['platforms']['linux']['slaves'],
- 'category': 'release',
- 'builddir': builderPrefix('final_verification'),
- 'slavebuilddir': reallyShort(builderPrefix('final_verification')),
- 'factory': final_verification_factory,
- 'properties': {'slavebuilddir': reallyShort(builderPrefix('final_verification'))}
-})
-
-if releaseConfig['majorUpdateRepoPath']:
- # Not attached to any Scheduler
- major_update_factory = MajorUpdateFactory(
- hgHost=branchConfig['hghost'],
- repoPath=releaseConfig['majorUpdateSourceRepoPath'],
- mozRepoPath=releaseConfig['majorUpdateRepoPath'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- cvsroot=releaseConfig['cvsroot'],
- patcherToolsTag=releaseConfig['majorPatcherToolsTag'],
- patcherConfig=releaseConfig['majorUpdatePatcherConfig'],
- verifyConfigs=releaseConfig['majorUpdateVerifyConfigs'],
- appName=releaseConfig['appName'],
- productName=releaseConfig['productName'],
- brandName=releaseConfig['brandName'],
- version=releaseConfig['majorUpdateToVersion'],
- appVersion=releaseConfig['majorUpdateAppVersion'],
- baseTag=releaseConfig['majorUpdateBaseTag'],
- buildNumber=releaseConfig['majorUpdateBuildNumber'],
- oldVersion=releaseConfig['version'],
- oldAppVersion=releaseConfig['appVersion'],
- oldBaseTag=releaseConfig['baseTag'],
- oldBuildNumber=releaseConfig['buildNumber'],
- ftpServer=releaseConfig['ftpServer'],
- bouncerServer=releaseConfig['bouncerServer'],
- stagingServer=releaseConfig['stagingServer'],
- stageUsername=branchConfig['stage_username'],
- stageSshKey=branchConfig['stage_ssh_key'],
- ausUser=branchConfig['aus2_user'],
- ausSshKey=branchConfig['aus2_ssh_key'],
- ausHost=branchConfig['aus2_host'],
- ausServerUrl=releaseConfig['ausServerUrl'],
- hgSshKey=releaseConfig['hgSshKey'],
- hgUsername=releaseConfig['hgUsername'],
- releaseChannel=releaseConfig['releaseChannel'],
- clobberURL=branchConfig['base_clobber_url'],
- oldRepoPath=releaseConfig['oldRepoPath'],
- triggerSchedulers=['major_update_verify'],
- releaseNotesUrl=releaseConfig['majorUpdateReleaseNotesUrl'],
- testOlderPartials=releaseConfig['testOlderPartials'],
- schema=releaseConfig.get("majorSnippetSchema", 1), # Bug 682805
- useBetaChannelForRelease=releaseConfig.get('useBetaChannelForRelease', False),
- )
-
- builders.append({
- 'name': 'major_update',
- 'slavenames': branchConfig['platforms']['linux']['slaves'],
- 'category': 'release',
- 'builddir': builderPrefix('major_update'),
- 'slavebuilddir': reallyShort(builderPrefix('major_update')),
- 'factory': major_update_factory,
- 'properties': {'slavebuilddir': reallyShort(builderPrefix('major_update'))}
- })
-
- for platform in sorted(releaseConfig['majorUpdateVerifyConfigs'].keys()):
- major_update_verify_factory = UpdateVerifyFactory(
- hgHost=branchConfig['hghost'],
- buildToolsRepoPath=branchConfig['build_tools_repo_path'],
- verifyConfig=releaseConfig['majorUpdateVerifyConfigs'][platform],
- clobberURL=branchConfig['base_clobber_url'],
- )
-
- builders.append({
- 'name': '%s_major_update_verify' % platform,
- 'slavenames': branchConfig['platforms'][platform]['slaves'],
- 'category': 'release',
- 'builddir': builderPrefix('%s_major_update_verify' % platform),
- 'slavebuilddir': reallyShort(builderPrefix('%s_major_update_verify' % platform)),
- 'factory': major_update_verify_factory,
- 'properties': {'slavebuilddir': reallyShort(builderPrefix('%s_major_update_verify' % platform))}
- })
-
-# XXX: SeaMonkey atm doesn't have permission to use this :(
-#bouncer_submitter_factory = TuxedoEntrySubmitterFactory(
-# baseTag=releaseConfig['baseTag'],
-# appName=releaseConfig['appName'],
-# config=releaseConfig['tuxedoConfig'],
-# productName=releaseConfig['productName'],
-# version=releaseConfig['version'],
-# milestone=releaseConfig['milestone'],
-# tuxedoServerUrl=releaseConfig['tuxedoServerUrl'],
-# enUSPlatforms=releaseConfig['enUSPlatforms'],
-# l10nPlatforms=releaseConfig['l10nPlatforms'],
-# oldVersion=releaseConfig['oldVersion'],
-# hgHost=branchConfig['hghost'],
-# repoPath=releaseConfig['sourceRepoPath'],
-# buildToolsRepoPath=branchConfig['build_tools_repo_path'],
-# credentialsFile=os.path.join(os.getcwd(), "BuildSlaves.py"),
-#)
-
-#builders.append({
-# 'name': 'bouncer_submitter',
-# 'slavenames': branchConfig['platforms']['linux']['slaves'],
-# 'category': 'release',
-# 'builddir': 'bouncer_submitter',
-# 'factory': bouncer_submitter_factory
-#})
-
-status.append(TinderboxMailNotifier(
- fromaddr="comm.buildbot@build.mozilla.org",
- tree=branchConfig["tinderbox_tree"] + "-Release",
- extraRecipients=["<tinderbox-daemon@tinderbox.mozilla.org>",],
- relayhost="mail.build.mozilla.org",
- builders=[b['name'] for b in builders],
- logCompression="bzip2")
-)
-
-status.append(TinderboxMailNotifier(
- fromaddr="comm.buildbot@build.mozilla.org",
- tree=branchConfig["tinderbox_tree"] + "-Release",
- extraRecipients=["<tinderbox-daemon@tinderbox.mozilla.org>",],
- relayhost="mail.build.mozilla.org",
- builders=[b['name'] for b in test_builders],
- logCompression="bzip2",
- errorparser="unittest")
-)
-
-builders.extend(test_builders)deleted file mode 100644
--- a/seamonkey/win32/comm-1.9.1/nightly/mozconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-
-ac_add_options --enable-static
-ac_add_options --disable-shared
-
-ac_add_options --disable-tests
-
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Enable parallel compiling
-#mk_add_options MOZ_MAKE_FLAGS="-j2"
-
-if test -e "$topsrcdir/configs/seamonkey/win32/include/vista-sdk-mozconfig"; then
-. $topsrcdir/configs/seamonkey/win32/include/vista-sdk-mozconfig
-else
-. $topsrcdir/../configs/seamonkey/win32/include/vista-sdk-mozconfig
-fi
deleted file mode 100644
--- a/seamonkey/win32/comm-1.9.1/release/mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-
-ac_add_options --enable-static
-ac_add_options --disable-shared
-
-ac_add_options --disable-tests
-
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-if test -e "$topsrcdir/configs/seamonkey/win32/include/vista-sdk-mozconfig"; then
-. $topsrcdir/configs/seamonkey/win32/include/vista-sdk-mozconfig
-else
-. $topsrcdir/../configs/seamonkey/win32/include/vista-sdk-mozconfig
-fi
deleted file mode 100644
--- a/seamonkey/win32/comm-1.9.1/unittest/mozconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-export MOZ_DEBUG_SYMBOLS=1
-
-ac_add_options --enable-application=suite
-ac_add_options --enable-jemalloc
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --enable-optimize
-ac_add_options --enable-logrefcnt
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
-
-if test -e "$topsrcdir/../mozconfigs/seamonkey/win32/include/vista-sdk-mozconfig"; then
-. $topsrcdir/../mozconfigs/seamonkey/win32/include/vista-sdk-mozconfig
-else
-. $topsrcdir/../../mozconfigs/seamonkey/win32/include/vista-sdk-mozconfig
-fi
deleted file mode 100644
--- a/seamonkey/win32/comm-2.0/debug/mozconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-jemalloc
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-trace-malloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-2.0/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# 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/win32/comm-2.0/release/mozconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-2.0/unittest/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-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
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/win32/comm-aurora/debug/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-trace-malloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-aurora/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=aurora
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# 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/win32/comm-aurora/release/mozconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-aurora/unittest/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-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
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/win32/comm-beta/debug/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-trace-malloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-beta/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# 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/win32/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/win32/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-beta/unittest/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-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
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/win32/comm-central-trunk/debug/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-trace-malloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-central-trunk/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# 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/win32/comm-central-trunk/release/mozconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=beta
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-central-trunk/unittest/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-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
-
-# mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/win32/comm-release/debug/mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --disable-optimize
-ac_add_options --enable-debug
-ac_add_options --enable-trace-malloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-release/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# 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/win32/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/win32/comm-release/release/mozconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-ac_add_options --enable-application=suite
-ac_add_options --enable-update-channel=release
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
-ac_add_options --enable-tests
-#ac_add_options --with-branding=suite/branding/unofficial
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/seamonkey/win32/comm-release/unittest/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-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
-
-mk_add_options MOZ_MAKE_FLAGS="-j3"
deleted file mode 100644
--- a/seamonkey/win32/include/vista-sdk-mozconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Use the Windows Vista SDK
-export INCLUDE="D:/sdks/v6.0/include;D:/sdks/v6.0/include/atl;D:/msvs8/VC/ATLMFC/INCLUDE;D:/msvs8/VC/INCLUDE;D:/msvs8/VC/PlatformSDK/include;"
-export LIB="D:/sdks/v6.0/lib;D:/msvs8/VC/ATLMFC/LIB;D:/msvs8/VC/LIB;D:/msvs8/VC/PlatformSDK/lib;D:/msvs8/SDK/v2.0/lib;;D:/mozilla-build/atlthunk_compat"
-export PATH="/d/sdks/v6.0/bin:$PATH"
-export SDKDIR="D:/sdks/v6.0/"
-export SDKVER="6"
-echo "Using the Windows Vista SDK, real INCLUDE, LIB, PATH and SDKDIR are below"
-echo "INCLUDE: $INCLUDE"
-echo "LIB: $LIB"
-echo "PATH: $PATH"
-echo "SDKDIR: $SDKDIR"
