diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-06 10:00:26 (GMT) |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-09-06 10:00:26 (GMT) |
commit | 2596758cb42cb592f2e3c33ef77bc9b02c995510 (patch) | |
tree | 78f8869bfd6ec74755463b0f918d2e24d5972465 /Lib/plat-mac/buildtools.py | |
parent | f01697014f63e3fbe11f73afe789b6205125cb20 (diff) | |
download | cpython-2596758cb42cb592f2e3c33ef77bc9b02c995510.zip cpython-2596758cb42cb592f2e3c33ef77bc9b02c995510.tar.gz cpython-2596758cb42cb592f2e3c33ef77bc9b02c995510.tar.bz2 |
Fix build issues on OSX 10.6 (issue 6802)
Diffstat (limited to 'Lib/plat-mac/buildtools.py')
-rw-r--r-- | Lib/plat-mac/buildtools.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/Lib/plat-mac/buildtools.py b/Lib/plat-mac/buildtools.py index 3480226..f137411 100644 --- a/Lib/plat-mac/buildtools.py +++ b/Lib/plat-mac/buildtools.py @@ -15,7 +15,10 @@ import Carbon.File import MacOS import macostools import macresource -import EasyDialogs +try: + import EasyDialogs +except ImportError: + EasyDialogs = None import shutil @@ -67,9 +70,13 @@ def process(template, filename, destname, copy_codefragment=0, rsrcname=None, others=[], raw=0, progress="default", destroot=""): if progress == "default": - progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120) - progress.label("Compiling...") - progress.inc(0) + if EasyDialogs is None: + print "Compiling %s"%(os.path.split(filename)[1],) + process = None + else: + progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120) + progress.label("Compiling...") + progress.inc(0) # check for the script name being longer than 32 chars. This may trigger a bug # on OSX that can destroy your sourcefile. if '#' in os.path.split(filename)[1]: @@ -119,7 +126,11 @@ def update(template, filename, output): if MacOS.runtimemodel == 'macho': raise BuildError, "No updating yet for MachO applets" if progress: - progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120) + if EasyDialogs is None: + print "Updating %s"%(os.path.split(filename)[1],) + progress = None + else: + progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120) else: progress = None if not output: |