? python3+scons2.1.patch
Index: SConstruct
===================================================================
RCS file: /sources/uracoli/uracoli/SConstruct,v
retrieving revision 1.70
diff -u -w -B -r1.70 SConstruct
--- SConstruct	20 Nov 2010 19:34:49 -0000	1.70
+++ SConstruct	26 Nov 2010 21:22:24 -0000
@@ -265,19 +265,19 @@
 # Build Rules for Boards
 for board in current_boards:
     avr.SConscript('Src/Lib/SConscript',
-                    build_dir = '${dir_build}/%s/lib' % board,
+                    variant_dir = '${dir_build}/%s/lib' % board,
                     exports="avr board",
                     duplicate = 0
                     )
 
     avr.SConscript('Src/App/SConscript',
-                    build_dir = '${dir_build}/%s/app' % board,
+                    variant_dir = '${dir_build}/%s/app' % board,
                     exports="avr board",
                     duplicate = 0
                     )
 
     avr.SConscript('Src/Xmpl/SConscript',
-                    build_dir = '${dir_build}/%s/xmpl' % board,
+                    variant_dir = '${dir_build}/%s/xmpl' % board,
                     exports="avr board",
                     duplicate = 0
                     )
@@ -310,22 +310,22 @@
 
 doc['dox_version'] = doc["VERSION"]
 
-doc.SConscript("Doc/SConscript", build_dir='build/doc',
+doc.SConscript("Doc/SConscript", variant_dir='build/doc',
                exports="doc", duplicate=0)
 
-doc.SConscript("Doc/Usr/SConscript.xmpl", build_dir='build/xdoc',
+doc.SConscript("Doc/Usr/SConscript.xmpl", variant_dir='build/xdoc',
                exports="doc", duplicate=0)
 
-doc.SConscript("Doc/Usr/SConscript", build_dir='build/udoc',
+doc.SConscript("Doc/Usr/SConscript", variant_dir='build/udoc',
                exports="doc", duplicate=0)
 
-doc.SConscript("Doc/App/SConscript", build_dir='build/adoc',
+doc.SConscript("Doc/App/SConscript", variant_dir='build/adoc',
                exports="doc", duplicate=0)
 
-doc.SConscript("Doc/Dev/SConscript", build_dir='build/ddoc',
+doc.SConscript("Doc/Dev/SConscript", variant_dir='build/ddoc',
                exports="doc", duplicate=0)
 
-doc.SConscript("Doc/Contrib/SConscript", build_dir='build/cdoc',
+doc.SConscript("Doc/Contrib/SConscript", variant_dir='build/cdoc',
                exports="doc", duplicate=0)
 
 #=== install ==========================================================
Index: Src/Lib/Inc/timer.h
===================================================================
RCS file: /sources/uracoli/uracoli/Src/Lib/Inc/timer.h,v
retrieving revision 1.7
diff -u -w -B -r1.7 timer.h
--- Src/Lib/Inc/timer.h	2 Jul 2008 21:21:13 -0000	1.7
+++ Src/Lib/Inc/timer.h	26 Nov 2010 21:22:24 -0000
@@ -31,7 +31,7 @@
  * @file
  * @brief Interface for @ref grpTimer.
  *
- * This module is inspired by Jörg Wunschs timer implementation,
+ * This module is inspired by Jorg Wunschs timer implementation,
  * which can be found here: http://sax.sax.de/~joerg/avr-timer/
  *
  */
Index: Tools/h2dot.py
===================================================================
RCS file: /sources/uracoli/uracoli/Tools/h2dot.py,v
retrieving revision 1.3
diff -u -w -B -r1.3 h2dot.py
--- Tools/h2dot.py	25 Jun 2009 21:29:19 -0000	1.3
+++ Tools/h2dot.py	26 Nov 2010 21:22:24 -0000
@@ -81,7 +81,8 @@
         FILE_LIST.append(bname)
         SCANNED_FILES[bname] = lvl
         f = open(fname)
-        for l in f.xreadlines():
+        for l in f:
+            
             try:
                 incfn = re.match('^[ \t]*#[ ]*include ["<]([a-zA-Z0-9_\./]*)[>"]',l).group(1)
                 incf = search_incfile(incfn)
@@ -124,17 +125,17 @@
 
     # search max recursion depth
     maxlvl = 0
-    for f in SCANNED_FILES.keys():
+    for f in list(SCANNED_FILES.keys()):
          l = SCANNED_FILES[f]
          maxlvl = max(l,maxlvl)
 
 
     # print graph
-    print """digraph h2dotgraph {
+    print( """digraph h2dotgraph {
         graph [rankdir="LR",size="14,14"];
         //bgcolor="transparent";
         node [shape = "record"];
-          """
+          """)
 
     for lvl in range(maxlvl+1):
         nodes = []
@@ -142,10 +143,10 @@
             if SCANNED_FILES[f] == lvl:
                 nodes.append(f)
         if len(nodes)>0:
-            nstr = "\n        ".join(map(lambda s : '"%s";' % s, nodes))
-            print "    subgraph lvl_%d {rank=same;\n        %s\n    }" % (lvl, nstr)
+            nstr = "\n        ".join(['"%s";' % s for s in nodes])
+            print(("    subgraph lvl_%d {rank=same;\n        %s\n    }" % (lvl, nstr)))
 
     for s,d in EDGE_LIST:
-        print '    "%s"->"%s";' % (s,d)
-    print "}"
+        print(('    "%s"->"%s";' % (s,d)))
+    print ("}")