Bug 842445 - Enable pymake on Win platform for SeaMonkey. seamonkey-production
authorEdmund Wong <ewong@pw-wspx.org>
Sat, 02 Mar 2013 15:12:13 -0800
branchseamonkey-production
changeset 7987 9a07b92395eca365a7c1d3d0dfe5ac2cfc05234d
parent 7980 39928efa16bc4d346eabf9aa5693f4514084dca8
child 7988 32e44e7ebb3ae3ba4537a72571fcc1e229c514c5
push id6118
push userseabld
push dateSat, 02 Mar 2013 23:12:43 +0000
bugs842445
Bug 842445 - Enable pymake on Win platform for SeaMonkey.
seamonkey/config.py
seamonkey/release_master.py
--- a/seamonkey/config.py
+++ b/seamonkey/config.py
@@ -156,16 +156,17 @@ PLATFORM_VARS = {
                 'DISPLAY': ':2',
                 'PATH': '/tools/python-2.7.2/bin:/tools/python-2.6.5/bin:${PATH}',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'tooltool_manifest_src': 'suite/config/tooltool-manifests/linux32/releng.manifest',
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'stage_product': 'seamonkey',
+            'enable_pymake': False,
         },
         'linux64': {
             'product_name': 'seamonkey',
             'app_name': 'suite',
             'brand_name': 'SeaMonkey',
             'base_name': 'Linux x86-64 %(branch)s',
             'mozconfig': 'linux64/%(branch)s/nightly',
             'src_mozconfig': 'suite/config/mozconfigs/linux64/nightly',
@@ -196,16 +197,17 @@ PLATFORM_VARS = {
                 'DISPLAY': ':2',
                 'PATH': '/usr/libexec/binutils220:/tools/python-2.7.2/bin:/tools/python-2.6.5/bin:${PATH}',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'tooltool_manifest_src': 'suite/config/tooltool-manifests/linux64/releng.manifest',
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'stage_product': 'seamonkey',
+            'enable_pymake': False,
         },
         'macosx64': {
             'product_name': 'seamonkey',
             'app_name': 'suite',
             'brand_name': 'SeaMonkey',
             'base_name': 'OS X 10.6 %(branch)s',
             'mozconfig': 'macosx64/%(branch)s/nightly',
             'src_mozconfig': 'suite/config/mozconfigs/macosx-universal/nightly',
@@ -237,16 +239,17 @@ PLATFORM_VARS = {
                 'LC_ALL': 'C',
                 'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'tooltool_manifest_src': 'suite/config/tooltool-manifests/macosx64/releng.manifest',
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'stage_product': 'seamonkey',
+            'enable_pymake': False,
         },
         'win32': {
             'product_name': 'seamonkey',
             'app_name': 'suite',
             'brand_name': 'SeaMonkey',
             'base_name': 'WINNT 5.2 %(branch)s',
             'mozconfig': 'win32/%(branch)s/nightly',
             'src_mozconfig': 'suite/config/mozconfigs/win32/nightly',
@@ -277,16 +280,17 @@ PLATFORM_VARS = {
                 'PDBSTR_PATH': '/c/Program Files/Debugging Tools for Windows/srcsrv/pdbstr.exe',
                 'HG_SHARE_BASE_DIR': 'e:/builds/hg-shared',
                 'PATH': "${MOZILLABUILD}nsis-2.46u;${MOZILLABUILD}buildbotve\\scripts;${MOZILLABUILD}python27;${PATH}",
             },
             'enable_opt_unittests': False,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'stage_product': 'seamonkey',
+            'enable_pymake': True,
         },
         'linux-debug': {
             'product_name': 'seamonkey',
             'app_name': 'suite',
             'brand_name': 'SeaMonkey',
             'base_name': 'Linux %(branch)s leak test',
             'mozconfig': 'linux/%(branch)s/debug',
             'src_mozconfig': 'suite/config/mozconfigs/linux32/debug',
@@ -309,16 +313,17 @@ PLATFORM_VARS = {
                 'CCACHE_UMASK': '002',
                 'PATH': '/tools/python-2.7.2/bin:/tools/python-2.6.5/bin:${PATH}',
             },
             'enable_unittests': True,
             'enable_checktests': True,
             'tooltool_manifest_src': 'suite/config/tooltool-manifests/linux32/releng.manifest',
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'stage_product': 'seamonkey',
+            'enable_pymake': False,
         },
         'macosx64-debug': {
             'product_name': 'seamonkey',
             'app_name': 'suite',
             'brand_name': 'SeaMonkey',
             'base_name': 'OS X 10.6 %(branch)s leak test',
             'mozconfig': 'macosx64/%(branch)s/debug',
             'src_mozconfig': 'suite/config/mozconfigs/macosx64/debug',
@@ -340,16 +345,17 @@ PLATFORM_VARS = {
                 'LC_ALL': 'C',
                 'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
             },
             'enable_unittests': True,
             'enable_checktests': True,
             'tooltool_manifest_src': 'suite/config/tooltool-manifests/macosx64/releng.manifest',
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'stage_product': 'seamonkey',
+            'enable_pymake': False,
         },
         'win32-debug': {
             'product_name': 'seamonkey',
             'app_name': 'suite',
             'brand_name': 'SeaMonkey',
             'base_name': 'WINNT 5.2 %(branch)s leak test',
             'mozconfig': 'win32/%(branch)s/debug',
             'src_mozconfig': 'suite/config/mozconfigs/win32/debug',
@@ -367,16 +373,17 @@ PLATFORM_VARS = {
                 'MOZ_CRASHREPORTER_NO_REPORT': '1',
                 'HG_SHARE_BASE_DIR': 'e:/builds/hg-shared',
                 'PATH': "${MOZILLABUILD}nsis-2.46u;${MOZILLABUILD}buildbotve\\scripts;${MOZILLABUILD}python27;${PATH}",
             },
             'enable_unittests': True,
             'enable_checktests': True,
             'talos_masters': GLOBAL_VARS['talos_masters'],
             'stage_product': 'seamonkey',
+            'enable_pymake': True,
         },
 }
 
 # All branches that are to be built MUST be listed here, along with their
 # platforms (if different from the default set).
 BRANCHES = {
     'comm-central-trunk': {},
     'comm-aurora': {},
--- a/seamonkey/release_master.py
+++ b/seamonkey/release_master.py
@@ -312,16 +312,17 @@ for platform in releaseConfig['enUSPlatf
         buildNumber=releaseConfig['buildNumber'],
         talosMasters=talosMasters,
         packageTests=packageTests,
         unittestMasters=unittestMasters,
         unittestBranch=unittestBranch,
         clobberURL=branchConfig['base_clobber_url'],
         tooltool_manifest_src= pf.get('tooltool_manifest_src', None),
         tooltool_url_list= branchConfig.get('tooltool_url_list', []),
+        enable_pymake=pf['enable_pymake']
     )
 
     builders.append({
         'name': '%s_build' % platform,
         'slavenames': pf['slaves'],
         'category': 'release',
         'builddir': builderPrefix('%s_build' % platform),
         'slavebuilddir': reallyShort(builderPrefix('%s_build' % platform)),
@@ -352,16 +353,17 @@ for platform in releaseConfig['enUSPlatf
             buildSpace=2,
             mozconfig=l10nmozconfig,
             platform=platform,
             buildRevision='%s_RELEASE' % releaseConfig['baseTag'],
             version=releaseConfig['version'],
             buildNumber=releaseConfig['buildNumber'],
             tree='release',
             clobberURL=branchConfig['base_clobber_url'],
+            enable_pymake=pf['enable_pymake'],
         )
 
         builders.append({
             'name': '%s_repack' % platform,
             'slavenames': branchConfig['l10n_slaves'][platform],
             'category': 'release',
             'builddir': builderPrefix('%s_repack' % platform),
             'slavebuilddir': reallyShort(builderPrefix('%s_repack' % platform)),
@@ -392,16 +394,17 @@ for platform in releaseConfig['l10nPlatf
         stagingServer=releaseConfig['stagingServer'],
         productName=releaseConfig['productName'],
         version=releaseConfig['version'],
         buildNumber=releaseConfig['buildNumber'],
         oldVersion=releaseConfig['oldVersion'],
         oldBuildNumber=releaseConfig['oldBuildNumber'],
         clobberURL=branchConfig['base_clobber_url'],
         platform=platform,
+        enable_pymake=pf['enable_pymake'],
     )
 
     verifySlavePlat = 'macosx64'
 
     builders.append({
         'name': '%s_l10n_verification' % platform,
         'slavenames': branchConfig['platforms'][verifySlavePlat]['slaves'],
         'category': 'release',
@@ -447,16 +450,17 @@ updates_factory = ReleaseUpdatesFactory(
     clobberURL=branchConfig['base_clobber_url'],
     oldRepoPath=releaseConfig['oldRepoPath'],
     releaseNotesUrl=releaseConfig['releaseNotesUrl'],
     binaryName=releaseConfig['binaryName'],
     oldBinaryName=releaseConfig['oldBinaryName'],
     testOlderPartials=releaseConfig['testOlderPartials'],
     schema=releaseConfig.get("snippetSchema", 1), # Bug 682805
     useBetaChannelForRelease=releaseConfig.get('useBetaChannelForRelease', False),
+    enable_pymake=pf['enable_pymake'],
 )
 
 builders.append({
     'name': 'updates',
     'slavenames': branchConfig['platforms']['linux']['slaves'],
     'category': 'release',
     'builddir': builderPrefix('updates'),
     'slavebuilddir': reallyShort(builderPrefix('updates')),
@@ -538,16 +542,17 @@ if releaseConfig['majorUpdateRepoPath']:
         releaseChannel=releaseConfig['releaseChannel'],
         clobberURL=branchConfig['base_clobber_url'],
         oldRepoPath=releaseConfig['oldRepoPath'],
         triggerSchedulers=['major_update_verify'],
         releaseNotesUrl=releaseConfig['majorUpdateReleaseNotesUrl'],
         testOlderPartials=releaseConfig['testOlderPartials'],
         schema=releaseConfig.get("majorSnippetSchema", 1), # Bug 682805
         useBetaChannelForRelease=releaseConfig.get('useBetaChannelForRelease', False),
+        enable_pymake=pf['enable_pymake'],
     )
 
     builders.append({
         'name': 'major_update',
         'slavenames': branchConfig['platforms']['linux']['slaves'],
         'category': 'release',
         'builddir': builderPrefix('major_update'),
         'slavebuilddir': reallyShort(builderPrefix('major_update')),