Bug 593585 - Use pymake by default on Windows -- rms uneeded pymake disable block, r=catlee
authorJordan Lund <jlund@mozilla.com>
Sun, 30 Mar 2014 17:07:08 -0700
changeset 10105 34bbfa7b4a5e5161c8c10bbfb95c862ce414b167
parent 10104 f249c447e1afba109c56a082e9a90467622a7a25
child 10106 df255296d2d1e14105b63d283eb496ee28073bea
push id7492
push userjlund@mozilla.com
push dateMon, 31 Mar 2014 00:19:30 +0000
reviewerscatlee
bugs593585
Bug 593585 - Use pymake by default on Windows -- rms uneeded pymake disable block, r=catlee
mozilla/config.py
--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2283,22 +2283,16 @@ for b, branch in BRANCHES.items():
         project = deepcopy(branch_project)
         project['project_name'] = name
         project['branch'] = b
         project['branchconfig'] = branch
         branch_project_name = '%s__%s' % (name, b)
         assert branch_project_name not in PROJECTS, '%s already in PROJECTS' % project_name
         PROJECTS[branch_project_name] = project
 
-# Disable pymake (bug 593585)
-for name, branch in items_before(BRANCHES, 'gecko_version', 18):
-    for p in ('win32', 'win32-debug', 'win64', 'win64-debug'):
-        if p in branch['platforms']:
-            branch['platforms'][p]['enable_pymake'] = False
-
 # MERGE DAY - Delete all references to android-noion once mozilla-b2g18 is EOL.
 for b in BRANCHES.keys():
     if b not in ('mozilla-b2g18', 'mozilla-b2g18_v1_1_0_hd'):
         if 'android-noion' in BRANCHES[b]['platforms']:
             del BRANCHES[b]['platforms']['android-noion']
 
 for _, branch in items_before(BRANCHES, 'gecko_version', 26):
     for p in 'linux64-asan', 'linux64-asan-debug':