Changeset efedee77 in mainline for tools/autotool.py

Timestamp:

2010-11-02T22:38:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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/autotool.py (modified) (6 diffs)

tools/autotool.py

@@ -75 +75 @@
         "Read HelenOS build configuration"
         
-        inf = file(fname, 'r')
+        inf = open(fname, 'r')
         
         for line in inf:
@@ -191 +191 @@
         check_common(common, "CC")
         
-        outf = file(PROBE_SOURCE, 'w')
+        outf = open(PROBE_SOURCE, 'w')
         outf.write(PROBE_HEAD)
         
@@ -212 +212 @@
         if (not os.path.isfile(PROBE_OUTPUT)):
                 sys.stderr.write("failed\n")
-                print output[1]
+                print(output[1])
                 print_error(["Error executing \"%s\"." % " ".join(args),
                              "The compiler did not produce the output file \"%s\"." % PROBE_OUTPUT,
@@ -221 +221 @@
         sys.stderr.write("ok\n")
         
-        inf = file(PROBE_OUTPUT, 'r')
+        inf = open(PROBE_OUTPUT, 'r')
         lines = inf.readlines()
         inf.close()
@@ -343 +343 @@
         "Create makefile output"
         
-        outmk = file(mkname, 'w')
+        outmk = open(mkname, 'w')
         
         outmk.write('#########################################\n')
@@ -357 +357 @@
         "Create header output"
         
-        outhd = file(hdname, 'w')
+        outhd = open(hdname, 'w')
         
         outhd.write('/***************************************\n')