Bug 1402012 - Use PartialConfigEnvironment in process_define_files.py; r=glandium

This removes the dependency on config.status for CONFIGURE_DEFINE_FILES.
Instead, each file depends on the specific configure values that it
uses.

MozReview-Commit-ID: H4oLmJei1KR

--HG--
extra : rebase_source : 287498e8c336d24b1c95d29caf97e5febb56063b

python/mozbuild/mozbuild/action/process_define_files.py

@@ -8,8 +8,8 @@ import argparse
 import os
 import re
 import sys
-from buildconfig import topobjdir
-from mozbuild.backend.configenvironment import ConfigEnvironment
+from buildconfig import topsrcdir, topobjdir
+from mozbuild.backend.configenvironment import PartialConfigEnvironment
 from mozbuild.util import FileAvoidWrite
 import mozpack.path as mozpath
 
@@ -30,14 +30,12 @@ def process_define_file(output, input):
 
     path = os.path.abspath(input)
 
-    config = ConfigEnvironment.from_config_status(
-        mozpath.join(topobjdir, 'config.status'))
+    config = PartialConfigEnvironment(topobjdir)
 
     if mozpath.basedir(path,
-                       [mozpath.join(config.topsrcdir, 'js/src')]) and \
+                       [mozpath.join(topsrcdir, 'js/src')]) and \
             not config.substs.get('JS_STANDALONE'):
-        config = ConfigEnvironment.from_config_status(
-            mozpath.join(topobjdir, 'js', 'src', 'config.status'))
+        config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
 
     with open(path, 'rU') as input:
         r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
@@ -47,7 +45,7 @@ def process_define_file(output, input):
                 cmd = m.group('cmd')
                 name = m.group('name')
                 value = m.group('value')
-                if name:
+                if name and cmd != 'endif':
                     if name == 'ALLDEFINES':
                         if cmd == 'define':
                             raise Exception(
@@ -55,8 +53,7 @@ def process_define_file(output, input):
                                 'CONFIGURE_DEFINE_FILE')
                         defines = '\n'.join(sorted(
                             '#define %s %s' % (name, val)
-                            for name, val in config.defines.iteritems()
-                            if name not in config.non_global_defines))
+                            for name, val in config.defines['ALLDEFINES'].iteritems()))
                         l = l[:m.start('cmd') - 1] \
                             + defines + l[m.end('name'):]
                     elif name in config.defines:
@@ -76,7 +73,9 @@ def process_define_file(output, input):
 
             output.write(l)
 
-    return {path, config.source}
+    deps = {path}
+    deps.update(config.get_dependencies())
+    return deps
 
 
 def main(argv):