Back out bug 916257 on a CLOSED TREE (DONTBUILD)
authorMatt Brubeck <mbrubeck@mozilla.com>
Fri, 13 Sep 2013 16:36:10 -0700
changeset 147070 dbb0d3946a92
parent 147069 60933bd9e217
child 147071 574bc42c68c5
push id33784
push usermbrubeck@mozilla.com
push dateFri, 13 Sep 2013 23:37:05 +0000
treeherdermozilla-inbound@dbb0d3946a92 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs916257
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out bug 916257 on a CLOSED TREE (DONTBUILD)
python/mozbuild/mozbuild/backend/recursivemake.py
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -281,41 +281,31 @@ class RecursiveMakeBackend(CommonBackend
 
             self._update_from_avoid_write(bf.close())
             self.summary.managed_count += 1
 
 
         # Write out a master list of all IPDL source files.
         ipdls = FileAvoidWrite(os.path.join(self.environment.topobjdir,
             'ipc', 'ipdl', 'ipdlsrcs.mk'))
-        mk = mozmakeutil.Makefile()
-
-        sorted_ipdl_sources = list(sorted(self._ipdl_sources))
-        mk.add_statement('ALL_IPDLSRCS := %s\n' % ' '.join(sorted_ipdl_sources))
-
-        def files_from(ipdl):
-            base = os.path.basename(ipdl)
+        for p in sorted(self._ipdl_sources):
+            ipdls.write('ALL_IPDLSRCS += %s\n' % p)
+            base = os.path.basename(p)
             root, ext = os.path.splitext(base)
 
             # Both .ipdl and .ipdlh become .cpp files
-            files = ['%s.cpp' % root]
+            ipdls.write('CPPSRCS += %s.cpp\n' % root)
             if ext == '.ipdl':
                 # .ipdl also becomes Child/Parent.cpp files
-                files.extend(['%sChild.cpp' % root,
-                              '%sParent.cpp' % root])
-            return files
+                ipdls.write('CPPSRCS += %sChild.cpp\n' % root)
+                ipdls.write('CPPSRCS += %sParent.cpp\n' % root)
 
-        ipdl_cppsrcs = itertools.chain(*[files_from(p) for p in sorted_ipdl_sources])
-        mk.add_statement('CPPSRCS := %s\n' % ' '.join(ipdl_cppsrcs))
-
-        mk.add_statement('IPDLDIRS := %s\n' % ' '.join(sorted(set(os.path.dirname(p)
+        ipdls.write('IPDLDIRS := %s\n' % ' '.join(sorted(set(os.path.dirname(p)
             for p in self._ipdl_sources))))
 
-        mk.dump(ipdls)
-
         self._update_from_avoid_write(ipdls.close())
         self.summary.managed_count += 1
 
         # Write out master lists of WebIDL source files.
         webidls = FileAvoidWrite(os.path.join(self.environment.topobjdir,
               'dom', 'bindings', 'webidlsrcs.mk'))
 
         for webidl in sorted(self._webidl_sources):