This is an archive of the discontinued Mercurial Phabricator instance.

Differential D329

setup: Fix installing in a mingw environment
ClosedPublic

Authored by glandium on Aug 10 2017, 9:16 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG7686cbb0ba41: setup: fix installing in a mingw environment
Summary

The addition, in 9a4adc76c88a, of a hack for the MSVC compiler class was
overwriting the original class for the Mingw32CCompiler class, leading to an
error when the HackedMingw32CCompiler is instantiated.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

glandium created this revision.Aug 10 2017, 9:16 PM
quark accepted this revision.Aug 10 2017, 9:35 PM
durin42 added a subscriber: durin42.Aug 11 2017, 2:41 PM

Should we put this on stable?

glandium added a comment.Aug 11 2017, 5:34 PM

4.3.1 can't currently be installed with MINGW64 python currently because of this, so I'd say yes.

Closed by commit rHG7686cbb0ba41: setup: fix installing in a mingw environment (authored by glandium). · Explain WhyAug 12 2017, 10:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msetup.py (8 lines)

Diff 828

setup.py

sys.path.insert(0, 'contrib/python-zstandard') sys.path.insert(0, 'contrib/python-zstandard')
import setup_zstd import setup_zstd
extmodules.append(setup_zstd.get_c_extension(name='mercurial.zstd')) extmodules.append(setup_zstd.get_c_extension(name='mercurial.zstd'))
try: try:
from distutils import cygwinccompiler from distutils import cygwinccompiler
# the -mno-cygwin option has been deprecated for years # the -mno-cygwin option has been deprecated for years
compiler = cygwinccompiler.Mingw32CCompiler mingw32compilerclass = cygwinccompiler.Mingw32CCompiler
class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler): class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
compiler.__init__(self, *args, **kwargs) mingw32compilerclass.__init__(self, *args, **kwargs)
for i in 'compiler compiler_so linker_exe linker_so'.split(): for i in 'compiler compiler_so linker_exe linker_so'.split():
try: try:
getattr(self, i).remove('-mno-cygwin') getattr(self, i).remove('-mno-cygwin')
except ValueError: except ValueError:
pass pass
cygwinccompiler.Mingw32CCompiler = HackedMingw32CCompiler cygwinccompiler.Mingw32CCompiler = HackedMingw32CCompiler
except ImportError: except ImportError:
# the cygwinccompiler package is not available on some Python # the cygwinccompiler package is not available on some Python
# distributions like the ones from the optware project for Synology # distributions like the ones from the optware project for Synology
# DiskStation boxes # DiskStation boxes
class HackedMingw32CCompiler(object): class HackedMingw32CCompiler(object):
pass pass
if os.name == 'nt': if os.name == 'nt':
# Allow compiler/linker flags to be added to Visual Studio builds. Passing # Allow compiler/linker flags to be added to Visual Studio builds. Passing
# extra_link_args to distutils.extensions.Extension() doesn't have any # extra_link_args to distutils.extensions.Extension() doesn't have any
# effect. # effect.
from distutils import msvccompiler from distutils import msvccompiler
compiler = msvccompiler.MSVCCompiler msvccompilerclass = msvccompiler.MSVCCompiler
class HackedMSVCCompiler(msvccompiler.MSVCCompiler): class HackedMSVCCompiler(msvccompiler.MSVCCompiler):
def initialize(self): def initialize(self):
compiler.initialize(self) msvccompilerclass.initialize(self)
# "warning LNK4197: export 'func' specified multiple times" # "warning LNK4197: export 'func' specified multiple times"
self.ldflags_shared.append('/ignore:4197') self.ldflags_shared.append('/ignore:4197')
self.ldflags_shared_debug.append('/ignore:4197') self.ldflags_shared_debug.append('/ignore:4197')
msvccompiler.MSVCCompiler = HackedMSVCCompiler msvccompiler.MSVCCompiler = HackedMSVCCompiler
packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo', packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo',
'help/*.txt', 'help/*.txt',