giscanner/sourcescanner.py: Update for Visual C++ usage

Since the Visual C++ (cl.exe) preprocessor does not accept source input
from stdin (the '-' preprocessor flag, we need to use the GCC preprocessor
as a helper here.

Note that the generated dumper program is still compiled and run by
Visual C++.

https://bugzilla.gnome.org/show_bug.cgi?id=681820

diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index db282f84e8c958e360a080f08acf3115b8833bd7..9eb4ab4f4d55955e528c37f882bf7768526bd95d 100644 (file)
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -274,7 +274,16 @@ class SourceScanner(object):
 
         defines = ['__GI_SCANNER__']
         undefs = []
-        cpp_args = os.environ.get('CC', 'cc').split()
+        cpp_exec = os.environ.get('CC', 'cc').split()
+        # The Microsoft compiler/preprocessor (cl) does not accept
+        # source input from stdin (the '-' flag), so we need
+        # some help from gcc from MinGW/Cygwin or so.
+        # Note that the generated dumper program is
+        # still built and linked by Visual C++.
+        if 'cl' in cpp_exec:
+            cpp_args = 'gcc'.split()
+        else:
+            cpp_args = cpp_exec
         cpp_args += ['-E', '-C', '-I.', '-']
 
         cpp_args += self._cpp_options