Changeset ed63298 in mainline for tools/checkers/vcc.py

Timestamp:

2010-01-05T16:08:57Z (14 years ago)

Author:

U-ALPHA\Administrator <Administrator@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b3d513f

Parents:

679c361

Message:

add more Vcc compatibility preprocessing (by Ondrej Sery)

File:

• tools/checkers/vcc.py (modified) (2 diffs)

tools/checkers/vcc.py

@@ -2 +2 @@
 #
 # Copyright (c) 2010 Martin Decky
+# Copyright (c) 2010 Ondrej Sery
 # All rights reserved.
 #
@@ -51 +52 @@
 
 def preprocess(srcfname, tmpfname, base, options):
-        "Preprocess source using GCC preprocessor"
+        "Preprocess source using GCC preprocessor and compatibility tweaks"
         
         args = ['gcc', '-E']
         args.extend(options.split())
-        args.extend(['-o', tmpfname, srcfname])
+        args.append(srcfname)
+        
+        # Change working directory
         
         cwd = os.getcwd()
         os.chdir(base)
-        retval = subprocess.Popen(args).wait()
+        
+        preproc = subprocess.Popen(args, stdout = subprocess.PIPE).communicate()[0]
+        
+        tmpf = file(tmpfname, "w")
+        
+        for line in preproc.splitlines():
+                # Ignore preprocessor directives
+                if (line.startswith('#')):
+                        continue        
+                
+                tmpf.write("%s\n" % line)
+        
+        tmpf.close()
+        
         os.chdir(cwd)
-        
-        if (retval != 0):
-                return False
         
         return True