Changeset 679c361 in mainline

Timestamp:

2010-01-05T12:57:32Z (15 years ago)

Author:

U-ALPHA\Administrator <Administrator@…>

Branches:

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

Children:

ed63298

Parents:

04c3a21f

Message:

preprocess sources using GCC preprocessor
run Vcc with correct Windows path

File:

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

tools/checkers/vcc.py

@@ -45 +45 @@
         print prname + " <ROOT>"
 
+def cygpath(upath):
+        "Convert Unix (Cygwin) path to Windows path"
+        
+        return subprocess.Popen(['cygpath', '--windows', '--absolute', upath], stdout = subprocess.PIPE).communicate()[0].strip()
+
+def preprocess(srcfname, tmpfname, base, options):
+        "Preprocess source using GCC preprocessor"
+        
+        args = ['gcc', '-E']
+        args.extend(options.split())
+        args.extend(['-o', tmpfname, srcfname])
+        
+        cwd = os.getcwd()
+        os.chdir(base)
+        retval = subprocess.Popen(args).wait()
+        os.chdir(cwd)
+        
+        if (retval != 0):
+                return False
+        
+        return True
+
 def vcc(root, job):
         "Run Vcc on a jobfile"
@@ -80 +102 @@
                         return False
                 
+                tmpfname = "%s.preproc" % srcfname
+                tmpfqname = os.path.join(base, tmpfname)
+                
                 # Only C files are interesting for us
                 if (arg[2] != "cc"):
                         continue
                 
-                # Run Stanse
+                # Preprocess sources
                 
-                retval = subprocess.Popen(['vcc', srcfqname]).wait()
+                if (not preprocess(srcfname, tmpfname, base, options)):
+                        return False
+                
+                # Run Vcc
+                
+                retval = subprocess.Popen(['vcc', cygpath(tmpfqname)]).wait()
+                
+                # Cleanup
+                
+                if (os.path.isfile(tmpfqname)):
+                        os.remove(tmpfqname)
                 
                 if (retval != 0):
                         return False
         
-        return False
+        return True
 
 def main():