equal
deleted
inserted
replaced
54 from distutils.command.install_scripts import install_scripts |
54 from distutils.command.install_scripts import install_scripts |
55 from distutils.spawn import spawn, find_executable |
55 from distutils.spawn import spawn, find_executable |
56 from distutils.ccompiler import new_compiler |
56 from distutils.ccompiler import new_compiler |
57 from distutils.errors import CCompilerError |
57 from distutils.errors import CCompilerError |
58 from distutils.sysconfig import get_python_inc |
58 from distutils.sysconfig import get_python_inc |
|
59 from distutils.version import StrictVersion |
59 |
60 |
60 scripts = ['hg'] |
61 scripts = ['hg'] |
61 if os.name == 'nt': |
62 if os.name == 'nt': |
62 scripts.append('contrib/win32/hg.bat') |
63 scripts.append('contrib/win32/hg.bat') |
63 |
64 |
377 # XCode 4.0 dropped support for ppc architecture, which is hardcoded in |
378 # XCode 4.0 dropped support for ppc architecture, which is hardcoded in |
378 # distutils.sysconfig |
379 # distutils.sysconfig |
379 version = runcmd(['/usr/bin/xcodebuild', '-version'], {}).splitlines()[0] |
380 version = runcmd(['/usr/bin/xcodebuild', '-version'], {}).splitlines()[0] |
380 # Also parse only first digit, because 3.2.1 can't be parsed nicely |
381 # Also parse only first digit, because 3.2.1 can't be parsed nicely |
381 if (version.startswith('Xcode') and |
382 if (version.startswith('Xcode') and |
382 int(version.split()[1].split('.')[0]) >= 4): |
383 StrictVersion(version.split()[1]) >= StrictVersion('4.0')): |
383 os.environ['ARCHFLAGS'] = '-arch i386 -arch x86_64' |
384 os.environ['ARCHFLAGS'] = '-arch i386 -arch x86_64' |
384 |
385 |
385 setup(name='mercurial', |
386 setup(name='mercurial', |
386 version=setupversion, |
387 version=setupversion, |
387 author='Matt Mackall', |
388 author='Matt Mackall', |