Issue #1497 - Re-implement an un-preprocessed file check

1 files changed, 19 insertions, 0 deletions

diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index 6e57ab5ae..bd3fbe921 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -541,6 +541,25 @@ class Build(MachCommandBase):
                 # as when doing OSX Universal builds)
                 pass
 
+        # Check for un-preprocessed files.. In case something goes wrong it will be noted
+        ppcheck_script = mozpath.join(self.topsrcdir, "build", "ppCheck.py")
+        ppcheck_path = mozpath.join(self.topobjdir, "dist", "bin")
+        if not os.path.exists(ppcheck_script):
+            ppcheck_script = mozpath.join(self.topsrcdir, "mozilla", "build", "ppCheck.py")
+
+        if not os.path.exists(ppcheck_script):
+            ppcheck_script = mozpath.join(self.topsrcdir, "platform", "build", "ppCheck.py")
+        else:
+            ppcheck_script = None
+        
+        if ppcheck_script:
+            ppcheck_cmd = [which.which("python2.7"), ppcheck_script, ppcheck_path]
+            ppcheck_result = subprocess.call(ppcheck_cmd, cwd=self.topsrcdir)
+        
+        if not ppcheck_script or ppcheck_result: 
+            print("\nWARNING: Something has gone wrong with the check for un-preprocessed files. " +
+                  "Please manually verify that files are properly preprocessed.")
+
         return status
 
     @Command('configure', category='build',