bug 426227: enable snippet generation for mozilla-central. r=nthomas, patch=me
authorBen Hearsum <bhearsum@mozilla.com>
Mon, 31 Mar 2008 12:54:05 -0700
changeset 15 8cef101b0e60a2413a185f5d31e7debd197fddf0
parent 14 9ebc9aa43402909518e4fed6bb4b66de62d660af
child 16 bcce69b281482cad5d1ab556f219dbbd6ab149f2
push id1
push userbhearsum@mozilla.com
push dateMon, 07 Apr 2008 12:22:19 +0000
reviewersnthomas
bugs426227
bug 426227: enable snippet generation for mozilla-central. r=nthomas, patch=me
mozilla2/linux/mozconfig
mozilla2/macosx/mozconfig
mozilla2/master.cfg
mozilla2/win32/mozconfig
--- a/mozilla2/linux/mozconfig
+++ b/mozilla2/linux/mozconfig
@@ -1,6 +1,7 @@
 ac_add_options --enable-application=browser
 ac_add_options --enable-optimize="-Os -gstabs+"
+ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 
 CC=/tools/gcc/bin/gcc
 CXX=/tools/gcc/bin/g++
--- a/mozilla2/macosx/mozconfig
+++ b/mozilla2/macosx/mozconfig
@@ -1,5 +1,6 @@
 . $topsrcdir/build/macosx/universal/mozconfig
 ac_add_app_options ppc --enable-prebinding
 
 ac_add_options --enable-application=browser
+ac_add_options --enable-update-packaging
 ac_add_options --disable-tests
--- a/mozilla2/master.cfg
+++ b/mozilla2/master.cfg
@@ -26,32 +26,34 @@ CONFIG_SUBDIR = 'mozilla2'
 OBJDIR = 'obj-firefox'
 STAGE_USERNAME = 'ffxbld'
 STAGE_SERVER = 'stage.mozilla.org'
 STAGE_BASE_PATH = '/home/ftp/pub/firefox'
 STAGE_GROUP = None
 STAGE_SSH_KEY = 'ffxbld_dsa'
 BRANCHES = {'mozilla-central': {}, 'actionmonkey': {}}
 BRANCHES['mozilla-central']['platforms'] = {'linux': {}, 'win32': {}, 'macosx': {}}
+BRANCHES['mozilla-central']['create_update'] = True
 BRANCHES['mozilla-central']['platforms']['linux']['slaves'] = ['moz2-linux-slave1']
 BRANCHES['mozilla-central']['platforms']['win32']['slaves'] = ['moz2-win32-slave1']
 BRANCHES['mozilla-central']['platforms']['macosx']['slaves'] = ['moz2-mac-slave1']
 BRANCHES['mozilla-central']['platforms']['linux']['platform_objdir'] = OBJDIR
 BRANCHES['mozilla-central']['platforms']['win32']['platform_objdir'] = OBJDIR
 BRANCHES['mozilla-central']['platforms']['macosx']['platform_objdir'] = '%s/ppc' % OBJDIR
 BRANCHES['mozilla-central']['platforms']['linux']['env'] = {
     'MOZ_OBJDIR': OBJDIR
 }
 BRANCHES['mozilla-central']['platforms']['win32']['env'] = {'CVS_RSH': 'ssh',
     'MOZ_OBJDIR': OBJDIR
 }
 BRANCHES['mozilla-central']['platforms']['macosx']['env'] = {
     'MOZ_OBJDIR': OBJDIR
 }
 BRANCHES['actionmonkey']['platforms'] = {'linux': {}, 'win32': {}, 'macosx': {}}
+BRANCHES['actionmonkey']['create_update'] = False
 BRANCHES['actionmonkey']['platforms']['linux']['slaves'] = ['moz2-linux-slave1']
 BRANCHES['actionmonkey']['platforms']['win32']['slaves'] = ['moz2-win32-slave1']
 BRANCHES['actionmonkey']['platforms']['macosx']['slaves'] = ['moz2-mac-slave1']
 BRANCHES['actionmonkey']['platforms']['linux']['platform_objdir'] = OBJDIR
 BRANCHES['actionmonkey']['platforms']['win32']['platform_objdir'] = OBJDIR
 BRANCHES['actionmonkey']['platforms']['macosx']['platform_objdir'] = '%s/ppc' % OBJDIR
 BRANCHES['actionmonkey']['platforms']['linux']['env'] = {
     'MOZ_OBJDIR': OBJDIR
@@ -68,21 +70,24 @@ from buildbot.process import factory
 from buildbot.changes.hgpoller import HgPoller
 from buildbot.scheduler import Scheduler, Nightly, Periodic
 from buildbot.steps.source import Mercurial
 from buildbot.steps.shell import Compile, ShellCommand, WithProperties
 from buildbot.locks import SlaveLock
 
 import buildbotcustom.steps.misc
 import buildbotcustom.steps.transfer
+import buildbotcustom.steps.updates
 reload(buildbotcustom.steps.misc)
 reload(buildbotcustom.steps.transfer)
+reload(buildbotcustom.steps.updates)
 
-from buildbotcustom.steps.misc import GetBuildID
+from buildbotcustom.steps.misc import SetMozillaBuildProperties
 from buildbotcustom.steps.transfer import MozillaStageUpload
+from buildbotcustom.steps.updates import CreateCompleteUpdateSnippet
 
 c['sources'] = []
 c['schedulers'] = []
 c['builders'] = []
 
 locks = {'linux': SlaveLock(name='linux', maxCount=1),
          'win32': SlaveLock(name='win32', maxCount=1),
          'macosx': SlaveLock(name='macosx', maxCount=1)}
@@ -186,17 +191,17 @@ for name in BRANCHES.keys():
             haltOnFailure=True
         ))
         if platform == "win32":
             mozilla2_dep_factory.addStep(ShellCommand(
                 command=['make', 'installer'],
                 workdir='build/%s' % OBJDIR,
                 haltOnFailure=True
             ))
-        mozilla2_dep_factory.addStep(GetBuildID(
+        mozilla2_dep_factory.addStep(SetMozillaBuildProperties(
                 objdir=pf['platform_objdir']
         ))
         mozilla2_dep_factory.addStep(MozillaStageUpload(
                 objdir=pf['platform_objdir'],
                 username=STAGE_USERNAME,
                 milestone=name,
                 remoteHost=STAGE_SERVER,
                 remoteBasePath=STAGE_BASE_PATH,
@@ -272,17 +277,17 @@ for name in BRANCHES.keys():
             haltOnFailure=True
         ))
         if platform == "win32":
             mozilla2_nightly_factory.addStep(ShellCommand(
                 command=['make', 'installer'],
                 workdir='build/%s' % OBJDIR,
                 haltOnFailure=True
             ))
-        mozilla2_nightly_factory.addStep(GetBuildID(
+        mozilla2_nightly_factory.addStep(SetMozillaBuildProperties(
                 objdir=pf['platform_objdir']
         ))
         mozilla2_nightly_factory.addStep(MozillaStageUpload(
                 objdir=pf['platform_objdir'],
                 username=STAGE_USERNAME,
                 milestone=name,
                 remoteHost=STAGE_SERVER,
                 remoteBasePath=STAGE_BASE_PATH,
@@ -290,16 +295,22 @@ for name in BRANCHES.keys():
                 group=STAGE_GROUP,
                 sshKey=STAGE_SSH_KEY,
                 releaseToDated=True,
                 releaseToLatest=True,
                 releaseToTinderboxBuilds=True,
                 tinderboxBuildsDir='%s-%s' % (name, platform),
                 dependToDated=False
         ))
+        if branch['create_update']:
+            mozilla2_nightly_factory.addStep(CreateCompleteUpdateSnippet(
+                objdir=OBJDIR,
+                milestone='mozilla2',
+                baseurl='%s/nightly' % STAGE_BASE_PATH
+            ))
 
         mozilla2_nightly_builder = {
             'name': '%s-%s-nightly' % (name, platform),
             'slavenames': pf['slaves'],
             'builddir': '%s-%s-nightly' % (name, platform),
             'factory': mozilla2_nightly_factory,
             'category': name,
             'locks': [ locks[platform] ]
--- a/mozilla2/win32/mozconfig
+++ b/mozilla2/win32/mozconfig
@@ -1,2 +1,3 @@
 ac_add_options --enable-application=browser
+ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc