mercurial-scm/hg-stable: setup.py comparison

comparison setup.py @ 17225:a06e2681dd17 stable 2.3-rc

merge default into stable for 2.3 code freeze

author	Matt Mackall <mpm@selenic.com>
date	Wed, 18 Jul 2012 19:08:25 -0500
parents	d13f47c800fd
children	bf5bb38bcc7c

comparison

equal deleted inserted replaced

-:98823bd0d697
+:a06e2681dd17
 # Solaris Python packaging brain damage
 try:
 import hashlib
 sha = hashlib.sha1()
-except:
+except ImportError:
 try:
 import sha
-except:
+except ImportError:
 raise SystemExit(
 "Couldn't import standard hashlib (incomplete Python install).")
 try:
 import zlib
-except:
+except ImportError:
 raise SystemExit(
 "Couldn't import standard zlib (incomplete Python install).")
 # The base IronPython distribution (as of 2.7.1) doesn't support bz2
 isironpython = False
 try:
-isironpython = platform.python_implementation().lower().find("ironpython") != -1
+isironpython = (platform.python_implementation()
-except:
+.lower().find("ironpython") != -1)
+except AttributeError:
 pass
 if isironpython:
 sys.stderr.write("warning: IronPython detected (no bz2 support)\n")
 else:
 try:
 import bz2
-except:
+except ImportError:
 raise SystemExit(
 "Couldn't import standard bz2 (incomplete Python install).")
 import os, subprocess, time
 import shutil
 from distutils.command.build_ext import build_ext
 from distutils.command.build_py import build_py
 from distutils.command.install_scripts import install_scripts
 from distutils.spawn import spawn, find_executable
 from distutils.ccompiler import new_compiler
+from distutils import cygwinccompiler
 from distutils.errors import CCompilerError, DistutilsExecError
 from distutils.sysconfig import get_python_inc
 from distutils.version import StrictVersion
 convert2to3 = '--c2to3' in sys.argv
 devnull = open('/dev/null', 'w')
 oldstderr = os.dup(sys.stderr.fileno())
 os.dup2(devnull.fileno(), sys.stderr.fileno())
 objects = cc.compile([fname], output_dir=tmpdir)
 cc.link_executable(objects, os.path.join(tmpdir, "a.out"))
-except:
+except Exception:
 return False
 return True
 finally:
 if oldstderr is not None:
 os.dup2(oldstderr, sys.stderr.fileno())
 class hgbuild(build):
 # Insert hgbuildmo first so that files in mercurial/locale/ are found
 # when build_py is run next.
 sub_commands = [('build_mo', None),
-# We also need build_ext before build_py. Otherwise, when 2to3 is called (in
-# build_py), it will not find osutil & friends, thinking that those modules are
+# We also need build_ext before build_py. Otherwise, when 2to3 is
-# global and, consequently, making a mess, now that all module imports are
+# called (in build_py), it will not find osutil & friends,
-# global.
+# thinking that those modules are global and, consequently, making
+# a mess, now that all module imports are global.
 ('build_ext', build.has_ext_modules),
 ] + build.sub_commands
 class hgbuildmo(build):
 if ext.name.startswith("mercurial."):
 self.py_modules.append("mercurial.pure.%s" % ext.name[10:])
 self.distribution.ext_modules = []
 else:
 if not os.path.exists(os.path.join(get_python_inc(), 'Python.h')):
-raise SystemExit("Python headers are required to build Mercurial")
+raise SystemExit('Python headers are required to build '
+'Mercurial')
 def find_modules(self):
 modules = build_py.find_modules(self)
 for module in modules:
 if module[0] == "mercurial.pure":
 f = open(self._indexfilename, 'w')
 f.write('# this file is autogenerated by setup.py\n')
 f.write('docs = ')
 f.write(out)
 f.close()
+class buildhgexe(build_ext):
+description = 'compile hg.exe from mercurial/exewrapper.c'
+def build_extensions(self):
+if os.name != 'nt':
+return
+objects = self.compiler.compile(['mercurial/exewrapper.c'],
+output_dir=self.build_temp)
+dir = os.path.dirname(self.get_ext_fullpath('dummy'))
+target = os.path.join(dir, 'hg')
+self.compiler.link_executable(objects, target,
+output_dir=self.build_temp)
 class hginstallscripts(install_scripts):
 '''
 This is a specialization of install_scripts that replaces the @LIBDIR@ with
 the configured directory for modules. If possible, the path is made relative
 cmdclass = {'build': hgbuild,
 'build_mo': hgbuildmo,
 'build_ext': hgbuildext,
 'build_py': hgbuildpy,
 'build_hgextindex': buildhgextindex,
-'install_scripts': hginstallscripts}
+'install_scripts': hginstallscripts,
+'build_hgexe': buildhgexe,
-packages = ['mercurial', 'mercurial.hgweb',
+}
-'mercurial.httpclient', 'mercurial.httpclient.tests',
+packages = ['mercurial', 'mercurial.hgweb', 'mercurial.httpclient',
 'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf',
 'hgext.largefiles']
 pymodules = []
 if sys.platform == 'win32' and sys.version_info < (2, 5, 0, 'final'):
 pymodules.append('mercurial.pure.osutil')
 else:
 extmodules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'],
 extra_link_args=osutil_ldflags))
+# the -mno-cygwin option has been deprecated for years
+Mingw32CCompiler = cygwinccompiler.Mingw32CCompiler
+class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler):
+def __init__(self, *args, **kwargs):
+Mingw32CCompiler.__init__(self, *args, **kwargs)
+for i in 'compiler compiler_so linker_exe linker_so'.split():
+try:
+getattr(self, i).remove('-mno-cygwin')
+except ValueError:
+pass
+cygwinccompiler.Mingw32CCompiler = HackedMingw32CCompiler
 if sys.platform.startswith('linux') and os.uname()[2] > '2.6':
 # The inotify extension is only usable with Linux 2.6 kernels.
 # You also need a reasonably recent C library.
 # In any case, if it fails to build the error will be skipped ('optional').

Mercurial > public > mercurial-scm > hg-stable

comparison setup.py @ 17225:a06e2681dd17 stable 2.3-rc