Back out bug 916257 on a CLOSED TREE (DONTBUILD)
authorMatt Brubeck <mbrubeck@mozilla.com>
Fri, 13 Sep 2013 16:36:10 -0700
changeset 155183 dbb0d3946a928fc064e9c40b175b5215d098254e
parent 155182 60933bd9e217412963eefbd075282f8da02515ab
child 155184 574bc42c68c5474cb3495aeb56221d01bd49155b
push idunknown
push userunknown
push dateunknown
bugs916257
milestone26.0a1
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):