Bug 873809 - Proper dependencies under pymake; r=khuey
authorGregory Szorc <gps@mozilla.com>
Sun, 19 May 2013 13:19:00 -0700
changeset 132369 0e6f9a78972782caf76e629008b061aa7ee18c1b
parent 132368 86f54487e3e44f1dcc516c0c0621bd6c799de57c
child 132370 0ca2dcc27f228b29601f7e6294ac0208c190c998
push id28234
push usergszorc@mozilla.com
push dateMon, 20 May 2013 02:25:27 +0000
treeherdermozilla-inbound@0e6f9a789727 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs873809
milestone24.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
Bug 873809 - Proper dependencies under pymake; r=khuey
Makefile.in
python/mozbuild/mozbuild/backend/recursivemake.py
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,21 +72,17 @@ export::
 	$(RM) -r $(DIST)/sdk
 	$(MAKE) -C config export
 	$(MAKE) tier_nspr
 
 backend.RecursiveMakeBackend.built:
 	@echo "Updating build backend because of moz.build changes."
 	@$(PYTHON) ./config.status
 
-ifdef .PYMAKE
-includedeps backend.RecursiveMakeBackend.built.pp
-else
 include backend.RecursiveMakeBackend.built.pp
-endif
 
 export MOZBUILD_BACKEND_CHECKED=1
 
 ifdef ENABLE_TESTS
 # Additional makefile targets to call automated test suites
 include $(topsrcdir)/testing/testsuite-targets.mk
 endif
 
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -218,19 +218,19 @@ class RecursiveMakeBackend(BuildBackend)
                 self.summary.managed_count += 1
 
             self._update_from_avoid_write(bf.close())
             self.summary.managed_count += 1
 
         # Write out a dependency file used to determine whether a config.status
         # re-run is needed.
         backend_built_path = os.path.join(self.environment.topobjdir,
-            'backend.%s.built' % self.__class__.__name__)
+            'backend.%s.built' % self.__class__.__name__).replace(os.sep, '/')
         backend_deps = FileAvoidWrite('%s.pp' % backend_built_path)
-        inputs = sorted(self.backend_input_files)
+        inputs = sorted(p.replace(os.sep, '/') for p in self.backend_input_files)
         backend_deps.write('%s: %s\n' % (backend_built_path, ' '.join(inputs)))
         for path in inputs:
             backend_deps.write('%s:\n' % path)
 
         self._update_from_avoid_write(backend_deps.close())
         self.summary.managed_count += 1
 
     def _process_directory_traversal(self, obj, backend_file):