Changeset 6ef2c11 in mainline for tools

Timestamp:

2010-01-06T20:33:50Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

385a3d6

Parents:

4da7d79 (diff), 23efd30 (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.

Location:

tools

Files:

• checkers/jobfile.py (added)
• checkers/stanse.py (added)
• checkers/stanse/ThreadChecker.xml (moved) (moved from contrib/stanse/ThreadChecker.xml )
• checkers/vcc.py (added)
• jobfile.py (modified) (3 diffs)
• toolchain.sh (moved) (moved from contrib/toolchain.sh ) (1 diff)
• xtui.py (modified) (2 diffs)

tools/jobfile.py

@@ -28 +28 @@
 #
 """
-Add a source/object file pair to a Stanse jobfile
+Add a source/object file pair to a checker jobfile
 """
 
@@ -37 +37 @@
 def usage(prname):
         "Print usage syntax"
-        print prname + " <JOBFILE> <SOURCE> <OBJECT> [OPTIONS ...]"
+        print prname + " <JOBFILE> <SOURCE> <TARGET> <TOOL> <CATEGORY> [OPTIONS ...]"
 
 def main():
-        if (len(sys.argv) < 4):
+        if (len(sys.argv) < 6):
                 usage(sys.argv[0])
                 return
@@ -46 +46 @@
         jobfname = sys.argv[1]
         srcfname = sys.argv[2]
-        objfname = sys.argv[3]
+        tgtfname = sys.argv[3]
+        toolname = sys.argv[4]
+        category = sys.argv[5]
         cwd = os.getcwd()
-        options = " ".join(sys.argv[4:])
+        options = " ".join(sys.argv[6:])
         
         jobfile = file(jobfname, "a")
         fcntl.lockf(jobfile, fcntl.LOCK_EX)
-        jobfile.write("{%s},{%s},{%s},{%s}\n" % (srcfname, objfname, cwd, options))
+        jobfile.write("{%s},{%s},{%s},{%s},{%s},{%s}\n" % (srcfname, tgtfname, toolname, category, cwd, options))
         fcntl.lockf(jobfile, fcntl.LOCK_UN)
         jobfile.close()

tools/toolchain.sh

@@ -1 +1 @@
 #!/bin/bash
 
-# Cross-compiler toolchain build script
-#  by Martin Decky <martin@decky.cz>
-#
-#  GPL'ed, copyleft
+#
+# Copyright (c) 2009 Martin Decky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 

tools/xtui.py

@@ -213 +213 @@
                         sys.stdout.write("Selection[%s]: " % str(position + 1))
                 else:
-                        sys.stdout.write("Selection: ")
+                        if (cnt > 0):
+                                sys.stdout.write("Selection[1]: ")
+                        else:
+                                sys.stdout.write("Selection[0]: ")
                 inp = sys.stdin.readline()
                 
@@ -222 +225 @@
                         if (position != None):
                                 return (None, position)
-                        continue
+                        else:
+                                if (cnt > 0):
+                                        inp = '1'
+                                else:
+                                        inp = '0'
                 
                 if (inp.strip() == 'q'):