diff options
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/msi.py | 9 | ||||
| -rw-r--r-- | Tools/msi/uuids.py | 2 | ||||
| -rwxr-xr-x | Tools/pybench/pybench.py | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | Tools/scripts/byext.py | 0 | ||||
| -rwxr-xr-x | Tools/scripts/findnocoding.py | 2 | ||||
| -rw-r--r-- | Tools/scripts/pysource.py | 2 |
6 files changed, 20 insertions, 4 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 8a72eb9..c49bb84 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -872,6 +872,12 @@ def add_files(db): version=version, language=lang) tmpfiles.append("msvcr71.dll") + # Check if _ctypes.pyd exists + have_ctypes = os.path.exists(srcdir+"/PCBuild/_ctypes.pyd") + if not have_ctypes: + print "WARNING: _ctypes.pyd not found, ctypes will not be included" + extensions.remove("_ctypes.pyd") + # Add all .py files in Lib, except lib-tk, test dirs={} pydirs = [(root,"Lib")] @@ -889,6 +895,8 @@ def add_files(db): # data: Lib/email/test # output: Lib/test testsuite.set_current() + elif not have_ctypes and dir == "ctypes": + continue else: default_feature.set_current() lib = PyDirectory(db, cab, parent, dir, dir, "%s|%s" % (parent.make_short(dir), dir)) @@ -913,6 +921,7 @@ def add_files(db): lib.add_file("185test.db") lib.add_file("audiotest.au") lib.add_file("cfgparser.1") + lib.add_file("sgml_input.html") lib.add_file("test.xml") lib.add_file("test.xml.out") lib.add_file("testtar.tar") diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py index 3064975..0939649 100644 --- a/Tools/msi/uuids.py +++ b/Tools/msi/uuids.py @@ -22,6 +22,8 @@ product_codes = { '2.4.2150':'{b191e49c-ea23-43b2-b28a-14e0784069b8}', # 2.4.2 '2.4.3121':'{f669ed4d-1dce-41c4-9617-d985397187a1}', # 2.4.3c1 '2.4.3150':'{75e71add-042c-4f30-bfac-a9ec42351313}', # 2.4.3 + '2.4.4121':'{cd2862db-22a4-4688-8772-85407ea21550}', # 2.4.4c1 + '2.4.4150':'{60e2c8c9-6cf3-4b1a-9618-e304946c94e6}', # 2.4.4 '2.5.101': '{bc14ce3e-5e72-4a64-ac1f-bf59a571898c}', # 2.5a1 '2.5.102': '{5eed51c1-8e9d-4071-94c5-b40de5d49ba5}', # 2.5a2 '2.5.103': '{73dcd966-ffec-415f-bb39-8342c1f47017}', # 2.5a3 diff --git a/Tools/pybench/pybench.py b/Tools/pybench/pybench.py index 370175a..392ff50 100755 --- a/Tools/pybench/pybench.py +++ b/Tools/pybench/pybench.py @@ -885,7 +885,7 @@ python pybench.py -s p25.pybench -c p21.pybench else: bench.print_benchmark(hidenoise=hidenoise, limitnames=limitnames) - except IOError: + except IOError, reason: print '* Error opening/reading file %s: %s' % ( repr(show_bench), reason) @@ -931,8 +931,13 @@ python pybench.py -s p25.pybench -c p21.pybench bench.name = reportfile pickle.dump(bench,f) f.close() - except IOError: + except IOError, reason: print '* Error opening/writing reportfile' + except IOError, reason: + print '* Error opening/writing reportfile %s: %s' % ( + reportfile, + reason) + print if __name__ == '__main__': PyBenchCmdline() diff --git a/Tools/scripts/byext.py b/Tools/scripts/byext.py index 09610b0..09610b0 100644..100755 --- a/Tools/scripts/byext.py +++ b/Tools/scripts/byext.py diff --git a/Tools/scripts/findnocoding.py b/Tools/scripts/findnocoding.py index e8fc619..537f0a1 100755 --- a/Tools/scripts/findnocoding.py +++ b/Tools/scripts/findnocoding.py @@ -5,7 +5,7 @@ Usage: nocoding.py dir1 [dir2...] """ -__author__ = "Oleg Broytmann, Reinhold Birkenfeld" +__author__ = "Oleg Broytmann, Georg Brandl" import sys, os, re, getopt diff --git a/Tools/scripts/pysource.py b/Tools/scripts/pysource.py index d5eb515..71e0ded 100644 --- a/Tools/scripts/pysource.py +++ b/Tools/scripts/pysource.py @@ -15,7 +15,7 @@ The file also must be of appropriate size - not bigger than a megabyte. walk_python_files() recursively lists all Python files under the given directories. """ -__author__ = "Oleg Broytmann, Reinhold Birkenfeld" +__author__ = "Oleg Broytmann, Georg Brandl" __all__ = ["has_python_ext", "looks_like_python", "can_be_compiled", "walk_python_files"] |