Changeset 60898b6 in mainline for tools/checkers/vcc.py

Timestamp:

2010-11-05T16:17:48Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

08042bd

Parents:

a63ff7d (diff), a66e2993 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

tools/checkers/vcc.py

@@ -49 +49 @@
 def usage(prname):
         "Print usage syntax"
-        print prname + " <ROOT> [VCC_PATH]"
+        print(prname + " <ROOT> [VCC_PATH]")
 
 def cygpath(upath):
@@ -72 +72 @@
         preproc = subprocess.Popen(args, stdout = subprocess.PIPE).communicate()[0]
         
-        tmpf = file(tmpfname, "w")
+        tmpf = open(tmpfname, "w")
         tmpf.write(specification)
         
@@ -108 +108 @@
         
         if (not os.path.isfile(inname)):
-                print "Unable to open %s" % inname
-                print "Did you run \"make precheck\" on the source tree?"
+                print("Unable to open %s" % inname)
+                print("Did you run \"make precheck\" on the source tree?")
                 return False
         
-        inf = file(inname, "r")
+        inf = open(inname, "r")
         records = inf.read().splitlines()
         inf.close()
@@ -122 +122 @@
                 
                 if (len(arg) < 6):
-                        print "Not enought jobfile record arguments"
+                        print("Not enough jobfile record arguments")
                         return False
                 
@@ -134 +134 @@
                 srcfqname = os.path.join(base, srcfname)
                 if (not os.path.isfile(srcfqname)):
-                        print "Source %s not found" % srcfqname
+                        print("Source %s not found" % srcfqname)
                         return False
                 
@@ -153 +153 @@
                 
                 # Run Vcc
-                print " -- %s --" % srcfname            
+                print(" -- %s --" % srcfname)
                 retval = subprocess.Popen([vcc_path, '/pointersize:32', '/newsyntax', cygpath(tmpfqname)]).wait()
                 
@@ -182 +182 @@
         
         if (not os.path.isfile(vcc_path)):
-                print "%s is not a binary." % vcc_path
-                print "Please supply the full Cygwin path to Vcc as the second argument."
+                print("%s is not a binary." % vcc_path)
+                print("Please supply the full Cygwin path to Vcc as the second argument.")
                 return
         
@@ -189 +189 @@
         
         if (not os.path.isfile(config)):
-                print "%s not found." % config
-                print "Please specify the path to HelenOS build tree root as the first argument."
+                print("%s not found." % config)
+                print("Please specify the path to HelenOS build tree root as the first argument.")
                 return
         
         specpath = os.path.join(rootdir, "tools/checkers/vcc.h")
         if (not os.path.isfile(specpath)):
-                print "%s not found." % config
+                print("%s not found." % config)
                 return
         
@@ -205 +205 @@
                 if (not vcc(vcc_path, rootdir, job)):
                         print
-                        print "Failed job: %s" % job
+                        print("Failed job: %s" % job)
                         return
         
         print
-        print "All jobs passed"
+        print("All jobs passed")
 
 if __name__ == '__main__':