Bug 1011679 - Remove buildbot-configs/calendar. production
authorPhilipp Kewisch <mozilla@kewis.ch>
Fri, 16 May 2014 22:28:02 +0200
branchproduction
changeset 10390 b9e31e3ee685609ed04cad9b1ef3f94a5e2340c6
parent 10383 876a087b23bb8888e24d2a8eb0e44c698caab149
child 10392 e3a93b2fe8bb49924bafd00c0cd48896a63225b3
push id7697
push usermozilla@kewis.ch
push dateFri, 16 May 2014 20:28:39 +0000
bugs1011679
Bug 1011679 - Remove buildbot-configs/calendar.
calendar/Makefile
calendar/buildbot.tac
calendar/config.py
calendar/extensionfactory.py
calendar/l10n-calendar-changesets
calendar/l10nbuilds.ini
calendar/linux/comm-aurora/mozconfig-lightning
calendar/linux/comm-aurora/release/mozconfig
calendar/linux/comm-beta/mozconfig-lightning
calendar/linux/comm-beta/release/mozconfig
calendar/linux/comm-central/mozconfig-lightning
calendar/linux/comm-esr17/mozconfig-lightning
calendar/linux/comm-esr17/release/mozconfig
calendar/linux/comm-release/mozconfig-lightning
calendar/linux/comm-release/release/mozconfig
calendar/linux64/comm-aurora/mozconfig-lightning
calendar/linux64/comm-aurora/release/mozconfig
calendar/linux64/comm-beta/mozconfig-lightning
calendar/linux64/comm-beta/release/mozconfig
calendar/linux64/comm-central/mozconfig-lightning
calendar/linux64/comm-esr17/mozconfig-lightning
calendar/linux64/comm-esr17/release/mozconfig
calendar/linux64/comm-release/mozconfig-lightning
calendar/linux64/comm-release/release/mozconfig
calendar/macosx/comm-aurora/mozconfig-lightning
calendar/macosx/comm-central/mozconfig-lightning
calendar/macosx64/comm-aurora/mozconfig-lightning
calendar/macosx64/comm-aurora/release/mozconfig
calendar/macosx64/comm-beta/mozconfig-lightning
calendar/macosx64/comm-beta/release/mozconfig
calendar/macosx64/comm-central/mozconfig-lightning
calendar/macosx64/comm-esr17/mozconfig-lightning
calendar/macosx64/comm-esr17/release/mozconfig
calendar/macosx64/comm-release/mozconfig-lightning
calendar/macosx64/comm-release/release/mozconfig
calendar/master.cfg
calendar/mozillabuild.py
calendar/mozillaleak.py
calendar/public_html/buildbot.css
calendar/public_html/index.html
calendar/public_html/robots.txt
calendar/release_calendar.py
calendar/release_config.py
calendar/release_master.py
calendar/win32/comm-aurora/mozconfig-lightning
calendar/win32/comm-aurora/release/mozconfig
calendar/win32/comm-beta/mozconfig-lightning
calendar/win32/comm-beta/release/mozconfig
calendar/win32/comm-central/mozconfig-lightning
calendar/win32/comm-esr17/mozconfig-lightning
calendar/win32/comm-esr17/release/mozconfig
calendar/win32/comm-release/mozconfig-lightning
calendar/win32/comm-release/release/mozconfig
deleted file mode 100644
--- a/calendar/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-# This is a simple makefile which lives in a buildmaster/buildslave
-# directory (next to the buildbot.tac file). It allows you to start/stop the
-# master or slave by doing 'make start' or 'make stop'.
-
-# The 'reconfig' target will tell a buildmaster to reload its config file.
-
-start:
-    twistd --no_save -y buildbot.tac
-
-stop:
-    kill `cat twistd.pid`
-
-reconfig:
-    kill -HUP `cat twistd.pid`
-
-log:
-    tail -f twistd.log
deleted file mode 100644
--- a/calendar/buildbot.tac
+++ /dev/null
@@ -1,19 +0,0 @@
-
-from twisted.application import service
-from buildbot.master import BuildMaster
-
-from twisted.python.log import ILogObserver, FileLogObserver
-from twisted.python.logfile import DailyLogFile
-
-basedir = r'/buildbot/calendar/buildbot-configs/calendar'
-configfile = r'master.cfg'
-
-logfile = DailyLogFile("twistd.log", "logs")
-application = service.Application('buildmaster')
-
-application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
-BuildMaster(basedir, configfile).setServiceParent(application)
-
-
-
-
deleted file mode 100644
--- a/calendar/config.py
+++ /dev/null
@@ -1,645 +0,0 @@
-HGURL = 'https://hg.mozilla.org/'
-HGHOST = 'hg.mozilla.org'
-CONFIG_REPO_URL = 'https://hg.mozilla.org/build/buildbot-configs'
-CONFIG_REPO_PATH = 'build/buildbot-configs'
-COMPARE_LOCALES_REPO_PATH = 'build/compare-locales'
-CONFIG_SUBDIR = 'calendar'
-LOCALE_REPO_URL = 'https://hg.mozilla.org/releases/l10n/mozilla-aurora/%(locale)s'
-OBJDIR = 'objdir-tb'
-STAGE_USERNAME = 'calbld'
-STAGE_SERVER = 'stage.mozilla.org'
-STAGE_GROUP = 'calendar'
-STAGE_SSH_KEY = 'calbld_dsa'
-AUS2_USER = 'calbld'
-AUS2_HOST = 'aus-staging.sj.mozillamessaging.com'
-DOWNLOAD_BASE_URL = 'https://ftp-ssl.mozilla.org/pub/mozilla.org/calendar/'
-PRODUCT = 'calendar'
-MOZ_APP_NAME = 'calendar'
-SYMBOL_SERVER_HOST = 'symbolpush.mozilla.org'
-SYMBOL_SERVER_USER = 'calbld'
-SYMBOL_SERVER_PATH = '/mnt/netapp/breakpad/symbols_sbrd/'
-SYMBOL_SERVER_POST_UPLOAD_CMD = '/usr/local/bin/post-symbol-upload.py'
-LIGHTNING_UPDATE_LOCATION = 'https://calendar.mozilla.org/update.php'
-
-ORGANIZATION = 'community'
-
-BUILDERS = {
-    'linux': {
-        'community': [ 'momo-vm-cal-linux-01' ],
-    },
-    'linux64': {
-        'momo': ['momo-vm-cal-linux64-01'],
-    },
-    'macosx': {
-        '10.6': {
-            'momo':      [ 'tb2-darwin10-slave64' ],
-            'sea':       [ 'sea-loaner-osx' ],
-        },
-        '10.7': {
-            'community':      [ 'cal-mini-osx64-1' ],
-        }
-    },
-    'win32': {
-        'community': [ 'cal-vm-win32-tbox' ],
-        'community-new': ['cal-vm-win32-1' ],
-    },
-}
-
-DEFAULTS = {
-    'factory':                'build',
-    'hgurl':                  HGURL,
-    'branch_name':            'comm-central',
-    'stage_base_path':        '/home/ftp/pub/mozilla.org/calendar',
-    'mozilla_central_branch': 'releases/mozilla-1.9.1',
-    'l10n_repo':              'releases/l10n/mozilla-aurora',
-    'add_poll_branches':      [ ],
-    'period':                 60 * 60 * 8,
-    'nightly_hour':           [3],
-    'nightly_minute':         [0],
-    'irc':                    True,
-    'clobber_url':            "https://calendar-master.mozillalabs.com/clobberer/",
-    'builder_type':           "build",
-    'tinderbox_tree':         "ThunderbirdTest",
-    'mozmill':                False,
-    'product_name':           'sunbird',
-    'brand_name':             'Sunbird',
-    'app_name':               'calendar',
-    'build_space':            8,
-    'l10n_nightly_updates':   False,
- 
-    'stage_username':         STAGE_USERNAME,
-    'stage_server':           STAGE_SERVER,
-    'stage_group':            STAGE_GROUP,
-    'stage_ssh_key':          STAGE_SSH_KEY,
-    
-    # Unit Test
-    'client_py_args':       ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--hg-options=--verbose --time'],
-
-    'build_tools_repo': "build/tools",
-    'hg_rev_shortnames': {
-      'mozilla-central':        'moz',
-      'comm-central':           'cc',
-      'comm-aurora':            'ca',
-      'comm-beta':              'cb',
-      'comm-release':           'cr',
-      'dom-inspector':          'domi',
-      'releases/mozilla-1.9.1': 'moz191',
-      'releases/mozilla-1.9.2': 'moz192',
-      'releases/mozilla-aurora':   'mozaurora',
-      'releases/comm-1.9.1':    'cc191',
-    }
-}
-
-# All branches that are to be built MUST be listed here.
-BRANCHES = {
-    'comm-release': {},
-    'comm-beta': {},
-    'comm-aurora': {},
-#    'comm-central': {},
-}
-
-######## lightning-release
-# All platforms being built for this branch MUST be listed here.
-BRANCHES['comm-release']['platforms'] = {
-    'linux': {},
-    'linux64': {},
-    'win32': {},
-    'macosx64': {},
-}
-
-BRANCHES['comm-release']['mozilla_central_branch'] = 'releases/mozilla-release'
-BRANCHES['comm-release']['download_base_url'] = DOWNLOAD_BASE_URL + 'sunbird'
-BRANCHES['comm-release']['branch_name'] = 'comm-release'
-BRANCHES['comm-release']['hg_branch'] = 'releases/comm-release'
-BRANCHES['comm-release']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman'] + ['--mozilla-repo=https://hg.mozilla.org/releases/mozilla-release']
-BRANCHES['comm-release']['mozconfig'] = 'mozconfig-lightning'
-BRANCHES['comm-release']['period'] = 60 * 60 * 10
-BRANCHES['comm-release']['nightly_hour'] = [0]
-BRANCHES['comm-release']['nightly'] = False
-# Lightning doesn't need to package Thunderbird
-BRANCHES['comm-release']['package'] = False
-BRANCHES['comm-release']['upload_stage'] = True
-BRANCHES['comm-release']['upload_complete_mar'] = False
-#Might be better off per-platform instead of per-branch here.
-BRANCHES['comm-release']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
-BRANCHES['comm-release']['stage_username'] = 'calbld'
-BRANCHES['comm-release']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
-BRANCHES['comm-release']['stage_group'] = 'calendar'
-BRANCHES['comm-release']['stage_ssh_key'] = 'calbld_dsa'
-BRANCHES['comm-release']['l10n'] = False
-BRANCHES['comm-release']['l10n_tree'] = 'calendar10x'
-BRANCHES['comm-release']['l10n_repo'] = 'releases/l10n/mozilla-release'
-BRANCHES['comm-release']['irc_nick'] = 'calbuild'
-BRANCHES['comm-release']['irc_channels'] = [ 'maildev', 'calendar' ]
-BRANCHES['comm-release']['extensions'] = {
-    'lightning': {
-        'subdir': "calendar/lightning",
-        'download_base_url': DOWNLOAD_BASE_URL + 'lightning',
-        'l10n': True
-    }
-}
-
-BRANCHES['comm-release']['platforms']['linux']['base_name'] = 'Linux comm-release lightning'
-BRANCHES['comm-release']['platforms']['linux64']['base_name'] = 'Linux x86_64 comm-release lightning'
-BRANCHES['comm-release']['platforms']['win32']['base_name'] = 'WINNT 5.2 comm-release lightning'
-BRANCHES['comm-release']['platforms']['macosx64']['base_name'] = 'MacOSX 10.6 comm-release lightning'
-BRANCHES['comm-release']['platforms']['linux']['profiled_build'] = False
-BRANCHES['comm-release']['platforms']['linux64']['profiled_build'] = False
-BRANCHES['comm-release']['platforms']['win32']['profiled_build'] = False
-BRANCHES['comm-release']['platforms']['macosx64']['profiled_build'] = False
-BRANCHES['comm-release']['platforms']['linux']['milestone'] = "comm-release/linux-xpi"
-BRANCHES['comm-release']['platforms']['linux64']['milestone'] = "comm-release/linux64-xpi"
-BRANCHES['comm-release']['platforms']['win32']['milestone'] = "comm-release/win32-xpi"
-BRANCHES['comm-release']['platforms']['macosx64']['milestone'] = "comm-release/macosx-xpi"
-BRANCHES['comm-release']['platforms']['macosx64']['upload_glob'] = "mozilla/dist/universal/xpi-stage/{lightning,gdata-provider}.xpi"
-# 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'] = False
-BRANCHES['comm-release']['platforms']['linux']['update_platform'] = 'Linux_x86-gcc3'
-BRANCHES['comm-release']['platforms']['win32']['update_platform'] = 'WINNT_x86-msvc'
-BRANCHES['comm-release']['platforms']['linux64']['update_platform'] = 'Linux_x86_64-gcc3'
-BRANCHES['comm-release']['platforms']['macosx64']['update_platform'] = 'Darwin_Universal-gcc3'
-# If True, 'make buildsymbols' and 'make uploadsymbols' will be run
-# SYMBOL_SERVER_* variables are setup in the environment section below
-BRANCHES['comm-release']['platforms']['linux']['upload_symbols'] = True
-BRANCHES['comm-release']['platforms']['linux64']['upload_symbols'] = True
-BRANCHES['comm-release']['platforms']['win32']['upload_symbols'] = True
-BRANCHES['comm-release']['platforms']['macosx64']['upload_symbols'] = True
-BRANCHES['comm-release']['tinderbox_tree'] = 'Calendar-Release'
-BRANCHES['comm-release']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
-BRANCHES['comm-release']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
-BRANCHES['comm-release']['platforms']['win32']['slaves'] = BUILDERS['win32']['community-new']
-BRANCHES['comm-release']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.7']['community']
-
-# This is used in a bunch of places where something needs to be run from
-# the objdir. This is necessary because of universal builds on Mac
-# creating subdirectories inside of the objdir.
-BRANCHES['comm-release']['platforms']['linux']['platform_objdir'] = OBJDIR
-BRANCHES['comm-release']['platforms']['linux64']['platform_objdir'] = OBJDIR
-BRANCHES['comm-release']['platforms']['win32']['platform_objdir'] = OBJDIR
-BRANCHES['comm-release']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
-BRANCHES['comm-release']['platforms']['linux']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-
-    # Bug 779192
-    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib',
-}
-BRANCHES['comm-release']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-
-    # Bug 779192
-    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib64',
-}
-BRANCHES['comm-release']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/cltbld/.ssh/calbld_dsa',
-}
-BRANCHES['comm-release']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'DISABLE_LIGHTNING_INSTALL': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/Users/calbld/.ssh/calbld_dsa',
-
-    # See bug 758694
-    'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
-}
-
-######## lightning-beta
-# All platforms being built for this branch MUST be listed here.
-BRANCHES['comm-beta']['platforms'] = {
-    'linux': {},
-    'linux64': {},
-    'win32': {},
-    'macosx64': {},
-}
-
-BRANCHES['comm-beta']['mozilla_central_branch'] = 'releases/mozilla-beta'
-BRANCHES['comm-beta']['download_base_url'] = DOWNLOAD_BASE_URL + 'sunbird'
-BRANCHES['comm-beta']['branch_name'] = 'comm-beta'
-BRANCHES['comm-beta']['hg_branch'] = 'releases/comm-beta'
-BRANCHES['comm-beta']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman'] + ['--mozilla-repo=https://hg.mozilla.org/releases/mozilla-beta']
-BRANCHES['comm-beta']['mozconfig'] = 'mozconfig-lightning'
-BRANCHES['comm-beta']['period'] = 60 * 60 * 10
-BRANCHES['comm-beta']['nightly_hour'] = [0]
-BRANCHES['comm-beta']['nightly'] = False
-# Lightning doesn't need to package Thunderbird
-BRANCHES['comm-beta']['package'] = False
-BRANCHES['comm-beta']['upload_stage'] = True
-BRANCHES['comm-beta']['upload_complete_mar'] = False
-#Might be better off per-platform instead of per-branch here.
-BRANCHES['comm-beta']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
-BRANCHES['comm-beta']['stage_username'] = 'calbld'
-BRANCHES['comm-beta']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
-BRANCHES['comm-beta']['stage_group'] = 'calendar'
-BRANCHES['comm-beta']['stage_ssh_key'] = 'calbld_dsa'
-BRANCHES['comm-beta']['l10n'] = False
-BRANCHES['comm-beta']['l10n_tree'] = 'calendar10x'
-BRANCHES['comm-beta']['l10n_repo'] = 'releases/l10n/mozilla-beta'
-BRANCHES['comm-beta']['irc_nick'] = 'calbuild'
-BRANCHES['comm-beta']['irc_channels'] = [ 'maildev', 'calendar' ]
-BRANCHES['comm-beta']['extensions'] = {
-    'lightning': {
-        'subdir': "calendar/lightning",
-        'download_base_url': DOWNLOAD_BASE_URL + 'lightning',
-        'l10n': True
-    }
-}
-
-BRANCHES['comm-beta']['platforms']['linux']['base_name'] = 'Linux comm-beta lightning'
-BRANCHES['comm-beta']['platforms']['linux64']['base_name'] = 'Linux x86_64 comm-beta lightning'
-BRANCHES['comm-beta']['platforms']['win32']['base_name'] = 'WINNT 5.2 comm-beta lightning'
-BRANCHES['comm-beta']['platforms']['macosx64']['base_name'] = 'MacOSX 10.6 comm-beta lightning'
-BRANCHES['comm-beta']['platforms']['linux']['profiled_build'] = False
-BRANCHES['comm-beta']['platforms']['linux64']['profiled_build'] = False
-BRANCHES['comm-beta']['platforms']['win32']['profiled_build'] = False
-BRANCHES['comm-beta']['platforms']['macosx64']['profiled_build'] = False
-BRANCHES['comm-beta']['platforms']['linux']['milestone'] = "comm-beta/linux-xpi"
-BRANCHES['comm-beta']['platforms']['linux64']['milestone'] = "comm-beta/linux64-xpi"
-BRANCHES['comm-beta']['platforms']['win32']['milestone'] = "comm-beta/win32-xpi"
-BRANCHES['comm-beta']['platforms']['macosx64']['milestone'] = "comm-beta/macosx-xpi"
-BRANCHES['comm-beta']['platforms']['macosx64']['upload_glob'] = "mozilla/dist/universal/xpi-stage/{lightning,gdata-provider}.xpi"
-# 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'] = False
-BRANCHES['comm-beta']['platforms']['linux']['update_platform'] = 'Linux_x86-gcc3'
-BRANCHES['comm-beta']['platforms']['win32']['update_platform'] = 'WINNT_x86-msvc'
-BRANCHES['comm-beta']['platforms']['linux64']['update_platform'] = 'Linux_x86_64-gcc3'
-BRANCHES['comm-beta']['platforms']['macosx64']['update_platform'] = 'Darwin_Universal-gcc3'
-# If True, 'make buildsymbols' and 'make uploadsymbols' will be run
-# SYMBOL_SERVER_* variables are setup in the environment section below
-BRANCHES['comm-beta']['platforms']['linux']['upload_symbols'] = True
-BRANCHES['comm-beta']['platforms']['linux64']['upload_symbols'] = True
-BRANCHES['comm-beta']['platforms']['win32']['upload_symbols'] = True
-BRANCHES['comm-beta']['platforms']['macosx64']['upload_symbols'] = True
-BRANCHES['comm-beta']['tinderbox_tree'] = 'Calendar-Beta'
-BRANCHES['comm-beta']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
-BRANCHES['comm-beta']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
-BRANCHES['comm-beta']['platforms']['win32']['slaves'] = BUILDERS['win32']['community-new']
-BRANCHES['comm-beta']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.7']['community']
-
-# This is used in a bunch of places where something needs to be run from
-# the objdir. This is necessary because of universal builds on Mac
-# creating subdirectories inside of the objdir.
-BRANCHES['comm-beta']['platforms']['linux']['platform_objdir'] = OBJDIR
-BRANCHES['comm-beta']['platforms']['linux64']['platform_objdir'] = OBJDIR
-BRANCHES['comm-beta']['platforms']['win32']['platform_objdir'] = OBJDIR
-BRANCHES['comm-beta']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
-BRANCHES['comm-beta']['platforms']['linux']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-
-    # Bug 779192
-    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib',
-}
-BRANCHES['comm-beta']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-
-    # Bug 779192
-    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib64',
-}
-BRANCHES['comm-beta']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/cltlbld/.ssh/calbld_dsa',
-}
-BRANCHES['comm-beta']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'DISABLE_LIGHTNING_INSTALL': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/Users/calbld/.ssh/calbld_dsa',
-
-    # See bug 758694
-    'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
-}
-
-######## lightning-aurora
-# All platforms being built for this branch MUST be listed here.
-BRANCHES['comm-aurora']['platforms'] = {
-    'linux': {},
-    'linux64': {},
-    'win32': {},
-    'macosx64': {},
-}
-
-BRANCHES['comm-aurora']['mozilla_central_branch'] = 'releases/mozilla-aurora'
-BRANCHES['comm-aurora']['download_base_url'] = DOWNLOAD_BASE_URL + 'sunbird'
-BRANCHES['comm-aurora']['branch_name'] = 'comm-aurora'
-BRANCHES['comm-aurora']['hg_branch'] = 'releases/comm-aurora'
-BRANCHES['comm-aurora']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman'] + ['--mozilla-repo=https://hg.mozilla.org/releases/mozilla-aurora']
-BRANCHES['comm-aurora']['mozconfig'] = 'mozconfig-lightning'
-BRANCHES['comm-aurora']['period'] = 60 * 60 * 10
-BRANCHES['comm-aurora']['nightly_hour'] = [0]
-# Lightning doesn't need to package Thunderbird
-BRANCHES['comm-aurora']['package'] = False
-BRANCHES['comm-aurora']['upload_stage'] = True
-BRANCHES['comm-aurora']['upload_complete_mar'] = False
-#Might be better off per-platform instead of per-branch here.
-BRANCHES['comm-aurora']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
-BRANCHES['comm-aurora']['stage_username'] = 'calbld'
-BRANCHES['comm-aurora']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
-BRANCHES['comm-aurora']['stage_group'] = 'calendar'
-BRANCHES['comm-aurora']['stage_ssh_key'] = 'calbld_dsa'
-BRANCHES['comm-aurora']['l10n'] = False
-BRANCHES['comm-aurora']['l10n_tree'] = 'calendar10x'
-BRANCHES['comm-aurora']['l10n_repo'] = 'releases/l10n/mozilla-aurora'
-BRANCHES['comm-aurora']['irc_nick'] = 'calbuild'
-BRANCHES['comm-aurora']['irc_channels'] = [ 'maildev', 'calendar' ]
-BRANCHES['comm-aurora']['extensions'] = {
-    'lightning': {
-        'subdir': "calendar/lightning",
-        'download_base_url': DOWNLOAD_BASE_URL + 'lightning',
-        'l10n': True
-    }
-}
-
-BRANCHES['comm-aurora']['platforms']['linux']['base_name'] = 'Linux comm-aurora lightning'
-BRANCHES['comm-aurora']['platforms']['linux64']['base_name'] = 'Linux x86_64 comm-aurora lightning'
-BRANCHES['comm-aurora']['platforms']['win32']['base_name'] = 'WINNT 5.2 comm-aurora lightning'
-BRANCHES['comm-aurora']['platforms']['macosx64']['base_name'] = 'MacOSX 10.6 comm-aurora lightning'
-BRANCHES['comm-aurora']['platforms']['linux']['profiled_build'] = False
-BRANCHES['comm-aurora']['platforms']['linux64']['profiled_build'] = False
-BRANCHES['comm-aurora']['platforms']['win32']['profiled_build'] = False
-BRANCHES['comm-aurora']['platforms']['macosx64']['profiled_build'] = False
-BRANCHES['comm-aurora']['platforms']['linux']['milestone'] = "comm-aurora/linux-xpi"
-BRANCHES['comm-aurora']['platforms']['linux64']['milestone'] = "comm-aurora/linux64-xpi"
-BRANCHES['comm-aurora']['platforms']['win32']['milestone'] = "comm-aurora/win32-xpi"
-BRANCHES['comm-aurora']['platforms']['macosx64']['milestone'] = "comm-aurora/macosx-xpi"
-BRANCHES['comm-aurora']['platforms']['macosx64']['upload_glob'] = "mozilla/dist/universal/xpi-stage/{lightning,gdata-provider}.xpi"
-# 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'] = False
-BRANCHES['comm-aurora']['platforms']['linux']['update_platform'] = 'Linux_x86-gcc3'
-BRANCHES['comm-aurora']['platforms']['win32']['update_platform'] = 'WINNT_x86-msvc'
-BRANCHES['comm-aurora']['platforms']['linux64']['update_platform'] = 'Linux_x86_64-gcc3'
-BRANCHES['comm-aurora']['platforms']['macosx64']['update_platform'] = 'Darwin_Universal-gcc3'
-# If True, 'make buildsymbols' and 'make uploadsymbols' will be run
-# SYMBOL_SERVER_* variables are setup in the environment section below
-BRANCHES['comm-aurora']['platforms']['linux']['upload_symbols'] = True
-BRANCHES['comm-aurora']['platforms']['linux64']['upload_symbols'] = True
-BRANCHES['comm-aurora']['platforms']['win32']['upload_symbols'] = True
-BRANCHES['comm-aurora']['platforms']['macosx64']['upload_symbols'] = True
-BRANCHES['comm-aurora']['tinderbox_tree'] = 'Calendar-Aurora'
-BRANCHES['comm-aurora']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
-BRANCHES['comm-aurora']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
-BRANCHES['comm-aurora']['platforms']['win32']['slaves'] = BUILDERS['win32']['community-new']
-BRANCHES['comm-aurora']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.7']['community']
-
-# This is used in a bunch of places where something needs to be run from
-# the objdir. This is necessary because of universal builds on Mac
-# creating subdirectories inside of the objdir.
-BRANCHES['comm-aurora']['platforms']['linux']['platform_objdir'] = OBJDIR
-BRANCHES['comm-aurora']['platforms']['linux64']['platform_objdir'] = OBJDIR
-BRANCHES['comm-aurora']['platforms']['win32']['platform_objdir'] = OBJDIR
-BRANCHES['comm-aurora']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
-BRANCHES['comm-aurora']['platforms']['linux']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
-
-    # Bug 779192
-    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib',
-}
-BRANCHES['comm-aurora']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
-
-    # Bug 779192
-    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib64',
-}
-BRANCHES['comm-aurora']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/cltbld/.ssh/calbld_dsa',
-    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
-}
-BRANCHES['comm-aurora']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
-    'MOZ_OBJDIR': OBJDIR,
-    'TINDERBOX_OUTPUT': '1',
-    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-    'DISABLE_LIGHTNING_INSTALL': '1',
-    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-    'SYMBOL_SERVER_SSH_KEY': '/Users/calbld/.ssh/calbld_dsa',
-    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
-
-    # See bug 758694
-    'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
-}
-######## lightning-trunk
-# All platforms being built for this branch MUST be listed here.
-#BRANCHES['comm-central']['platforms'] = {
-#    'linux': {},
-#    'linux64': {},
-#    'win32': {},
-#    'macosx64': {}
-#}
-#
-#BRANCHES['comm-central']['mozilla_central_branch'] = 'mozilla-central'
-#BRANCHES['comm-central']['download_base_url'] = DOWNLOAD_BASE_URL + 'sunbird'
-#BRANCHES['comm-central']['branch_name'] = 'comm-central'
-#BRANCHES['comm-central']['hg_branch'] = 'comm-central'
-#BRANCHES['comm-central']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman']
-#BRANCHES['comm-central']['mozconfig'] = 'mozconfig-lightning'
-## Period for comm-central disabled in master.cfg
-#BRANCHES['comm-central']['period'] = 60 * 60 * 10
-## Lightning doesn't need to package Thunderbird
-#BRANCHES['comm-central']['package'] = False
-#BRANCHES['comm-central']['upload_stage'] = True
-#BRANCHES['comm-central']['upload_complete_mar'] = False
-##Might be better off per-platform instead of per-branch here.
-#BRANCHES['comm-central']['upload_glob'] = "mozilla/dist/xpi-stage/{lightning,gdata-provider}.xpi"
-#BRANCHES['comm-central']['stage_username'] = 'calbld'
-#BRANCHES['comm-central']['stage_base_path'] = '/home/ftp/pub/mozilla.org/calendar/lightning'
-#BRANCHES['comm-central']['stage_group'] = 'calendar'
-#BRANCHES['comm-central']['stage_ssh_key'] = 'calbld_dsa'
-#BRANCHES['comm-central']['l10n'] = False
-#BRANCHES['comm-central']['l10n_tree'] = 'calendar11x'
-#BRANCHES['comm-central']['l10n_repo'] = 'l10n-central'
-#BRANCHES['comm-central']['irc_nick'] = 'lt-trunk-builds'
-#BRANCHES['comm-central']['irc_channels'] = [ 'calendar' ]
-#
-#BRANCHES['comm-central']['extensions'] = {
-#    'lightning': {
-#        'subdir': "calendar/lightning",
-#        'download_base_url': DOWNLOAD_BASE_URL + 'lightning',
-#        'l10n': True
-#    }
-#}
-#BRANCHES['comm-central']['platforms']['linux']['base_name'] = 'Linux comm-central lightning'
-#BRANCHES['comm-central']['platforms']['linux64']['base_name'] = 'Linux x86_64 comm-central lightning'
-#BRANCHES['comm-central']['platforms']['win32']['base_name'] = 'WINNT 5.2 comm-central lightning'
-#BRANCHES['comm-central']['platforms']['macosx64']['base_name'] = 'MacOSX 10.6 comm-central lightning'
-#BRANCHES['comm-central']['platforms']['linux']['profiled_build'] = False
-#BRANCHES['comm-central']['platforms']['linux64']['profiled_build'] = False
-#BRANCHES['comm-central']['platforms']['win32']['profiled_build'] = False
-#BRANCHES['comm-central']['platforms']['macosx64']['profiled_build'] = False
-#BRANCHES['comm-central']['platforms']['linux']['milestone'] = "comm-central/linux-xpi"
-#BRANCHES['comm-central']['platforms']['linux64']['milestone'] = "comm-central/linux64-xpi"
-#BRANCHES['comm-central']['platforms']['win32']['milestone'] = "comm-central/win32-xpi"
-#BRANCHES['comm-central']['platforms']['macosx64']['milestone'] = "comm-central/macosx-xpi"
-#BRANCHES['comm-central']['platforms']['macosx64']['upload_glob'] = "mozilla/dist/universal/xpi-stage/{lightning,gdata-provider}.xpi"
-#
-## 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']['create_snippet'] = False
-#BRANCHES['comm-central']['platforms']['linux']['update_platform'] = 'Linux_x86-gcc3'
-#BRANCHES['comm-central']['platforms']['linux64']['update_platform'] = 'Linux_x86_64-gcc3'
-#BRANCHES['comm-central']['platforms']['win32']['update_platform'] = 'WINNT_x86-msvc'
-#BRANCHES['comm-central']['platforms']['macosx64']['update_platform'] = 'Darwin_Universal-gcc3'
-## If True, 'make buildsymbols' and 'make uploadsymbols' will be run
-## SYMBOL_SERVER_* variables are setup in the environment section below
-#BRANCHES['comm-central']['platforms']['linux']['upload_symbols'] = True
-#BRANCHES['comm-central']['platforms']['linux64']['upload_symbols'] = True
-#BRANCHES['comm-central']['platforms']['win32']['upload_symbols'] = True
-#BRANCHES['comm-central']['platforms']['macosx64']['upload_symbols'] = True
-#BRANCHES['comm-central']['tinderbox_tree'] = 'CalendarTrunk'
-#BRANCHES['comm-central']['platforms']['linux']['slaves'] = BUILDERS['linux']['community']
-#BRANCHES['comm-central']['platforms']['linux64']['slaves'] = BUILDERS['linux64']['momo']
-#BRANCHES['comm-central']['platforms']['win32']['slaves'] = BUILDERS['win32']['community-new']
-#BRANCHES['comm-central']['platforms']['macosx64']['slaves'] = BUILDERS['macosx']['10.7']['community']
-#
-## This is used in a bunch of places where something needs to be run from
-## the objdir. This is necessary because of universal builds on Mac
-## creating subdirectories inside of the objdir.
-#BRANCHES['comm-central']['platforms']['linux']['platform_objdir'] = OBJDIR
-#BRANCHES['comm-central']['platforms']['linux64']['platform_objdir'] = OBJDIR
-#BRANCHES['comm-central']['platforms']['win32']['platform_objdir'] = OBJDIR
-#BRANCHES['comm-central']['platforms']['macosx64']['platform_objdir'] = '%s/i386' % OBJDIR
-#BRANCHES['comm-central']['platforms']['linux']['env'] = {'CVS_RSH': 'ssh',
-#    'MOZ_OBJDIR': OBJDIR,
-#    'TINDERBOX_OUTPUT': '1',
-#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-#    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-#    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-#    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-#    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-#    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
-#
-#    # Bug 779192
-#    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib',
-#}
-#BRANCHES['comm-central']['platforms']['linux64']['env'] = {'CVS_RSH': 'ssh',
-#    'MOZ_OBJDIR': OBJDIR,
-#    'TINDERBOX_OUTPUT': '1',
-#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-#    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-#    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-#    'SYMBOL_SERVER_SSH_KEY': '/home/cltbld/.ssh/calbld_dsa',
-#    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
-#
-#    # Bug 779192
-#    'LD_LIBRARY_PATH': '/tools/gcc-4.5/lib64',
-#}
-#BRANCHES['comm-central']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
-#    'MOZ_OBJDIR': OBJDIR,
-#    'TINDERBOX_OUTPUT': '1',
-#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-#    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-#    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-#    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-#    'SYMBOL_SERVER_SSH_KEY': '/c/Documents and Settings/cltbld/.ssh/calbld_dsa',
-#    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
-#}
-#BRANCHES['comm-central']['platforms']['macosx64']['env'] = {'CVS_RSH': 'ssh',
-#    'MOZ_OBJDIR': OBJDIR,
-#    'TINDERBOX_OUTPUT': '1',
-#    'MOZ_CRASHREPORTER_NO_REPORT': '1',
-#    'DISABLE_LIGHTNING_INSTALL': '1',
-#    'SYMBOL_SERVER_HOST': SYMBOL_SERVER_HOST,
-#    'SYMBOL_SERVER_USER': SYMBOL_SERVER_USER,
-#    'SYMBOL_SERVER_PATH': SYMBOL_SERVER_PATH,
-#    'POST_SYMBOL_UPLOAD_CMD': SYMBOL_SERVER_POST_UPLOAD_CMD,
-#    'SYMBOL_SERVER_SSH_KEY': '/Users/calbld/.ssh/calbld_dsa',
-#    'LIGHTNING_UPDATE_LOCATION': LIGHTNING_UPDATE_LOCATION,
-#
-#    # See bug 758694
-#    'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
-#}
-# Release automation expect to find these
-STAGE_BASE_PATH=DEFAULTS['stage_base_path']
-COMPARE_LOCALES_TAG = 'RELEASE_AUTOMATION'
-
-if __name__ == "__main__":
-    import sys, pprint
-    args = sys.argv[1:]
-
-    if len(args) > 0:
-        branches = args
-    else:
-        branches = BRANCHES.keys()
-
-    for branch in branches:
-        print branch
-        pprint.pprint(BRANCHES[branch])
deleted file mode 100644
--- a/calendar/extensionfactory.py
+++ /dev/null
@@ -1,275 +0,0 @@
-from buildbot.steps.shell import ShellCommand, WithProperties, SetProperty
-from buildbotcustom.process.factory import BaseRepackFactory, CCBaseRepackFactory, identToProperties
-
-
-class BaseExtensionRepackFactory(BaseRepackFactory):
-
-    def __init__(self, platform, extensionPath, extensionName, enUSBinaryURL, objdir='',
-                 baseWorkDir='build', mozRepoPath='', mozconfig=None, configRepoPath=None,
-                 configSubDir=None, mozconfigBranch='default', mozillaDir='', env={}, **kwargs):
-
-        self.baseWorkDir = baseWorkDir
-        self.objdir = objdir
-        self.extensionPath = extensionPath
-        self.extensionName = extensionName
-        self.mozconfigBranch = mozconfigBranch
-        self.env = env
-        self.platform = platform
-
-        # This is needed for buildbot 0.7
-        if mozconfig and configSubDir and configRepoPath:
-            self.mozconfig = 'configs/%s/%s' % (configSubDir, mozconfig)
-            self.configRepoPath = configRepoPath
-            self.configRepo = self.getRepository(self.configRepoPath, kwargs['hgHost'])
-
-        self.env.update({'EN_US_BINARY_URL': enUSBinaryURL})
-        
-        # Set up postUploadCmd
-        self.setupPostUpload(**kwargs)  
-
-        # bb0.8: BaseRepackFactory.__init__(self, mozillaDir=mozillaDir, env=env, **kwargs)
-        BaseRepackFactory.__init__(self, mozillaDir=mozillaDir, **kwargs)
-
-
-    def getExtWorkDir(self):
-        return '%s/%s/%s/%s' % (self.baseWorkDir,
-                                self.origSrcDir,
-                                self.objdir,
-                                self.extensionPath)
-
-    def setupPostUpload(self, **kwargs):
-        assert 'project' in kwargs
-        assert 'repoPath' in kwargs
-        if 'branchName' in kwargs:
-          uploadDir = '%s-l10n/%s-xpi' % (kwargs['branchName'], self.platform)
-        else:
-          uploadDir = '%s-l10n/%s-xpi' % (self.getRepoName(kwargs['repoPath']), self.platform)
-
-        postUploadCmd = ['post_upload.py',
-                         '-p %s ' % kwargs['project'],
-                         '-b %s ' % uploadDir,
-                         '--nightly-dir=%s/nightly' % self.extensionName,
-                         '--buildid %(buildid)s',
-                         '--release-to-latest',
-                         '--release-to-dated',
-                         '--no-shortdir']
-
-        self.postUploadCmd = WithProperties(' '.join(postUploadCmd))
-        
-
-    def downloadBuilds(self):
-        # Call make wget-en-US, but in the extension directory
-        self.addStep(ShellCommand,
-            name='wget_enUS',
-            command=['make', 'wget-en-US'],
-            descriptionDone='wget en-US',
-            env=self.env,
-            haltOnFailure=True,
-            workdir=self.getExtWorkDir()
-        )
-
-    def updateEnUS(self):
-        # Call make unpack, but in the extension directory
-        self.addStep(ShellCommand,
-            name='make_unpack',
-            command=['make', 'unpack'],
-            haltOnFailure=True,
-            workdir=self.getExtWorkDir(),
-        )
-
-        # Extensions using this factory might want to to package a mock
-        # application.ini so that they can use printconfigsettings.py to read
-        # the ident properties easier.
-        self.addStep(SetProperty,
-         name='make_ident',
-         command=['make', 'ident'],
-         haltOnFailure=True,
-         extract_fn=identToProperties(),
-         workdir=self.getExtWorkDir()
-        )
-        self.addStep(ShellCommand,
-         name='update_to_packaged_rev',
-         command=['hg', 'update', '-r', WithProperties('%(moz_revision)s')],
-         haltOnFailure=True,
-         workdir='%s/%s' % (self.baseWorkDir, self.origSrcDir)
-        )
-
-    def doRepack(self):
-        # Let the extension repackage the l10n files
-        self.addStep(ShellCommand,
-            name='make_repack_l10n',
-            command=['sh','-c',
-                     WithProperties('make repack-l10n-%(locale)s')],
-            env=self.env,
-            haltOnFailure=True,
-            description=['make', 'repack-l10n-AB_CD'],
-            workdir=self.getExtWorkDir()
-        )
-
-    def doUpload(self):
-        # Call make l10n-upload-ab_CD, but in the extension directory
-        self.addStep(ShellCommand,
-            name='make_l10n_upload',
-            command=['make', WithProperties('l10n-upload-%(locale)s')],
-            env=self.uploadEnv,
-            workdir=self.getExtWorkDir(),
-            haltOnFailure=True,
-            flunkOnFailure=True
-        )
-
-    def updateSources(self):
-        self.addStep(ShellCommand,
-         name='update_locale_source',
-         command=['hg', 'up', '-C', '-r', self.l10nTag],
-         description='update workdir',
-         workdir=WithProperties('build/' + self.l10nRepoPath + '/%(locale)s'),
-         haltOnFailure=True
-        )
-        self.addStep(SetProperty,
-            command=['hg', 'ident', '-i'],
-            haltOnFailure=True,
-            property='l10n_revision',
-            workdir=WithProperties('build/' + self.l10nRepoPath +  '/%(locale)s')
-        )
-
-class CCBaseExtensionRepackFactory(BaseExtensionRepackFactory, CCBaseRepackFactory):
- 
-    # XXX Unfortunately the buildbot factory uses --enable-application=%(appName)
-    # appName needs to be calendar, but we want to build mail+calendar in the
-    # Lightning case. Adding this appends another --enable-application, which is
-    # taken since its the later argument.
-    # We must also add --enable-calendar as we're currently not getting the mozconfigs
-    # for repacks (which probably is the right, quicker thing to do as well).
-    extraConfigureArgs = ['--enable-application=mail']
-
-    def __init__(self, platform, extensionName, extensionPath, enUSBinaryURL, objdir='',
-                 baseWorkDir='build', mozRepoPath='', mozconfig=None, configRepoPath=None,
-                 configSubDir=None, env={}, **kwargs):
-
-        # Unfortunately we have to set these ourselves, python inheritance can
-        # be very annoying.
-        self.baseWorkDir = baseWorkDir
-        self.objdir = objdir
-        self.extensionName = extensionName
-        self.extensionPath = extensionPath
-        self.l10nTag = 'default'
-        self.mozRepoPath = mozRepoPath
-        self.env = env.copy()
-        self.platform = platform
-
-
-        self.setupPostUpload(**kwargs)
-
-        # Now initialize our base factories.
-        CCBaseRepackFactory.__init__(self,
-                                     baseWorkDir=baseWorkDir,
-                                     mozRepoPath=mozRepoPath, **kwargs)
-
-        BaseExtensionRepackFactory.__init__(self,
-                                        platform=platform,
-                                        extensionPath=extensionPath,
-                                        extensionName=extensionName,
-                                        enUSBinaryURL=enUSBinaryURL,
-                                        baseWorkDir=baseWorkDir,
-                                        mozRepoPath=mozRepoPath,
-                                        mozconfig=mozconfig,
-                                        configRepoPath=configRepoPath,
-                                        configSubDir=configSubDir,
-                                        mozillaDir='mozilla',
-                                        env=env,
-                                        **kwargs)
-
-    def getSources(self):
-        # Getting the sources should happen in the comm-central factory so that
-        # client.py can do its magic.
-        CCBaseRepackFactory.getSources(self);
-
-    def updateEnUS(self):
-        # Call make unpack, but in the extension directory
-        self.addStep(ShellCommand,
-            command=['make', 'unpack'],
-            haltOnFailure=True,
-            workdir=self.getExtWorkDir(),
-        )
-
-        # Extensions using this factory might want to to package a mock
-        # application.ini so that they can use printconfigsettings.py to read
-        # the ident properties easier.
-        self.addStep(SetProperty,
-         command=['make', 'ident'],
-         haltOnFailure=True,
-         extract_fn=identToProperties(),
-         workdir=self.getExtWorkDir()
-        )
-        self.addStep(ShellCommand,
-         command=['hg', 'update', '-r', WithProperties('%(comm_revision)s')],
-         haltOnFailure=True,
-         workdir='%s/%s' % (self.baseWorkDir, self.origSrcDir)
-        )
-        self.addStep(ShellCommand,
-         command=['hg', 'update', '-r', WithProperties('%(moz_revision)s')],
-         haltOnFailure=True,
-         workdir='%s/%s' % (self.baseWorkDir, self.mozillaSrcDir)
-        )
-
-class NightlyExtensionRepackFactory(BaseExtensionRepackFactory):
-    def __init__(self, **kwargs):
-
-        BaseExtensionRepackFactory.__init__(self, **kwargs)
-
-class CCNightlyExtensionRepackFactory(CCBaseExtensionRepackFactory):
-    def __init__(self,
-                  mozconfig=None, configRepoPath=None, configSubDir=None, mozconfigBranch='default',
-                  **kwargs):
-
-        # This is needed for buildbot 0.7
-        self.mozconfigBranch = mozconfigBranch
-        if mozconfig and configSubDir and configRepoPath:
-            self.mozconfig = 'configs/%s/%s' % (configSubDir, mozconfig)
-            self.configRepoPath = configRepoPath
-            self.configRepo = self.getRepository(self.configRepoPath, kwargs['hgHost'])
-        # end buildbot 0.7
-
-        CCBaseExtensionRepackFactory.__init__(self,
-                                              mozconfig=mozconfig,
-                                              configRepoPath=configRepoPath,
-                                              configSubDir=configSubDir,
-                                              **kwargs)
-
-    def getMozconfig(self):
-        if self.mozconfig:
-            self.addStep(ShellCommand(
-             name='rm_configs',
-             command=['rm', '-rf', 'configs'],
-             description=['remove', 'configs'],
-             workdir='build/'+self.origSrcDir,
-             haltOnFailure=True
-            ))
-            # Buildbot 0.7 requires this, later use MercurialCloneCommand
-            self.addStep(ShellCommand(
-             name='checkout_configs',
-             command=['hg', 'clone', self.configRepo, 'configs'],
-             description=['checkout', 'configs'],
-             workdir='build/'+self.origSrcDir,
-             haltOnFailure=True
-            ))
-            self.addStep(ShellCommand(
-             name='hg_update',
-             command=['hg', 'update', '-r', self.mozconfigBranch],
-             description=['updating', 'mozconfigs'],
-             workdir="build/%s/configs" % self.origSrcDir,
-             haltOnFailure=True
-            ))
-            self.addStep(ShellCommand(
-             # cp configs/mozilla2/$platform/$branchname/$type/mozconfig .mozconfig
-             name='copy_mozconfig',
-             command=['cp', self.mozconfig, '.mozconfig'],
-             description=['copy mozconfig'],
-             workdir='build/'+self.origSrcDir,
-             haltOnFailure=True
-            ))
-            self.addStep(ShellCommand,
-             name='cat_mozconfig',
-             command=['cat', '.mozconfig'],
-             workdir='build/'+self.origSrcDir
-            )
deleted file mode 100644
--- a/calendar/l10n-calendar-changesets
+++ /dev/null
@@ -1,16 +0,0 @@
-ca f85feec787ee
-cs d80e7fa186bd
-da 2ee323da7783
-de cee9aaea1cdb
-en-GB 740acfc6df78
-fi 3d74c9a61264
-fr 77dc508559ef
-fy-NL 7fcbe9fdd60d
-ga-IE f1b61da99424
-gd 92dcb67d3215
-it 08b8f34f34f3
-ja aa34db2d19f1
-ja-JP-mac c6337c097841
-lt f1c24d48fb64
-zh-CN bab90cec0e82
-zh-TW b37a393dccba
deleted file mode 100644
--- a/calendar/l10nbuilds.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[calendar10x]
-app = calendar
-type = hg
-locales = all
-mozilla = releases/comm-aurora
-l10n = releases/l10n/mozilla-aurora
-repo = https://hg.mozilla.org/
-l10nbase = https://hg.mozilla.org/releases/l10n/mozilla-aurora
-l10n.ini = calendar/locales/l10n.ini
-builders = MacOSX\ 10.6\ comm-aurora\ lightning\ l10n\ extension\ build Linux\ comm-aurora\ lightning\ l10n\ extension\ build WINNT\ 5.2\ comm-aurora\ lightning\ l10n\ extension\ build
-en_us_binary = https://ftp-ssl.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-aurora/
-
-[calendar11x]
-app = calendar
-type = hg
-locales = all
-mozilla = comm-central
-l10n = l10n-central
-repo = https://hg.mozilla.org/
-l10nbase = https://hg.mozilla.org/l10n-central
-l10n.ini = calendar/locales/l10n.ini
-builders = Linux\ comm-central\ lightning\ l10n\ extension\ build MacOSX\ 10.6\ comm-central\ lightning\ l10n\ extension\ build Linux\ x86_64\ comm-central\ lightning\ l10n\ extension\ build WINNT\ 5.2\ comm-central\ lightning\ l10n\ extension\ build
-en_us_binary = https://ftp-ssl.mozilla.org/pub/mozilla.org/calendar/lightning/nightly/latest-comm-central/
deleted file mode 100644
--- a/calendar/linux/comm-aurora/mozconfig-lightning
+++ /dev/null
@@ -1,31 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
deleted file mode 100644
--- a/calendar/linux/comm-aurora/release/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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
-ac_add_options --with-l10n-base=../../l10n
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
deleted file mode 100644
--- a/calendar/linux/comm-beta/mozconfig-lightning
+++ /dev/null
@@ -1,31 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
deleted file mode 100644
--- a/calendar/linux/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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
-ac_add_options --with-l10n-base=../../l10n
-
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
deleted file mode 100644
--- a/calendar/linux/comm-central/mozconfig-lightning
+++ /dev/null
@@ -1,30 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
deleted file mode 100644
--- a/calendar/linux/comm-esr17/mozconfig-lightning
+++ /dev/null
@@ -1,31 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
deleted file mode 100644
--- a/calendar/linux/comm-esr17/release/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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
-ac_add_options --with-l10n-base=../../l10n
-
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
deleted file mode 100644
--- a/calendar/linux/comm-release/mozconfig-lightning
+++ /dev/null
@@ -1,32 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
deleted file mode 100644
--- a/calendar/linux/comm-release/release/mozconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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
-ac_add_options --with-l10n-base=../../l10n
-
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-
-
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/linux64/comm-aurora/mozconfig-lightning
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
-
-# Temporary workaround for bug 800798
-ac_add_options --disable-webrtc
deleted file mode 100644
--- a/calendar/linux64/comm-aurora/release/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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
-ac_add_options --with-l10n-base=../../l10n
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
-
-# Temporary workaround for bug 800798
-ac_add_options --disable-webrtc
deleted file mode 100644
--- a/calendar/linux64/comm-beta/mozconfig-lightning
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
-
-# Temporary workaround for bug 800798
-ac_add_options --disable-webrtc
deleted file mode 100644
--- a/calendar/linux64/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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
-ac_add_options --with-l10n-base=../../l10n
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
-
-# Temporary workaround for bug 800798
-ac_add_options --disable-webrtc
deleted file mode 100644
--- a/calendar/linux64/comm-central/mozconfig-lightning
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
-
-# Temporary workaround for bug 800798
-ac_add_options --disable-webrtc
deleted file mode 100644
--- a/calendar/linux64/comm-esr17/mozconfig-lightning
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
-
-# Temporary workaround for bug 800798
-ac_add_options --disable-webrtc
deleted file mode 100644
--- a/calendar/linux64/comm-esr17/release/mozconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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
-ac_add_options --with-l10n-base=../../l10n
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
-
-# Temporary workaround for bug 800798
-ac_add_options --disable-webrtc
deleted file mode 100644
--- a/calendar/linux64/comm-release/mozconfig-lightning
+++ /dev/null
@@ -1,33 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
-
-# Temporary workaround for bug 794500
-ac_add_options --enable-gnomevfs
-ac_add_options --disable-gio
deleted file mode 100644
--- a/calendar/linux64/comm-release/release/mozconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-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
-ac_add_options --with-l10n-base=../../l10n
-
-CC=/tools/gcc-4.5/bin/gcc
-CXX=/tools/gcc-4.5/bin/g++
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-#Use ccache
-ac_add_options --with-ccache=/usr/bin/ccache
-
-# Enable parallel compiling
-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx/comm-aurora/mozconfig-lightning
+++ /dev/null
@@ -1,41 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig.common"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_VERSION=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --disable-tests
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx/comm-central/mozconfig-lightning
+++ /dev/null
@@ -1,42 +0,0 @@
-if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig.common"; then
-  # We need some hackery to deal with the mozilla/ build system calling this
-  # mozconfig.
-  oldtopsrcdir=$topsrcdir
-  export topsrcdir=$topsrcdir/mozilla
-fi
-
-mk_add_options MOZ_BUILD_PROJECTS="ppc i386"
-. $topsrcdir/build/macosx/universal/mozconfig.common
-export MOZ_PKG_VERSION=mac
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --disable-tests
-
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-debug-symbols="-gdwarf-2"
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx64/comm-aurora/mozconfig-lightning
+++ /dev/null
@@ -1,45 +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
-fi
-
-CC=/tools/clang/bin/clang
-CXX=/tools/clang/bin/clang++
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-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
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-#Use ccache
-#ac_add_options --with-ccache=/opt/local/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx64/comm-aurora/release/mozconfig
+++ /dev/null
@@ -1,46 +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
-fi
-
-CC=/tools/clang/bin/clang
-CXX=/tools/clang/bin/clang++
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --with-l10n-base=../../../l10n
-
-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
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-#Use ccache
-#ac_add_options --with-ccache=/opt/local/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx64/comm-beta/mozconfig-lightning
+++ /dev/null
@@ -1,45 +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
-fi
-
-CC=/tools/clang/bin/clang
-CXX=/tools/clang/bin/clang++
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-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
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-#Use ccache
-#ac_add_options --with-ccache=/opt/local/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx64/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,47 +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
-fi
-
-CC=/tools/clang/bin/clang
-CXX=/tools/clang/bin/clang++
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --with-l10n-base=../../../l10n
-
-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
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-#Use ccache
-# XXX temporary
-#ac_add_options --with-ccache=/opt/local/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx64/comm-central/mozconfig-lightning
+++ /dev/null
@@ -1,45 +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
-fi
-
-CC=/tools/clang/bin/clang
-CXX=/tools/clang/bin/clang++
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-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
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-#Use ccache
-#ac_add_options --with-ccache=/opt/local/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx64/comm-esr17/mozconfig-lightning
+++ /dev/null
@@ -1,46 +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
-fi
-
-CC=/tools/clang/bin/clang
-CXX=/tools/clang/bin/clang++
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-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
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-#Use ccache
-#ac_add_options --with-ccache=/opt/local/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx64/comm-esr17/release/mozconfig
+++ /dev/null
@@ -1,48 +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
-fi
-
-CC=/tools/clang/bin/clang
-CXX=/tools/clang/bin/clang++
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/providers/gdata/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --with-l10n-base=../../../l10n
-
-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
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-#Use ccache
-# XXX temporary
-#ac_add_options --with-ccache=/opt/local/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx64/comm-release/mozconfig-lightning
+++ /dev/null
@@ -1,43 +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
-fi
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-
-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
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-#Use ccache
-# XXX temporary
-#ac_add_options --with-ccache=/opt/local/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/macosx64/comm-release/release/mozconfig
+++ /dev/null
@@ -1,44 +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
-fi
-
-. $topsrcdir/build/macosx/universal/mozconfig
-
-if test -n $oldtopsrcdir; then
-  export topsrcdir=$oldtopsrcdir
-fi
-
-mk_add_options MOZ_POSTFLIGHT_ALL+=calendar/lightning/build/universal.mk
-
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --enable-tests
-ac_add_options --with-l10n-base=../../../l10n
-
-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
-
-# Don't try and install lightning - we just need to have it built for it to
-# be uploaded
-DISABLE_LIGHTNING_INSTALL=1
-
-#Use ccache
-# XXX temporary
-#ac_add_options --with-ccache=/opt/local/bin/ccache
-# Enable parallel compiling
-CONCURRENCY=$(( `sysctl hw.logicalcpu | awk {'print $2'}`  + 2 ))
-mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY"
deleted file mode 100644
--- a/calendar/master.cfg
+++ /dev/null
@@ -1,1033 +0,0 @@
-# -*- python -*-
-# ex: set syntax=python:
-
-# Shorthand
-c = BuildmasterConfig = {}
-
-####### BUILDSLAVES
-
-import BuildSlaves
-reload(BuildSlaves)
-c['slaves'] = BuildSlaves.SlaveList
-
-# 'slavePortnum' defines the TCP port to listen on. This must match the value
-# configured into the buildslaves (with their --master option)
-
-c['slavePortnum'] = 9030
-
-def getConfig(branch, value, default=None):
-    return branch.get(value, DEFAULTS.get(value, default))
-
-def getExtensionConfig(ebranch, branch, value, default=None):
-    return ebranch.get(value, branch.get(value, DEFAULTS.get(value, default)))
-
-# most of the config is in an external file
-import config
-reload(config)
-from config import *
-
-import os
-debug = os.environ.get('DEBUG')
-
-if debug:
-    import sys
-
-c['builders'] = []
-c['schedulers'] = []
-c['change_source'] = []
-c['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)
-
-from buildbot import locks
-from buildbot.process import factory
-from buildbot.scheduler import Scheduler, Nightly, Periodic, Triggerable, AnyBranchScheduler
-from buildbot.status.tinderbox import TinderboxMailNotifier
-from buildbot.status.words import IRC
-import buildbot.steps.source
-from buildbot.steps.source import Mercurial
-from buildbot.steps import trigger
-from buildbot.steps.shell import Compile, ShellCommand, WithProperties, SetProperty, TreeSize
-
-import buildbotcustom.changes.hgpoller
-import buildbotcustom.steps.misc
-import buildbotcustom.steps.test
-import buildbotcustom.steps.transfer
-import buildbotcustom.steps.updates
-#import buildbotcustom.status.tinderbox
-
-from buildbotcustom.steps.test import AliveTest, CompareBloatLogs, \
-  CompareLeakLogs
-
-import buildbotcustom.steps.misc
-reload(buildbotcustom.steps.misc)
-from buildbotcustom.steps.misc import SetMozillaBuildProperties, GetHgRevision, MozillaClobberer
-import buildbotcustom.steps.unittest as unittest_steps
-from buildbotcustom.steps.transfer import MozillaStageUpload
-from buildbotcustom.steps.updates import CreateCompleteUpdateSnippet
-
-import buildbotcustom.process.factory
-from buildbotcustom.process.factory import CCUnittestBuildFactory, CCNightlyRepackFactory
-
-import buildbotcustom.process.extensionfactory
-reload(buildbotcustom.process.extensionfactory)
-from buildbotcustom.process.extensionfactory import CCNightlyExtensionRepackFactory
-# l10n parallelization logic
-import buildbotcustom.log
-import buildbotcustom.l10n
-from buildbotcustom.l10n import NightlyL10n, Scheduler as SchedulerL10n
-
-import mozillaleak
-reload(mozillaleak)
-from mozillaleak import addLeakTestSteps
-
-import mozillabuild
-reload(mozillabuild)
-from mozillabuild import *
-
-# Keep track of our l10n pollers to eliminate dupes
-hg_all_locales_poller_map = {}
-
-####### L10n Scheduler with multiple dispatchers
-
-# for debugging purposes of the repack on locale change system
-buildbotcustom.log.init(
-    scheduler = buildbotcustom.log.DEBUG,
-    dispatcher = buildbotcustom.log.DEBUG
-)
-
-s = SchedulerL10n("l10n", "l10nbuilds.ini")
-c['schedulers'].append(s)
-
-####### SOURCES
-
-setupHGPollersFromBranches(DEFAULTS, BRANCHES, c['change_source'])
-
-for name in sorted(BRANCHES.keys()):
-    # shorthand 
-    branch = BRANCHES[name]
-    build_factory = getConfig(DEFAULTS, branch, 'factory')
-    mozilla_branch = getConfig(DEFAULTS, branch, 'mozilla_central_branch')
-    l10n = getConfig(DEFAULTS, branch,'l10n')
-    builders = []
-    nightlyBuilders = []
-    localeBuilders = []
-    allBuilders = []
-    
-    if debug:
-        print >> sys.stderr, "Branch: %s, Factory %s, L10n=%s" % (name, build_factory,l10n)
-
-    nightly = branch.get('nightly') != False
-    
-    product = branch.get('product', PRODUCT)
-    branch['product'] = product
-    appname=branch.get('appname', MOZ_APP_NAME)
-    branch['appname']= appname
-    brandname=getConfig(DEFAULTS, branch, 'brand_name')
-    product_name=getConfig(DEFAULTS, branch, 'product_name')
-    branch['brand_name'] = brandname
-
-    branch_name = getConfig(DEFAULTS, branch, 'branch_name')
-    nightly_hour = getConfig(DEFAULTS, branch, 'nightly_hour')
-    nightly_minute = getConfig(DEFAULTS, branch, 'nightly_minute')
-    
-    mozconfig=branch.get('mozconfig','mozconfig')
-    aus2_host = branch.get('aus2_host', AUS2_HOST)
-    aus2_user = branch.get('aus2_user', AUS2_USER)
-    download_base_url = branch.get('download_base_url', DOWNLOAD_BASE_URL)
-    stage_base_path = getConfig(DEFAULTS, branch, 'stage_base_path')
-    builder_type = getConfig(DEFAULTS, branch, 'builder_type')
-    
-    # generate a list of builders, nightly builders (names must be different)
-    # for easy access
-    for platform in branch['platforms'].keys():
-        platform_l10n = branch['platforms'][platform].get('l10n', l10n)
-        if debug: 
-            print >> sys.stderr, "Branch: %s Nightly: %s" % (name, nightly)
-        
-        builders.append('%s %s' % (branch['platforms'][platform]['base_name'], builder_type))
-        
-        # Not everybody wants nightlies
-        if nightly:
-            nightlyBuilders.append('%s nightly' % \
-                                    branch['platforms'][platform]['base_name'])
-        # Not everybody wants l10n repacks
-        if platform_l10n:
-            l10n_builder_name = "%s %s l10n" % (product_name, branch['platforms'][platform]['base_name'])
-            localeBuilders.append("%s" % (l10n_builder_name))
-            localeBuilders.append("%s build" % (l10n_builder_name))
-
-    allBuilders.extend(builders)
-    allBuilders.extend(nightlyBuilders)
-
-    error_parser = "unix"
-    if builder_type == "check" or builder_type == "bloat":
-        error_parser = "unittest"
-
-    # Currently, each branch goes to a different tree
-    # If this changes in the future this may have to be
-    # moved out of the loop
-    tinderbox_tree = getConfig(DEFAULTS, branch, 'tinderbox_tree')
-    c['status'].append(TinderboxMailNotifier(
-        fromaddr="calendar.buildbot@build.mozilla.org",
-        tree=tinderbox_tree,
-        extraRecipients=["<tinderbox-daemon@tinderbox.mozilla.org>", ],
-        relayhost="mail.build.mozilla.org",
-        builders=allBuilders,
-        logCompression="bzip2",
-        errorparser = error_parser, 
-    ))
-    if l10n:
-        # This notifies all l10n related build objects to Mozilla-l10n
-        c['status'].append(TinderboxMailNotifier(
-            fromaddr="calendar.buildbot@build.mozilla.org",
-            tree="Mozilla-l10n",
-            extraRecipients=["<tinderbox-daemon@tinderbox.mozilla.org>"],
-            relayhost="mail.build.mozilla.org",
-            logCompression="bzip2",
-            builders=localeBuilders,
-            binaryURL="%s/nightly/latest-%s-l10n/" % (download_base_url, branch_name),
-        ))
-        # We only want the builds from the specified builders
-        # since their builds have a build property called "locale"
-        c['status'].append(TinderboxMailNotifier(
-            fromaddr="calendar.buildbot@build.mozilla.org",
-            tree=WithProperties("Mozilla-l10n-%(locale)s"),
-            extraRecipients=["<tinderbox-daemon@tinderbox.mozilla.org>"],
-            relayhost="mail.build.mozilla.org",
-            logCompression="bzip2",
-            builders=localeBuilders,
-            binaryURL="%s/nightly/latest-%s-l10n/" % (download_base_url, branch_name),
-        ))
-        
-
-    if DEFAULTS['irc'] and branch.get('irc_nick') and branch.get('irc_channels'):
-        c['status'].append(IRC(
-            host='irc.mozilla.org',
-            nick=branch['irc_nick'],
-            channels=branch['irc_channels'],
-            categories=[name],
-        ))
-    
-    # Hg branch defaults to the branch name, or otherwise specified by hg_branch
-    hg_branch = branch.get('hg_branch',name)
-
-    # schedulers
-    # this one gets triggered by the HG Poller
-    add_poll_branches = getConfig(DEFAULTS, branch, 'add_poll_branches')
-    import sys
-    stable_timer = 5*60
-#   if name.find('bloat') > 0:
-#       stable_timer = 60*60*12 #XXX: Disable
-#       print >> sys.stderr, "Scheduler is %s" % name
-
-    c['schedulers'].append(AnyBranchScheduler(
-        name=name,
-        branches=[hg_branch, mozilla_branch] + add_poll_branches,
-        treeStableTimer=stable_timer,
-#        treeStableTimer=60*60*12, #XXX: Disable
-        builderNames=builders
-    ))
-    if debug:
-        print >> sys.stderr, "AnyBranchScheduler for %s watches %s" % (name, [hg_branch, mozilla_branch] + add_poll_branches)
-        print >> sys.stderr, "hg_branch=%s for %s" % (hg_branch, name)
-    print >> sys.stderr , "%s Nightly at %s:%s" % ( name, nightly_hour, nightly_minute)
-    c['schedulers'].append(Nightly(
-        name='%s nightly' % name,
-        branch=hg_branch,
-        hour=nightly_hour,
-        minute=nightly_minute, 
-        builderNames=nightlyBuilders
-    ))
-    if debug:
-        print >> sys.stderr, "Periodic(name=%s buildernames=%s branch=%s BHuildTimer=%s)" %(name, builders, hg_branch, getConfig(DEFAULTS, branch, 'period'))
-# No periodic schedulers necessary
-#    if hg_branch != 'comm-central' and hg_branch != 'releases/comm-beta':
-#        c['schedulers'].append(Periodic(
-#            name='%s periodic' % name,
-#            builderNames=builders,
-#            branch=hg_branch,
-#            periodicBuildTimer=getConfig(DEFAULTS, branch, 'period'),
-#        ))
-    if debug:
-        print >> sys.stderr, "L10n=%s for Name: %s" % (l10n, name)
-    if l10n:
-        # We need to make sure we don't create duplicate l10n pollers
-        poller_index = getConfig(DEFAULTS, branch, 'l10n_repo')
-        poller_key = "%s %s" % (HGURL, poller_index)
-        if not hg_all_locales_poller_map.get(poller_key):
-            hg_all_locales_poller = HgAllLocalesPoller(hgURL = HGURL,
-                            repositoryIndex =  poller_index,
-                            pollInterval = 5*60)
-            hg_all_locales_poller.parallelRequests = 1
-            c['change_source'].append(hg_all_locales_poller)
-            hg_all_locales_poller_map[poller_key]=1
-
-    for platform in branch['platforms'].keys():
-        # no need to have a whole new directory just for logs.
-        # let's put these in their non-debug counterpart
-        # translates to, eg:
-        #  /home/ftp/pub/calendar/sunbird/tinderbox-builds/comm-central-linux
-
-        #XXX: Kludge
-        realPlatform = platform.replace('-debug', '').replace('64', '')
-        realPlatform = realPlatform.replace('-10.5','')
-        realPlatform = realPlatform.replace('-10.6','')
-
-        logUploadDir = 'tinderbox-builds/%s-%s/' % (name, platform)
-
-        lockname = 'lock-%s-%s-dep' % (name, platform)
-        lock = locks.SlaveLock(lockname)
-
-        # shorthand
-        pf = branch['platforms'][platform]
-
-        # Milestone controls where things get uploaded on stage
-        milestone = pf.get('milestone',  branch.get('milestone', DEFAULTS.get('milestone', name)))
-        if debug:
-            print "Branch: %s Platform: %s Milestone: %s" % (name, platform, milestone)
-
-        upload_stage = pf.get('upload_stage', getConfig(DEFAULTS, branch, 'upload_stage'))
-        l10n = pf.get('l10n', getConfig(DEFAULTS, branch, 'l10n'))
-        build_space = pf.get('build_space', getConfig(DEFAULTS, branch, 'build_space'))
-
-        upload_glob = None
-        if branch.get('upload_glob'):
-            upload_glob="%s/%s" % (pf['platform_objdir'], branch['upload_glob'])
-        if pf.get('upload_glob'):
-            upload_glob="%s/%s" % (pf['platform_objdir'], pf['upload_glob'])
-
-        #Clobber support
-        clobber_url = getConfig(DEFAULTS, branch, 'clobber_url')
-        build_tools_repo = getConfig(DEFAULTS, branch, 'build_tools_repo')
-
-        if build_factory == 'CCUnittestBuildFactory':
-            client_py_args = getConfig(DEFAULTS, branch, 'client_py_args')
-            client_py_extra_args = getConfig(DEFAULTS, branch, 'client_py_extra_args')
-            mozmill = getConfig(DEFAULTS, branch, 'mozmill')
-            if mozmill and platform in ('linux'):
-		print >> sys.stderr, "Disabling enabled mozmill for %s" % platform
-                mozmill = False
-
-            if debug:
-                print >> sys.stderr, "CCUnittestBuildFactory!!"
-                print >> sys.stderr, "Builders are: %s" % builders
-            unittest_factory = CCUnittestBuildFactory(
-       		    branchName=branch_name,
-                    platform=platform,
-                    config_repo_path='build/buildbot-configs',
-                    config_dir=CONFIG_SUBDIR,
-                    objdir='objdir',
-                    productName=appname,
-                    brandName=brandname,
-                    client_py_extra_args=client_py_extra_args,
-                    mochitest_leak_threshold=None,
-                    mochichrome_leak_threshold=None,
-                    mochibrowser_leak_threshold=None,
-                    hgHost=HGHOST,
-                    repoPath=hg_branch,
-                    mozRepoPath=mozilla_branch,
-                    buildToolsRepoPath=build_tools_repo,
-                    buildSpace=build_space,
-                    clobberURL=clobber_url,
-                    clobberTime=30*24*7, #Hours before clobber
-                    buildsBeforeReboot=None,
-                    exec_reftest_suites=False,
-                    exec_mochi_suites=False,
-                    exec_mozmill_suites=mozmill,
-                )
-            
-            builder = {
-                'name': '%s %s' % (pf['base_name'], builder_type),
-                'slavenames': pf['slaves'],
-                'builddir': "%s-%s-%s" % (platform, branch_name, builder_type),
-                'factory': unittest_factory,
-                'category': name,
-            }
-            c['builders'].append(builder)
-            
-            continue
-
-        # The mozilla2_dep_factory currently covers: Depend, nightly and bloat
-        # builders.
-        mozilla2_dep_factory = factory.BuildFactory()
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command=['echo', WithProperties('Building on: %(slavename)s')],
-            env=pf['env']
-        ))
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command=['echo', 'TinderboxPrint:', WithProperties('s: %(slavename)s')]
-        ))
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command="rm -rfv %s/dist/%s-* %s/dist/install/sea/*.exe " %
-                     (pf['platform_objdir'],
-                      getConfig(DEFAULTS, branch, 'appname'),
-                      pf['platform_objdir']),
-                    
-            env=pf['env'],
-            description=['deleting', 'old', 'package'],
-            descriptionDone=['delete', 'old', 'package']
-        ))
-        
-        mozilla2_dep_factory.addStep(ShellCommand,
-         command=['rm', '-rf', 'tools'],
-         description=['clobber', 'build tools'],
-         workdir='.'
-        )
-        mozilla2_dep_factory.addStep(ShellCommand,
-         command=['bash', '-c',
-          'if [ ! -d tools ]; then hg clone %s%s; fi' % (HGURL, build_tools_repo)],
-         description=['clone', 'build tools'],
-         workdir='.',
-         flunkOnFailure=False,
-         haltOnFailure=False,
-        )
-
-        # We need the basename of the current working dir so we can
-        # ignore that dir when purging builds later.
-        mozilla2_dep_factory.addStep(SetProperty,
-         name='basename_pwd',
-         command=['bash', '-c', 'basename "$PWD"'],
-         property='builddir',
-         workdir='.'
-        )
-
-        if build_space > 0:
-            command = ['python', 'tools/buildfarm/maintenance/purge_builds.py',
-                 '-s', str(build_space)]
-
-            # Ignore the current dir also.
-            command.extend(["-n", WithProperties("%(builddir)s")])
-            command.append("..")
-
-            mozilla2_dep_factory.addStep(ShellCommand,
-             name='clean_old_builds',
-             command=command,
-             description=['cleaning', 'old', 'builds'],
-             descriptionDone=['clean', 'old', 'builds'],
-             haltOnFailure=True,
-             workdir='.',
-             timeout=3600, # One hour, because Windows is slow
-            )
-
-        clobberer_workdir = 'build/%s' % pf['platform_objdir']
-        
-        #XXX: This is a little brittle, assumes only objdir with ppc in them are 2-leveled     
-        import os.path
-        if platform.startswith("macosx") and clobberer_workdir.find('ppc') != -1:
-            clobberer_workdir = os.path.dirname(clobberer_workdir)
-        if platform.startswith("macosx") and clobberer_workdir.find('i386') != -1:
-            clobberer_workdir =  os.path.dirname(clobberer_workdir)
-        
-        mozilla2_dep_factory.addStep(MozillaClobberer,
-            branch=branch_name,
-            clobber_url=clobber_url,
-            clobberTime = 30*24*7, #Hours before clobber
-            clobberer_path=WithProperties('%s/tools/clobberer/clobberer.py', 'builddir'),
-            flunkOnFailure=False,
-            haltOnFailure=False,
-            timeout=3600, # One hour, because Windows is slow
-        )
-        #Clobber support end
-
-
-        mozilla2_dep_factory.addStep(Mercurial(
-            branchType='inrepo',
-            mode='update',
-            repourl="%s%s" % (HGURL, hg_branch),
-            alwaysUseLatest=True,
-            timeout=60*60,
-            retry=[60,3],
-            clobberOnBranchChange=False,
-        ))
-        changesetLink = '<a href=%s%s/rev' % (HGURL, hg_branch)
-        changesetLink += '/%(got_revision)s title="Built from revision %(got_revision)s">rev:%(got_revision)s</a>'
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command=['echo', 'TinderboxPrint:', WithProperties(changesetLink)]
-        ))
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command=['python', 'client.py' ] + branch['client_py_args'] + ['checkout'],
-            description=['running', 'client.py', 'checkout'],
-            descriptionDone=['python', 'client.py', 'checkout'],
-            haltOnFailure=True,
-            timeout=2*60*60,
-        ))
-        mozilla2_dep_factory.addStep(GetHgRevision(
-            workdir='build/mozilla'
-        ))
-        changesetLink = '<a href=%s%s/rev' % (HGURL, mozilla_branch)
-
-        link_tag = 'moz'
-        if mozilla_branch == 'mozilla-central':
-            link_tag = 'm-c'
-        changesetLink += '/%(hg_revision)s title="Built from Mozilla revision %(hg_revision)s">' + link_tag + ':%(hg_revision)s</a>'
-
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command=['echo', 'TinderboxPrint:', WithProperties(changesetLink)]
-        ))
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command=['rm', '-rfv', 'configs'],
-            description=['removing', 'configs'],
-            descriptionDone=['remove', 'configs'],
-            haltOnFailure=True
-        ))
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command=['hg', 'clone', CONFIG_REPO_URL, 'configs'],
-            description=['checking', 'out', 'configs'],
-            descriptionDone=['checkout', 'configs'],
-            haltOnFailure=True
-        ))
-        mozilla2_dep_factory.addStep(ShellCommand(
-            # cp configs/$subdir/$platform/$branchName/mozconfig .mozconfig
-            command=['cp', 'configs/%s/%s/%s/%s' % (CONFIG_SUBDIR,
-                                                 platform,
-                                                 branch_name,
-                                                 mozconfig
-                                                 ),
-                     '.mozconfig'],
-            description=['copying', 'mozconfig'],
-            descriptionDone=['copy', 'mozconfig'],
-            haltOnFailure=True
-        ))
-        mozilla2_dep_factory.addStep(ShellCommand(
-            command=['cat', '.mozconfig'],
-        ))
-
-        buildcmd = 'build'
-        mozilla2_dep_factory.addStep(Compile(
-            command=['make', '-f', 'client.mk', buildcmd],
-            env=pf['env'],
-            haltOnFailure=True,
-            timeout=60*60
-        ))
-
-        # TODO change to calendar, when we support leak tests
-        if branch.get('leak'):
-            addLeakTestSteps(mozilla2_dep_factory, branch, pf, platform, 'thunderbird', logUploadDir, DEFAULTS)
-
-        if platform.find('debug') == -1:
-            if branch['package']:
-                    mozilla2_dep_factory.addStep(ShellCommand(
-                        command=['make', 'package'],
-                        workdir='build/%s' % pf['platform_objdir'],
-                        haltOnFailure=True
-                    ))
-                    if platform.startswith("win32"):
-                        mozilla2_dep_factory.addStep(ShellCommand(
-                            command=['make', 'installer'],
-                            workdir='build/%s' % pf['platform_objdir'],
-                            haltOnFailure=True
-                        ))
-                    mozilla2_dep_factory.addStep(ShellCommand(
-                        command=['make', 'package-compare'],
-                        workdir='build/%s' % pf['platform_objdir'],
-                        haltOnFailure=False
-                    ))
-            mozilla2_dep_factory.addStep(SetMozillaBuildProperties(
-                objdir='build/%s/mozilla' % pf['platform_objdir']
-            ))
-            if upload_stage:
-                mozilla2_dep_factory.addStep(MozillaStageUpload(
-                    objdir='%s/mozilla' % pf['platform_objdir'],
-                    username=branch.get('stage_username',STAGE_USERNAME),
-                    milestone=milestone,
-                    remoteHost=branch.get('stage_server',STAGE_SERVER),
-                    remoteBasePath=stage_base_path,
-                    packageGlob=upload_glob,
-                    platform=realPlatform,
-                    group=branch.get('stage_group',STAGE_GROUP),
-                    sshKey=branch.get('stage_ssh_key',STAGE_SSH_KEY),
-                    releaseToLatest=False,
-                    releaseToDated=False,
-                    releaseToTinderboxBuilds=True,
-                    tinderboxBuildsDir='%s-%s' % (milestone, platform),
-                    dependToDated=True
-                ))
-            # XXX Hack to allow calendar to run xpcshell-tests
-            if platform.find("macosx") == -1:
-                mozilla2_dep_factory.addStep(unittest_steps.MozillaCheck,
-                                             test_name="xpcshell-tests",
-                                             warnOnWarnings=True,
-                                             workdir="build/%s/calendar/test" % pf['platform_objdir'],
-                                             timeout=5*60, # 5 minutes.
-                                             )
-
-        mozilla2_dep_builder = {
-            'name': '%s %s' % (pf['base_name'], builder_type),
-            'slavenames': pf['slaves'],
-            'builddir': '%s-%s' % (DEFAULTS['hg_rev_shortnames'][name], platform),
-            'factory': mozilla2_dep_factory,
-            'category': name,
-            'locks' : [lock],
-        }
-        c['builders'].append(mozilla2_dep_builder)
-
-        lockname = 'lock-%s-%s-nightly' % (name, platform)
-        lock = locks.SlaveLock(lockname)
-
-        mozilla2_nightly_factory = factory.BuildFactory()
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['echo', WithProperties('Building on: %(slavename)s')],
-        ))
-        mozilla2_nightly_factory.addStep(ShellCommand(
-          command=['echo', 'TinderboxPrint:', WithProperties('s: %(slavename)s')]
-        ))
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['find', '.', '-maxdepth', '2', '-mtime', '+7', '-exec',
-                     'rm', '-rfv', '{}', ';'],
-            env=pf['env'],
-            workdir='.',
-            description=['cleanup', 'old', 'symbols'],
-            flunkOnFailure=False,
-        ))
-
-        mozilla2_nightly_factory.addStep(SetProperty,
-         name='basename_pwd',
-         command=['bash', '-c', 'basename "$PWD"'],
-         property='builddir',
-         workdir='.'
-        )
-
-        mozilla2_nightly_factory.addStep(ShellCommand,
-         command=['rm', '-rf', 'tools'],
-         description=['clobber', 'build tools'],
-         workdir='.'
-        )
-        mozilla2_nightly_factory.addStep(ShellCommand,
-         command=['bash', '-c',
-          'if [ ! -d tools ]; then hg clone %s%s; fi' % (HGURL, build_tools_repo)],
-         description=['clone', 'build tools'],
-         workdir='.',
-         flunkOnFailure=False,
-         haltOnFailure=False,
-        )
-
-        if build_space > 0:
-            command = ['python', 'tools/buildfarm/maintenance/purge_builds.py',
-                 '-s', str(build_space)]
-
-            # Ignore the current dir also.
-            command.extend(["-n", WithProperties("%(builddir)s")])
-            command.append("..")
-
-            mozilla2_nightly_factory.addStep(ShellCommand,
-             name='clean_old_builds',
-             command=command,
-             description=['cleaning', 'old', 'builds'],
-             descriptionDone=['clean', 'old', 'builds'],
-             haltOnFailure=True,
-             workdir='.',
-             timeout=3600, # One hour, because Windows is slow
-            )
-
-        mozilla2_nightly_factory.addStep(Mercurial(
-            branchType='inrepo',
-            mode='clobber',
-            repourl="%s%s" % (HGURL, hg_branch),
-            timeout=60*60,
-            retry=[60,3],
-        ))
-        changesetLink = '<a href=%s%s/rev' % (HGURL, hg_branch)
-        changesetLink += '/%(got_revision)s title="Built from revision %(got_revision)s">rev:%(got_revision)s</a>'
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['echo', 'TinderboxPrint:', WithProperties(changesetLink)]
-        ))
-        client_py_args = branch['client_py_args']
-        if branch.get('nightly_client_py_args'):
-            client_py_args = client_py_args + branch['nightly_client_py_args']
-            import sys
-            print >> sys.stderr, "client_py_args will be : %s" % client_py_args
-
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['python', 'client.py'] + client_py_args + ['checkout'],
-            description=['running', 'client.py', 'checkout'],
-            descriptionDone=['client.py', 'checkout'],
-            haltOnFailure=True,
-            timeout=2*60*60,
-        ))
-        mozilla2_nightly_factory.addStep(GetHgRevision(
-            workdir='build/mozilla'
-        ))
-        changesetLink = '<a href=%s%s/rev' % (HGURL, mozilla_branch)
-        changesetLink += '/%(hg_revision)s title="Built from Mozilla revision %(hg_revision)s">moz:%(hg_revision)s</a>'
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['echo', 'TinderboxPrint:', WithProperties(changesetLink)]
-        ))
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['rm', '-rfv', 'configs'],
-            description=['removing', 'configs'],
-            descriptionDone=['remove', 'configs'],
-            haltOnFailure=True
-        ))
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['hg', 'clone', CONFIG_REPO_URL, 'configs'],
-            description=['checking', 'out', 'configs'],
-            descriptionDone=['checkout', 'configs'],
-            haltOnFailure=True
-        ))
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            # cp configs/$subdir/$platform/mozconfig .mozconfig
-            command=['cp', 'configs/%s/%s/%s/%s' % (CONFIG_SUBDIR,
-                                                 platform,
-                                                 branch_name,
-                                                 mozconfig
-                                                 ),
-                     '.mozconfig'],
-            description=['copying', 'mozconfig'],
-            descriptionDone=['copy', 'mozconfig'],
-            haltOnFailure=True
-        ))
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['cat', '.mozconfig'],
-        ))
-
-        buildcmd = 'build'
-        mozilla2_nightly_factory.addStep(Compile(
-            command=['make', '-f', 'client.mk', buildcmd],
-            env=pf['env'],
-            haltOnFailure=True,
-            timeout=60*60
-        ))
-        if pf['upload_symbols']:
-            mozilla2_nightly_factory.addStep(ShellCommand(
-                command=['make', 'buildsymbols'],
-                env=pf['env'],
-                workdir='build/%s/calendar/lightning' % pf['platform_objdir'],
-                haltOnFailure=True,
-                timeout=60*60,
-            ))
-        if branch['package']:
-                mozilla2_nightly_factory.addStep(ShellCommand(
-                    command=['make', 'package'],
-                    workdir='build/%s' % pf['platform_objdir'],
-                    haltOnFailure=True
-                ))
-                if platform.startswith("win32"):
-                    mozilla2_nightly_factory.addStep(ShellCommand(
-                        command=['make', 'installer'],
-                        workdir='build/%s' % pf['platform_objdir'],
-                        haltOnFailure=True
-                    ))
-                mozilla2_nightly_factory.addStep(ShellCommand(
-                        command=['make', 'package-compare'],
-                        workdir='build/%s' % pf['platform_objdir'],
-                        haltOnFailure=False
-                    ))
-                mozilla2_nightly_factory.addStep(ShellCommand(
-                    command=['make', '-C',
-                             '%s/mozilla/tools/update-packaging' % pf['platform_objdir']],
-                    description=['create', 'complete', 'update'],
-                    haltOnFailure=True
-                ))
-        mozilla2_nightly_factory.addStep(SetMozillaBuildProperties(
-                objdir='build/%s/mozilla' % pf['platform_objdir']
-        ))
-        if upload_stage:
-            mozilla2_nightly_factory.addStep(MozillaStageUpload(
-                    objdir='%s/mozilla' % pf['platform_objdir'],
-                    username=branch.get('stage_username',STAGE_USERNAME),
-                    milestone=milestone,
-                    remoteHost=branch.get('stage_server',STAGE_SERVER),
-                    remoteBasePath=stage_base_path,
-                    packageGlob=upload_glob,
-                    platform=realPlatform,
-                    group=branch.get('stage_group',STAGE_GROUP),
-                    sshKey=branch.get('stage_ssh_key',STAGE_SSH_KEY),
-                    releaseToDated=True,
-                    releaseToLatest=True,
-                    releaseToTinderboxBuilds=True,
-                    uploadCompleteMar=branch.get('upload_complete_mar', True),
-                    tinderboxBuildsDir='%s-%s' % (milestone, platform),
-                    dependToDated=True
-            ))
-
-        create_snippet = pf.get('create_snippet', branch['create_snippet'])
-        aus = getConfig(DEFAULTS, branch, 'aus')
-
-        if create_snippet:
-            mozilla2_nightly_factory.addStep(CreateCompleteUpdateSnippet(
-                objdir='build/%s/mozilla' % pf['platform_objdir'],
-                milestone=milestone,
-                baseurl='%s/nightly' % download_base_url,
-            ))
-	    # New style aus configuration
-            if aus:
-                uploadUpdateSnippet(mozilla2_nightly_factory, aus, pf)
-    
-        if pf['upload_symbols']:
-            mozilla2_nightly_factory.addStep(ShellCommand(
-                command=['make', 'uploadsymbols'],
-                env=pf['env'],
-                workdir='build/%s/calendar/lightning' % pf['platform_objdir'],
-                haltOnFailure=True
-            ))
-        if l10n:
-           l10n_scheduler="%s %s %s l10n nightly scheduler" % (product_name, platform, branch_name)
-           mozilla2_nightly_factory.addStep(trigger.Trigger(
-               schedulerNames=[l10n_scheduler],
-               waitForFinish=False,
-               flunkOnFailure=False,
-               haltOnFailure=False,
-            ))
-
-        # XXX Ugh, why do we have to do this in the middle of so many other steps?
-        if 'extensions' in branch:
-            l10n_ext_schedulers = []
-            for extensionName in branch['extensions'].keys():
-                extension = branch['extensions'][extensionName]
-                l10n_ext_schedulers.append('%s %s l10n extension nightly scheduler' % (platform, branch_name))
-
-            mozilla2_nightly_factory.addStep(trigger.Trigger(
-               name='trigger_extension_repacks',
-               schedulerNames=l10n_ext_schedulers,
-               waitForFinish=False,
-               flunkOnFailure=False,
-               haltOnFailure=False,
-            ))
-
-                    
-                
-
-        # in order to save disk space we clobber 'build' at the end.
-        # we don't want to clobber anything else though, because symbols
-        # sit alongside
-        mozilla2_nightly_factory.addStep(ShellCommand(
-            command=['rm', '-rfv', 'build'],
-            env=pf['env'],
-            workdir='.'
-        ))
-        nightly_builder = pf.get('nightly_builder',  branch.get('nightly_builder', DEFAULTS.get('nightly_builder')))
-        import sys
-        nightly_slaves = pf['slaves']
-        if nightly_builder:
-            print >> sys.stderr, "%s nightly builder override: %s" % (pf['base_name'], nightly_builder)
-            nightly_slaves = nightly_builder
-
-        mozilla2_nightly_builder = {
-            'name': '%s nightly' % pf['base_name'],
-            'slavenames': nightly_slaves,
-            'builddir': '%s-%s-nightly' % (DEFAULTS['hg_rev_shortnames'][name], platform),
-            'factory': mozilla2_nightly_factory,
-            'category': name,
-            'locks': [lock],
-        }
-        if nightly:
-            c['builders'].append(mozilla2_nightly_builder)
-
-        if l10n:
-            l10n_nightly_updates = pf.get('l10n_nightly_updates',  branch.get('l10n_nightly_updates', DEFAULTS.get('l10n_nightly_updates', name)))
-            l10n_dated_dirs = False
-            if l10n_nightly_updates:
-                l10n_dated_dirs = True
-            print >> sys.stderr, "branchName: %s, repoPath: %s" % (branch_name, hg_branch)
-            mozilla2_l10n_repack_factory = CCNightlyRepackFactory(
-                    nightly=True,
-                    hgHost='hg.mozilla.org',
-                    tree=getConfig(DEFAULTS, branch, 'l10n_tree'),
-                    project=branch.get('stage_project',appname),
-                    appName=product,
-                    enUSBinaryURL='%s/nightly/latest-%s/' % (download_base_url, milestone),
-                    downloadBaseURL=download_base_url,
-                    stageServer=branch.get('stage_server',STAGE_SERVER),
-                    stageUsername=branch.get('stage_username',STAGE_USERNAME),
-                    stageSshKey=branch.get('stage_ssh_key',STAGE_SSH_KEY),
-                    ausBaseUploadDir=aus['base_upload_dir'],
-                    ausUser=aus['user'],
-                    ausHost=aus['host'],
-                    updatePlatform=pf['update_platform'],
-                    branchName=branch_name,
-                    repoPath=hg_branch,
-                    mozRepoPath=mozilla_branch,
-                    l10nRepoPath=getConfig(DEFAULTS, branch, 'l10n_repo'),
-                    l10nNightlyUpdate=l10n_nightly_updates,
-                    l10nDatedDirs=l10n_dated_dirs,
-                    buildToolsRepoPath='build/tools',
-                    compareLocalesRepoPath='build/compare-locales',
-                    compareLocalesTag='RELEASE_AUTOMATION',
-                    buildSpace=build_space,
-                    clobberURL=clobber_url,
-                    clobberTime=30*24*7, #Hours before clobber
-            )
-
-            mozilla2_l10n_repack_builder = {
-                'name': '%s %s l10n' % (product_name, pf['base_name']),
-                'slavenames': pf['slaves'],
-                'builddir': '%s-%s-l10n-full' % (DEFAULTS['hg_rev_shortnames'][name], platform),
-                'factory': mozilla2_l10n_repack_factory,
-                'category': '%s-l10n' % name,
-            }
-            c['builders'].append(mozilla2_l10n_repack_builder)
-            c['schedulers'].append(NightlyL10n(
-                                   name='%s %s %s l10n nightly scheduler' % (product_name, platform, branch_name),
-                                   platform=realPlatform,
-                                   tree=getConfig(DEFAULTS, branch, 'l10n_tree'),
-                                   hour=[7],
-                                   builderNames=[ '%s %s l10n' % (product_name, pf['base_name']) ],
-                                   repoType='hg',
-                                   branch=hg_branch,
-                                   baseTag='default',
-                                   localesFile='%s/locales/all-locales' % product,
-                                  )) 
-
-            mozilla2_l10n_repack_dep_factory = CCNightlyRepackFactory(
-                    hgHost='hg.mozilla.org',
-                    tree=getConfig(DEFAULTS, branch, 'l10n_tree'),
-                    project=branch.get('stage_project',appname),
-                    appName=product,
-                    nightly=False, 
-                    enUSBinaryURL='%s/nightly/latest-%s/' % (download_base_url, milestone), 
-                    stageServer=branch.get('stage_server',STAGE_SERVER),
-                    stageUsername=branch.get('stage_username',STAGE_USERNAME),
-                    stageSshKey=branch.get('stage_ssh_key',STAGE_SSH_KEY),
-                    branchName=branch_name,
-                    repoPath=hg_branch,
-                    mozRepoPath=mozilla_branch,
-                    l10nRepoPath=getConfig(DEFAULTS, branch, 'l10n_repo'),
-                    buildToolsRepoPath='build/tools',
-                    compareLocalesRepoPath='build/compare-locales',
-                    compareLocalesTag='RELEASE_AUTOMATION',
-                    buildSpace=build_space,
-                    clobberURL=clobber_url,
-                    clobberTime=30*24*7, #Hours before clobber
-            )
-            mozilla2_l10n_repack_dep_builder = {
-                'name': '%s %s l10n build' % (product_name, pf['base_name']),
-                'slavenames': pf['slaves'],
-                'builddir': '%s-%s-l10n-dep' % (DEFAULTS['hg_rev_shortnames'][name], platform),
-                'factory': mozilla2_l10n_repack_dep_factory,
-                'category': '%s-l10n' % name,
-            }
-            c['builders'].append(mozilla2_l10n_repack_dep_builder)
-
-        if 'extensions' in branch:
-            for extensionName in branch['extensions'].keys():
-                extension = branch['extensions'][extensionName]
-                ext_base_url = getExtensionConfig(extension, DEFAULTS, 'download_base_url')
-
-                if extension.get('l10n'):
-                    binaryURL = extension.get('enUSBinaryURL',
-                                              '%s/nightly/latest-%s/' %
-                                                (ext_base_url, milestone))
-                    ext_repack_factory = CCNightlyExtensionRepackFactory(
-                        hgHost='hg.mozilla.org',
-                        tree=getConfig(DEFAULTS, branch, 'l10n_tree'),
-                        project=branch.get('stage_project',appname),
-                        appName=appname,
-                        extensionName=extensionName,
-                        extensionPath=extension.get('subdir'),
-                        enUSBinaryURL=binaryURL, 
-                        stageServer=branch.get('stage_server',STAGE_SERVER),
-                        stageUsername=branch.get('stage_username',STAGE_USERNAME),
-                        stageSshKey=branch.get('stage_ssh_key',STAGE_SSH_KEY),
-                        branchName=branch_name,
-                        configRepoPath=CONFIG_REPO_PATH,
-                        configSubDir=appname,
-                        platform=platform,
-                        mozconfig='%s/%s/%s' % (platform,
-                                                branch_name,
-                                                 mozconfig),
-                        env={},
-                        repoPath=hg_branch,
-                        mozRepoPath=mozilla_branch,
-                        l10nRepoPath=getConfig(DEFAULTS, branch, 'l10n_repo'),
-                        buildToolsRepoPath='build/tools',
-                        compareLocalesRepoPath='build/compare-locales',
-                        compareLocalesTag='RELEASE_AUTOMATION',
-                        buildSpace=build_space,
-                        clobberURL=clobber_url,
-                        clobberTime=30*24*7, #Hours before clobber
-                    )   
-                    c['builders'].append({
-                        'name': '%s l10n extension build' % pf['base_name'],
-                        'slavenames': pf['slaves'],
-                        'builddir': '%s-%s-l10n-ext' % (DEFAULTS['hg_rev_shortnames'][name], platform),
-                        'factory': ext_repack_factory,
-                        'category': '%s-l10n' % name,
-                    })  
-                c['schedulers'].append(NightlyL10n(
-                                   name='%s %s l10n extension nightly scheduler' % (platform, branch_name),
-                                   platform=realPlatform,
-                                   tree=getConfig(DEFAULTS, branch, 'l10n_tree'),
-                                   builderNames=['%s l10n extension build' % pf['base_name']],
-                                   repoType='hg',
-                                   branch=hg_branch,
-                                   baseTag='default',
-                                   localesFile='%s/locales/all-locales' % product,
-                                  ))
-
-         
-
-
-
-####### STATUS TARGETS
-
-from buildbot.status import html
-
-baseport=8031
-
-c['status'].append(html.WebStatus(
-    http_port=baseport, allowForce=True,
-))
-
-c['status'].append(html.WebStatus(
-    http_port=8032, allowForce=False,
-))
-
-####### 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'] = "Calendar"
-c['buildbotURL'] = "https://calendar-master.mozillalabs.com"
-
-
-#XXX
-#c['schedulers'] = []
-
-def mergeRequests(builder, req1, req2):
-    import copy
-    r1 = copy.copy(req1.source)
-    r2 = copy.copy(req2.source)
-    import sys
-    print >> sys.stderr, "XXX: mergeRequests(%s,%s,%s)" % (builder, r1, r2)
-    print >> sys.stderr, "XXX: r1.branch=%s r2.branch=%s" % (r1.branch, r2.branch)
- #   r1.branch = r2.branch 
- #   print >> sys.stderr, "XXX: making both branches be %s" % r1.branch
-    rv = r1.canBeMergedWith(r2)
-    print >> sys.stderr, "XXX: mergeRequests rv=%s" % rv
-    #XXX: Busted, buildbot re-checks canBeMergedWith and asserts, so can't merge effectively
-    #XXX: what buildbot thinks are non-mergeable requests, grr.
-    return rv
-
-##c['mergeRequests'] = mergeRequests
-
- # Give certain builders priority over other builders                                                                                                    
-def prioritizeBuilders(botmaster, builders):
-    def sortkey(builder):
-        priority = 0
-
-        #Release above everything else
-        if builder.builder_status.category == 'release':
-            priority += 4
-
-        #Nightly above most
-        if builder.name.find('nightly') > 1:
-            priority += 2
-
-        return -priority, builder.getOldestRequestTime()
-
-    builders.sort(key=sortkey)
-
-    return builders
-c['prioritizeBuilders'] = prioritizeBuilders
deleted file mode 100644
--- a/calendar/mozillabuild.py
+++ /dev/null
@@ -1,61 +0,0 @@
-def getConfig(defaults, branch, value, default=None):
-    return branch.get(value, defaults.get(value, default))
-
-import buildbotcustom.changes.hgpoller
-from buildbotcustom.changes.hgpoller import HgAllLocalesPoller, HgPoller
-
-def setupHGPollersFromBranches(defaults, branches, change_source):
-    # Figure out the unique pushlogs we should be polling
-    
-    sources = {}
-    l10n = False 
-    for name in branches.keys():
-        branch = branches[name]
-        hgurl = getConfig(defaults, branch, 'hgurl')
-        if getConfig(defaults, branch, 'l10n'):
-            l10n = True
-        
-        #Make sure the hg url doesn't have a trailing '/', we'll be adding one
-        if hgurl[-1:] == '/':
-            hgurl = hgurl[:-1]
-        poll_branch = getConfig(defaults, branch, 'hg_branch')
-        for b in [poll_branch] + [getConfig(defaults, branch, 'mozilla_central_branch')] + getConfig(defaults, branch, 'add_poll_branches'):
-            pushlogUrlOverride = '%s/%s/pushlog' % (hgurl, b),
-            if not sources.get(b):
-                sources[b] = pushlogUrlOverride
-
-    for branch in sorted(sources.keys()):
-        change_source.append(HgPoller(
-            hgURL="%s/" % hgurl,
-            pushlogUrlOverride="%s/%s/pushlog" % (hgurl,branch),
-            branch=branch,
-            pollInterval=1*60
-        ))
-        
-from buildbot.steps.shell import ShellCommand, WithProperties
-def uploadUpdateSnippet(f, aus, platform):
-    full_upload_dir = '%s/%s/%%(buildid)s/en-US' % \
-        ( aus['base_upload_dir'],
-          platform['update_platform'])
-
-    f.addStep(ShellCommand(
-        name='create aus2 upload dir',
-        command=['ssh', '-l', aus['user'], aus['host'],
-             WithProperties('mkdir -p %s' % full_upload_dir)],
-        description=['create', 'aus2', 'upload', 'dir'],
-        haltOnFailure=False,
-        flunkOnFailure=False,
-    ))
-
-    f.addStep(ShellCommand(
-        name='upload complete snippet',
-        command=['scp', '-o', 'User=%s' % aus['user'],
-             'dist/update/complete.update.snippet',
-             WithProperties('%s:%s/complete.txt' % \
-               (aus['host'], full_upload_dir))],
-        workdir='build/%s/mozilla' % platform['platform_objdir'],
-        description=['upload', 'complete', 'snippet'],
-        haltOnFailure=False,
-        flunkOnFailure=False,
-    ))
-    
deleted file mode 100644
--- a/calendar/mozillaleak.py
+++ /dev/null
@@ -1,232 +0,0 @@
-from buildbot.steps.shell import Compile, ShellCommand
-
-import os.path
-
-import buildbotcustom.steps.misc
-import buildbotcustom.steps.test
-import buildbotcustom.steps.transfer
-import buildbotcustom.steps.updates
-
-from buildbotcustom.steps.misc import SetMozillaBuildProperties
-from buildbotcustom.steps.test import AliveTest, CompareBloatLogs, \
-  CompareLeakLogs, GraphServerPost
-from buildbotcustom.steps.transfer import MozillaStageUpload
-from buildbotcustom.steps.updates import CreateCompleteUpdateSnippet
-
-from buildbot.steps.shell import SetProperty, WithProperties
-
-GRAPH_SERVER = 'graphs.mozilla.org'
-GRAPH_SELECTOR = '/server/collect.cgi'
-GRAPH_BRANCH = 'comm-central'
-
-def addLeakTestSteps(self,branch,platform,platformName,productName, logUploadDir, defaults):
-        # we want the same thing run a few times here, with different
-        # extraArgs
-        env = platform['env']
-        objdir = platform['platform_objdir']
-
-        self.graphSelector = GRAPH_SELECTOR
-        self.graphServer   = GRAPH_SERVER
-        self.graphBranch   = GRAPH_BRANCH
-        self.baseName      = platform['base_name']
-        
-        if platformName.startswith("win32"):
-            moz_objdir = "%s\\mozilla" % objdir
-        else:
-            moz_objdir = "%s/mozilla" % objdir
-        
-        self.addStep(ShellCommand,
-         command=['make', 'buildsymbols'],
-         env=env,
-         workdir='build/%s' % objdir,
-         haltOnFailure=True,
-         timeout=60*60,
-        )
-
-        self.addStep(SetProperty,
-         command=['bash', '-c', 'pwd'],
-         property='toolsdir',
-         workdir='tools'
-        )
-
-        platform_minidump_path = {
-            'linux': WithProperties('%(toolsdir:-)s/breakpad/linux/minidump_stackwalk'),
-            'win32': WithProperties('%(toolsdir:-)s/breakpad/win32/minidump_stackwalk.exe'),
-            'macosx': WithProperties('%(toolsdir:-)s/breakpad/osx/minidump_stackwalk'),
-            }
-
-        env['MINIDUMP_STACKWALK'] = platform_minidump_path[platformName]
-
-        leak_threshold = platform.get('leak_threshold', branch.get('leak_threshold', 7261838))
-        self.addStep(ShellCommand,
-            command=['make', 'mailbloat'],
-            env=env,
-            workdir='build/%s' % objdir,
-            warnOnFailure=True,
-            haltOnFailure=True,
-            flunkOnFailure=False,
-        )
-        self.addStep(ShellCommand,
-         name='get_bloat_log',
-         env=env,
-         workdir='.',
-         command=['wget', '-O', 'bloat.log.old',
-                  'http://%s/pub/mozilla.org/%s/%s/bloat.log' % \
-                    (branch.get('stage_server',defaults.get('stage_server')), productName, logUploadDir)],
-         warnOnFailure=True,
-         flunkOnFailure=False
-        )
-        self.addStep(ShellCommand,
-         name='mv_bloat_log',
-         env=env,
-         command=['mv', '%s/bloat.log' % objdir,
-                  '../bloat.log'],
-        )
-        self.addStep(ShellCommand,
-         name='upload_bloat_log',
-         env=env,
-         command=['scp', '-o', 'User=%s' % platform.get('stage_username',branch.get('stage_username',defaults.get('stage_username'))),
-                  '-o', 'IdentityFile=~/.ssh/%s' % platform.get('stage_ssh_key',branch.get('stage_ssh_key',defaults.get('stage_ssh_key'))),
-                  '../bloat.log',
-                  '%s:%s/%s' % (branch.get('stage_server',defaults.get('stage_server')), platform.get('stage_base_path',branch.get('stage_base_path',defaults.get('stage_base_path'))),
-                                logUploadDir)]
-        )
-        self.addStep(CompareBloatLogs,
-         name='compare_bloat_log',
-         bloatLog='bloat.log',
-         mozillaDir="/mozilla",
-         env=env,
-         testnameprefix='Mail',
-         testname='Mail',
-         workdir='.',
-         warnOnFailure=True,
-         haltOnFailure=False,
-        )
-
-        self.addStep(SetProperty,
-          command=['python', 'build/mozilla/config/printconfigsetting.py',
-          'build/objdir-tb/mozilla/dist/bin/application.ini',
-          'App', 'BuildID'],
-          property='buildid',
-          workdir='.',
-          description=['getting', 'buildid'],
-          descriptionDone=['got', 'buildid']
-        )
-        self.addStep(SetProperty,
-          command=['python', 'build/mozilla/config/printconfigsetting.py',
-          'build/objdir-tb/mozilla/dist/bin/application.ini',
-          'App', 'SourceStamp'],
-          property='sourcestamp',
-          workdir='.',
-          description=['getting', 'sourcestamp'],
-          descriptionDone=['got', 'sourcestamp']
-        )
-
-#        self.addStep(GraphServerPost,
-#         server=self.graphServer,
-#         selector=self.graphSelector,
-#         branch=self.graphBranch,
-#         resultsname=self.baseName,
-#        )
-        self.addStep(ShellCommand,
-         name='get_malloc_log',
-         env=env,
-         workdir='.',
-         command=['wget', '-O', 'malloc.log.old',
-                  'http://%s/pub/mozilla.org/%s/%s/malloc.log' % \
-                    (branch.get('stage_server',defaults.get('stage_server')), productName, logUploadDir)]
-        )
-        self.addStep(ShellCommand,
-         name='get_sdleak_log',
-         env=env,
-         workdir='.',
-         command=['wget', '-O', 'sdleak.tree.old',
-                  'http://%s/pub/mozilla.org/%s/%s/sdleak.tree' % \
-                    (branch.get('stage_server',defaults.get('stage_server')), productName, logUploadDir)]
-        )
-        self.addStep(ShellCommand,
-         name='mv_malloc_log',
-         env=env,
-         command=['mv',
-                  '%s/malloc.log' % objdir,
-                  '../malloc.log'],
-        )
-        self.addStep(ShellCommand,
-         name='mv_sdleak_log',
-         env=env,
-         command=['mv',
-                  '%s/sdleak.log' % objdir,
-                  '../sdleak.log'],
-        )
-        self.addStep(CompareLeakLogs,
-         name='compare_current_leak_log',
-         mallocLog='../malloc.log',
-         platform=platformName,
-         leakFailureThreshold=leak_threshold,
-         env=env,
-         objdir=moz_objdir,
-         testname='current',
-         testnameprefix='Mail',
-         warnOnFailure=True,
-         haltOnFailure=True,
-        )
-#        self.addStep(GraphServerPost,
-#         server=self.graphServer,
-#         selector=self.graphSelector,
-#         branch=self.graphBranch,
-#         resultsname=self.baseName
-#        )
-        self.addStep(CompareLeakLogs,
-         mallocLog='../malloc.log.old',
-         platform=platformName,
-         leakFailureThreshold=leak_threshold,
-         env=env,
-         objdir=moz_objdir,
-         testname='previous',
-         testnameprefix='Mail',
-         haltOnFailure=False,
-        )
-        self.addStep(ShellCommand,
-         name='create_sdleak_tree',
-         env=env,
-         workdir='.',
-         command=['bash', '-c',
-                  'perl build/mozilla/tools/trace-malloc/diffbloatdump.pl '
-                  '--depth=15 --use-address /dev/null sdleak.log '
-                  '> sdleak.tree']
-        )
-        if platformName in ('macosx', 'linux'):
-            self.addStep(ShellCommand,
-             name='create_sdleak_raw',
-             env=env,
-             workdir='.',
-             command=['cp', 'sdleak.tree', 'sdleak.tree.raw']
-            )
-            self.addStep(ShellCommand,
-             name='get_fix_stack',
-             env=env,
-             workdir='.',
-             timeout=60*60, # Very IO/CPU intensive, give it an hour to complete
-             command=['/bin/bash', '-c', 
-                      'perl '
-                      'build/mozilla/tools/rb/fix-%s-stack.pl '
-                      'sdleak.tree.raw '
-                      '> sdleak.tree' % platformName]
-            )
-        self.addStep(ShellCommand,
-         name='upload_logs',
-         env=env,
-         command=['scp', '-o', 'User=%s' % platform.get('stage_username',branch.get('stage_username',defaults.get('stage_username'))),
-                  '-o', 'IdentityFile=~/.ssh/%s' % platform.get('stage_ssh_key',branch.get('stage_ssh_key',defaults.get('stage_ssh_key'))),
-                  '../malloc.log', '../sdleak.tree',
-                  '%s:%s/%s' % (branch.get('stage_server',defaults.get('stage_server')), platform.get('stage_base_path',branch.get('stage_base_path',defaults.get('stage_base_path'))),
-                                logUploadDir)]
-        )
-        self.addStep(ShellCommand,
-         name='compare_sdleak_tree',
-         env=env,
-         command=['perl', 'mozilla/tools/trace-malloc/diffbloatdump.pl',
-                  '--depth=15', '../sdleak.tree.old', '../sdleak.tree'],
-         haltOnFailure=False,
-        )
-
deleted file mode 100644
--- a/calendar/public_html/buildbot.css
+++ /dev/null
@@ -1,64 +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;
-}
-
-/* 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/calendar/public_html/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-<title>Welcome to the Buildbot</title>
-</head>
-
-<body>
-<h1>Welcome to the Buildbot!</h1>
-
-<ul>
-  <li>the <a href="waterfall">Waterfall Display</a> will give you a
-  time-oriented summary of recent buildbot activity.</li>
-
-  <li>The <a href="one_box_per_builder">Latest Build</a> for each builder is
-  here.</li>
-
-  <li><a href="one_line_per_build">Recent Builds</a> are summarized here, one
-  per line.</li>
-
-  <li><a href="buildslaves">Buildslave</a> information</li>
-  <li><a href="changes">ChangeSource</a> information.</li>
-
-  <br />
-  <li><a href="about">About this Buildbot</a></li>
-</ul>
-
-
-</body> </html>
deleted file mode 100644
--- a/calendar/public_html/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
deleted file mode 100644
--- a/calendar/release_calendar.py
+++ /dev/null
@@ -1,78 +0,0 @@
-### This needs to be filled in ###
-
-branchSuffix               = 'beta'
-
-sourceRepoRevision         = '1fd7316f0e28'
-mozillaRepoRevision        = 'default'
-
-milestone                  = '21.0'
-
-version                    = '2.3b2'
-buildNumber                = 1
-
-oldVersion                 = '2.3b1'
-oldBuildNumber             = 1
-
-relbranchOverride          = ''
-mozillaRelbranchOverride   = ''
-
-### Nothing else needs to be changed ###
-
-hgUsername                 = 'calbld'
-hgSshKey                   = '~cltbld/.ssh/calbld_dsa'
-relbranchPrefix            = 'CAL'
-sourceRepoName             = 'comm-' + branchSuffix # buildbot branch name
-sourceRepoPath             = 'releases/' + sourceRepoName
-# If blank, automation will create its own branch based on COMM_<date>_RELBRANCH
-mozillaRepoPath            = 'releases/mozilla-' + branchSuffix
-# If blank, automation will create its own branch based on COMM_<date>_RELBRANCH
-# You typically want to set this to the gecko relbranch if doing a release off
-# a specific gecko version.
-inspectorRepoPath          = '' # leave empty if inspector is not to be tagged
-inspectorRepoRevision      = ''
-inspectorRelbranchOverride = ''
-buildToolsRepoPath            = '' # leave empty if buildTools is not to be tagged
-buildToolsRepoRevision        = ''
-buildToolsRelbranchOverride   = ''
-venkmanRepoPath            = '' # leave empty if venkman is not to be tagged
-venkmanRepoRevision        = ''
-venkmanRelbranchOverride   = ''
-chatzillaCVSRoot           = ''
-chatzillaTimestamp         = '' # leave empty if chatzilla is not to be tagged
-l10nRevisionFile           = 'l10n-calendar-changesets'
-l10nRepoPath               = 'releases/l10n/mozilla-' + branchSuffix
-toolsRepoPath              = 'build/tools'
-cvsroot                    = ':ext:calbld@cvs.mozilla.org:/cvsroot' # for patcher, etc.
-productVersionFile         = 'calendar/sunbird/config/version.txt'
-# version-bump.pl needs an app name, which we have to hack a bit for Lightning.
-productBumpName            = 'calendar/sunbird'
-productName                = 'lightning'
-brandName                  = 'Lightning'
-appName                    = 'calendar'
-ftpName			   = 'calendar/lightning'
-projectName                = 'lightning'
-# 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.
-baseTag                    = 'CALENDAR_' + version.replace(".", "_")
-appVersion                 = version
-#XXX: Not entirely certain if/where this is used.
-# The old version is the revision from which we should generate update snippets.
-oldAppVersion              = oldVersion
-oldBaseTag                 = 'CALENDAR_' + oldVersion.replace(".", "_")
-releasePlatforms           = ('linux', 'linux64', 'win32', 'macosx64')
-patcherConfig              = 'moz19-calendar-branch-patcher2.cfg'
-patcherToolsTag            = 'UPDATE_PACKAGING_R14'
-ftpServer                  = 'ftp.mozilla.org'
-stagingServer              = 'stage-old.mozilla.org'
-bouncerServer              = 'download.mozilla.org'
-ausServerUrl               = 'https://aus2-community.mozilla.org'
-useBetaChannel             = 1
-l10nPlatforms              = ('linux', 'win32', 'macosx')
-l10nPlatforms              = ()
-verifyConfigs              = {'linux':  'moz19-calendar-linux.cfg',
-                              'linux64': 'moz19-calendar-linux.cfg',
-                              'macosx64': 'moz19-calendar-mac.cfg',
-                              'win32':  'moz19-calendar-win32.cfg'}
deleted file mode 120000
--- a/calendar/release_config.py
+++ /dev/null
@@ -1,1 +0,0 @@
-release_calendar.py
\ No newline at end of file
deleted file mode 100644
--- a/calendar/release_master.py
+++ /dev/null
@@ -1,400 +0,0 @@
-from buildbot.changes.pb import PBChangeSource
-from buildbot.scheduler import Scheduler, Dependent
-
-import buildbotcustom.l10n
-import buildbotcustom.misc
-reload(buildbotcustom.misc)
-import buildbotcustom.process.factory
-
-from buildbotcustom.l10n import DependentL10n
-from buildbotcustom.misc import get_l10n_repositories, isHgPollerTriggered
-from buildbotcustom.process.factory import StagingRepositorySetupFactory, \
-  CCReleaseTaggingFactory, CCSourceFactory, CCReleaseBuildFactory, \
-  ReleaseUpdatesFactory, UpdateVerifyFactory, ReleaseFinalVerification, \
-  L10nVerifyFactory, CCReleaseRepackFactory
-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
-reload(nightly_config)
-
-for v in ['stage_username','stage_ssh_key','stage_group','stage_base_path']:
-    nightly_config.BRANCHES[sourceRepoName][v] = nightly_config.DEFAULTS[v]
-
-
-builders = []
-schedulers = []
-change_source = []
-status = []
-
-##### Change sources and Schedulers
-change_source.append(PBChangeSource())
-change_source.append(FtpPoller(
-	branch="post_signing",
-	ftpURLs=["http://%s/pub/mozilla.org/%s/nightly/%s-candidates/build%s/" \
-	  % (stagingServer, productName, version, buildNumber)],
-	pollInterval=60*10,
-	searchString='win32_signing_build'
-))
-
-tag_scheduler = Scheduler(
-    name='tag',
-    branch=sourceRepoPath,
-    treeStableTimer=0,
-    builderNames=['tag'],
-    fileIsImportant=lambda c: not isHgPollerTriggered(c, nightly_config.HGURL)
-)
-schedulers.append(tag_scheduler)
-source_scheduler = Dependent(
-    name='source',
-    upstream=tag_scheduler,
-    builderNames=['source']
-)
-schedulers.append(source_scheduler)
-for platform in releasePlatforms:
-    build_scheduler = Dependent(
-        name='%s_build' % platform,
-        upstream=tag_scheduler,
-        builderNames=['%s_build' % platform]
-    )
-    repack_scheduler = DependentL10n(
-        name='%s_repack' % platform,
-        platform=platform,
-        upstream=build_scheduler,
-        builderNames=['%s_repack' % platform],
-        repoType='hg',
-        branch=sourceRepoPath,
-        baseTag='%s_RELEASE' % baseTag,
-        localesFile='%s/locales/shipped-locales' % appName,
-        # If a few locales are needed, do this instead:
-        #locales={ 'zh-TW': ['linux']},
-
-    )
-    schedulers.append(build_scheduler)
-    # No repack schedulers for now, everything is done in the en-US builder.
-    # schedulers.append(repack_scheduler)
-
-for platform in 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 releasePlatforms:
-    updateBuilderNames.append('%s_update_verify' % platform)
-update_verify_scheduler = Dependent(
-    name='update_verify',
-    upstream=updates_scheduler,
-    builderNames=updateBuilderNames
-)
-schedulers.append(update_verify_scheduler)
-
-# Purposely, there is not a Scheduler for ReleaseFinalVerification
-# This is a step run very shortly before release, and is triggered manually
-# from the waterfall
-
-##### Builders
-# repositories is what actual stuff is performed on
-repositories = {
-    sourceRepoPath: {
-        'revision': sourceRepoRevision,
-        'relbranchOverride': relbranchOverride,
-        'bumpFiles': [productVersionFile]
-    },
-    mozillaRepoPath: {
-        'revision': mozillaRepoRevision,
-        'relbranchOverride': mozillaRelbranchOverride,
-        'bumpFiles': []
-    },
-}
-
-if buildToolsRepoPath:
-    repositories[buildToolsRepoPath] = {
-        'revision': buildToolsRepoRevision,
-        'relbranchOverride': buildToolsRelbranchOverride,
-        'bumpFiles': []
-    }
-
-if inspectorRepoPath:
-    repositories[inspectorRepoPath] = {
-        'revision': inspectorRepoRevision,
-        'relbranchOverride': inspectorRelbranchOverride,
-        'bumpFiles': []
-    }
-if venkmanRepoPath:
-    repositories[venkmanRepoPath] = {
-        'revision': venkmanRepoRevision,
-        'relbranchOverride': venkmanRelbranchOverride,
-        'bumpFiles': []
-    }
-
-l10n_repos = get_l10n_repositories(l10nRevisionFile, l10nRepoPath,
-                                   relbranchOverride)
-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 = CCReleaseTaggingFactory(
-    hgHost=nightly_config.HGHOST,
-    buildToolsRepoPath=toolsRepoPath, # nightly_config.BUILD_TOOLS_REPO_PATH,
-    repositories=repositories,
-    productName=productName,
-    appName=productBumpName,
-    version=version,
-    appVersion=appVersion,
-    milestone=milestone,
-    baseTag=baseTag,
-    buildNumber=buildNumber,
-    hgUsername=hgUsername,
-    hgSshKey=hgSshKey,
-    relbranchPrefix=relbranchPrefix,
-    chatzillaTimestamp=chatzillaTimestamp,
-    cvsroot=chatzillaCVSRoot,
-    clobberURL=nightly_config.DEFAULTS['clobber_url']
-)
-
-builders.append({
-    'name': 'tag',
-    'slavenames': nightly_config.BRANCHES[sourceRepoName]['platforms']['linux']['slaves'],
-    'category': 'release',
-    'builddir': 'tag',
-    'factory': tag_factory
-})
-
-
-source_factory = CCSourceFactory(
-    hgHost=nightly_config.HGHOST,
-    buildToolsRepoPath=toolsRepoPath, # nightly_config.BUILD_TOOLS_REPO_PATH,
-    repoPath=sourceRepoPath,
-    productName=productName,
-    ftpName=ftpName,
-    version=version,
-    baseTag=baseTag,
-    stagingServer=nightly_config.STAGE_SERVER,
-    stageUsername=nightly_config.BRANCHES[sourceRepoName]['stage_username'],
-    stageSshKey=nightly_config.BRANCHES[sourceRepoName]['stage_ssh_key'],
-    buildNumber=buildNumber,
-    mozRepoPath=mozillaRepoPath,
-    inspectorRepoPath=inspectorRepoPath,
-    venkmanRepoPath=venkmanRepoPath,
-    cvsroot=chatzillaCVSRoot,
-    autoconfDirs=['.', 'mozilla', 'mozilla/js/src'],
-    clobberURL=nightly_config.DEFAULTS['clobber_url']
-)
-
-builders.append({
-    'name': 'source',
-    'slavenames': nightly_config.BRANCHES[sourceRepoName]['platforms']['linux']['slaves'],
-    'category': 'release',
-    'builddir': 'source',
-    'factory': source_factory
-})
-
-
-for platform in releasePlatforms:
-    # shorthand
-    pf = nightly_config.BRANCHES[sourceRepoName]['platforms'][platform]
-    mozconfig = '%s/%s/release' % (platform, sourceRepoName)
-
-    build_factory = CCReleaseBuildFactory(
-        env=pf['env'],
-        objdir=pf['platform_objdir'],
-        platform=platform,
-        hgHost=nightly_config.HGHOST,
-        repoPath=sourceRepoPath,
-        mozRepoPath=mozillaRepoPath,
-        inspectorRepoPath=inspectorRepoPath,
-        venkmanRepoPath=venkmanRepoPath,
-        cvsroot=chatzillaCVSRoot,
-        buildToolsRepoPath=toolsRepoPath, # nightly_config.BUILD_TOOLS_REPO_PATH,
-        configRepoPath=nightly_config.CONFIG_REPO_PATH,
-        configSubDir=nightly_config.CONFIG_SUBDIR,
-        profiledBuild=pf['profiled_build'],
-        mozconfig=mozconfig,
-        l10nRevisionFile=l10nRevisionFile,
-        l10nRepoPath=l10nRepoPath,
-        buildRevision='%s_RELEASE' % baseTag,
-        stageServer=nightly_config.STAGE_SERVER,
-        stageUsername=nightly_config.BRANCHES[sourceRepoName]['stage_username'],
-        stageGroup=nightly_config.BRANCHES[sourceRepoName]['stage_group'],
-        stageSshKey=nightly_config.BRANCHES[sourceRepoName]['stage_ssh_key'],
-        stageBasePath=nightly_config.BRANCHES[sourceRepoName]['stage_base_path'],
-        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=productName,
-        ftpName=ftpName,
-        version=version,
-        buildNumber=buildNumber,
-        clobberURL=nightly_config.DEFAULTS['clobber_url']
-    )
-
-    builders.append({
-        'name': '%s_build' % platform,
-        'slavenames': pf['slaves'],
-        'category': 'release',
-        'builddir': '%s_build' % platform,
-        'factory': build_factory
-    })
-
-    repack_factory = CCReleaseRepackFactory(
-        hgHost=nightly_config.HGHOST,
-        project=productName,
-        appName=appName,
-        brandName=brandName,
-        repoPath=sourceRepoPath,
-        mozRepoPath=mozillaRepoPath,
-        inspectorRepoPath=inspectorRepoPath,
-        venkmanRepoPath=venkmanRepoPath,
-        cvsroot=chatzillaCVSRoot,
-        l10nRepoPath=l10nRepoPath,
-        stageServer=nightly_config.STAGE_SERVER,
-        stageUsername=nightly_config.BRANCHES[sourceRepoName]['stage_username'],
-        stageSshKey=nightly_config.BRANCHES[sourceRepoName]['stage_ssh_key'],
-        buildToolsRepoPath=toolsRepoPath, # nightly_config.BUILD_TOOLS_REPO_PATH,
-        compareLocalesRepoPath=nightly_config.COMPARE_LOCALES_REPO_PATH,
-        compareLocalesTag=nightly_config.COMPARE_LOCALES_TAG,
-        buildSpace=2,
-        configRepoPath=nightly_config.CONFIG_REPO_PATH,
-        configSubDir=nightly_config.CONFIG_SUBDIR,
-        mozconfig=mozconfig,
-        platform=platform + '-release',
-        buildRevision='%s_RELEASE' % baseTag,
-        version=version,
-        buildNumber=buildNumber,
-        clobberURL=nightly_config.DEFAULTS['clobber_url']
-    )
-
-    # Don't want repack builders at this time.
-    #builders.append({
-    #    'name': '%s_repack' % platform,
-    #    'slavenames': pf['slaves'],
-    #    'category': 'release',
-    #    'builddir': '%s_repack' % platform,
-    #    'factory': repack_factory
-    #})
-
-
-for platform in l10nPlatforms:
-    l10n_verification_factory = L10nVerifyFactory(
-        hgHost=nightly_config.HGHOST,
-        buildToolsRepoPath=toolsRepoPath, # nightly_config.BUILD_TOOLS_REPO_PATH,
-        cvsroot=cvsroot,
-        stagingServer=stagingServer,
-        productName=productName,
-        version=version,
-        buildNumber=buildNumber,
-        oldVersion=oldVersion,
-        oldBuildNumber=oldBuildNumber,
-        clobberURL=nightly_config.DEFAULTS['clobber_url']
-        #platform=platform,
-    )
-
-    builders.append({
-        'name': '%s_l10n_verification' % platform,
-        'slavenames': nightly_config.BRANCHES[sourceRepoName]['platforms']['macosx64']['slaves'],
-        'category': 'release',
-        'builddir': '%s_l10n_verification' % platform,
-        'factory': l10n_verification_factory
-    })
-
-
-updates_factory = ReleaseUpdatesFactory(
-    hgHost=nightly_config.HGHOST,
-    repoPath=sourceRepoPath,
-    mozRepoPath=mozillaRepoPath,
-    buildToolsRepoPath=toolsRepoPath, # nightly_config.BUILD_TOOLS_REPO_PATH,
-    cvsroot=cvsroot,
-    patcherToolsTag=patcherToolsTag,
-    patcherConfig=patcherConfig,
-    verifyConfigs=verifyConfigs,
-    appName=appName,
-    productName=productName,
-    brandName=brandName,
-    version=version,
-    appVersion=appVersion,
-    baseTag=baseTag,
-    buildNumber=buildNumber,
-    oldVersion=oldVersion,
-    oldAppVersion=oldAppVersion,
-    oldBaseTag=oldBaseTag,
-    oldBuildNumber=oldBuildNumber,
-    ftpServer=ftpServer,
-    bouncerServer=bouncerServer,
-    stagingServer=stagingServer,
-    useBetaChannel=useBetaChannel,
-    stageUsername=nightly_config.BRANCHES[sourceRepoName]['stage_username'],
-    stageSshKey=nightly_config.BRANCHES[sourceRepoName]['stage_ssh_key'],
-    ausUser=nightly_config.AUS2_USER,
-    ausHost=nightly_config.AUS2_HOST,
-    ausServerUrl=ausServerUrl,
-    hgSshKey=hgSshKey,
-    hgUsername=hgUsername,
-    clobberURL=nightly_config.DEFAULTS['clobber_url'])
-
-builders.append({
-    'name': 'updates',
-    'slavenames': nightly_config.BRANCHES[sourceRepoName]['platforms']['linux']['slaves'],
-    'category': 'release',
-    'builddir': 'updates',
-    'factory': updates_factory
-})
-
-
-for platform in releasePlatforms:
-    update_verify_factory = UpdateVerifyFactory(
-        hgHost=nightly_config.HGHOST,
-        buildToolsRepoPath=toolsRepoPath, # nightly_config.BUILD_TOOLS_REPO_PATH,
-        verifyConfig=verifyConfigs[platform],
-    )
-
-    builders.append({
-        'name': '%s_update_verify' % platform,
-        'slavenames': nightly_config.BRANCHES[sourceRepoName]['platforms'][platform]['slaves'],
-        'category': 'release',
-        'builddir': '%s_update_verify' % platform,
-        'factory': update_verify_factory
-    })
-
-
-final_verification_factory = ReleaseFinalVerification(
-    hgHost=nightly_config.HGHOST,
-    buildToolsRepoPath=toolsRepoPath, # nightly_config.BUILD_TOOLS_REPO_PATH,
-    verifyConfigs=verifyConfigs,
-    clobberURL=nightly_config.DEFAULTS['clobber_url']
-)
-
-builders.append({
-    'name': 'final_verification',
-    'slavenames': nightly_config.BRANCHES[sourceRepoName]['platforms']['linux']['slaves'],
-    'category': 'release',
-    'builddir': 'final_verification',
-    'factory': final_verification_factory
-})
deleted file mode 100644
--- a/calendar/win32/comm-aurora/mozconfig-lightning
+++ /dev/null
@@ -1,17 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-
-ac_add_options --enable-jemalloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-. $topsrcdir/build/win32/mozconfig.vs2010
deleted file mode 100644
--- a/calendar/win32/comm-aurora/release/mozconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-ac_add_options --with-l10n-base=../../l10n
-
-ac_add_options --enable-jemalloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-. $topsrcdir/build/win32/mozconfig.vs2010
deleted file mode 100644
--- a/calendar/win32/comm-beta/mozconfig-lightning
+++ /dev/null
@@ -1,17 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-
-ac_add_options --enable-jemalloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-. $topsrcdir/build/win32/mozconfig.vs2010
deleted file mode 100644
--- a/calendar/win32/comm-beta/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-ac_add_options --with-l10n-base=../../l10n
-
-#Bug 427627
-ac_add_options --enable-jemalloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-. $topsrcdir/build/win32/mozconfig.vs2010
deleted file mode 100644
--- a/calendar/win32/comm-central/mozconfig-lightning
+++ /dev/null
@@ -1,17 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-
-ac_add_options --enable-jemalloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-. $topsrcdir/build/win32/mozconfig.vs2010
deleted file mode 100644
--- a/calendar/win32/comm-esr17/mozconfig-lightning
+++ /dev/null
@@ -1,17 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-
-ac_add_options --enable-jemalloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-. $topsrcdir/build/win32/mozconfig.vs2010
deleted file mode 100644
--- a/calendar/win32/comm-esr17/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-ac_add_options --with-l10n-base=../../l10n
-
-#Bug 427627
-ac_add_options --enable-jemalloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-. $topsrcdir/build/win32/mozconfig.vs2010
deleted file mode 100644
--- a/calendar/win32/comm-release/mozconfig-lightning
+++ /dev/null
@@ -1,17 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-
-#Bug 427627
-ac_add_options --enable-jemalloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
deleted file mode 100644
--- a/calendar/win32/comm-release/release/mozconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-ac_add_options --enable-application=mail
-ac_add_options --enable-calendar
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-update-packaging
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-ac_add_options --with-l10n-base=../../l10n
-
-#Bug 427627
-ac_add_options --enable-jemalloc
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-. $topsrcdir/build/win32/mozconfig.vs2010