mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

Fix running the CMake bootstrap script under Python 2.7

Browse source
This commit is contained in:
Dan Liew 2016-03-03 21:08:39 +00:00
parent d12b558bea
commit 7033ebe6b5
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
contrib/cmake/bootstrap.py
View file

@ -80,7 +80,7 @@ def mk_sym_link(target, linkName):
logging.warning('"{}" overwriting file that is not a symlink'.format(linkName)) logging.warning('"{}" overwriting file that is not a symlink'.format(linkName))
delete_path(linkName) delete_path(linkName)
if os.name == 'posix': if os.name == 'posix':
os.symlink(src=target, dst=linkName) os.symlink(target, linkName)
else: else:
# TODO: Windows does support symlinks but the implementation to do that # TODO: Windows does support symlinks but the implementation to do that
# from python is a little complicated so for now lets just copy everyting # from python is a little complicated so for now lets just copy everyting
@ -160,15 +160,22 @@ def create(useHardLinks):
return False return False
if os.path.exists(fileInRepo): if os.path.exists(fileInRepo):
delete_path(fileInRepo) delete_path(fileInRepo)
os.link(src=fileInContrib, dst=fileInRepo) os.link(fileInContrib, fileInRepo)
else: else:
try: try:
shutil.copy2(src=fileInContrib, dst=fileInRepo) shutil.copy2(src=fileInContrib, dst=fileInRepo)
except shutil.SameFileError as e: except shutil.Error as e:
# Can hit this if used created hard links first and then run again without # Can hit this if used created hard links first and then run again without
# wanting hard links # wanting hard links
if sys.version_info.major <= 2:
logging.error(e.message)
else:
# Python >= 3
if isinstance(e, shutil.SameFileError):
logging.error('Trying to copy "{}" to "{}" but they are the same file'.format( logging.error('Trying to copy "{}" to "{}" but they are the same file'.format(
fileInContrib, fileInRepo)) fileInContrib, fileInRepo))
else:
logging.error(e)
logging.error('You should remove the files using the "remove" mode ' logging.error('You should remove the files using the "remove" mode '
'and try to create again. You probably are mixing the ' 'and try to create again. You probably are mixing the '
'hard-link and non-hard-link create modes') 'hard-link and non-hard-link create modes')