This is an archive of the discontinued Mercurial Phabricator instance.

Differential D328

setup: Fix installing in a mingw environment
AbandonedPublic

Authored by glandium on Aug 10 2017, 8:52 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
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
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

glandium created this revision.Aug 10 2017, 8:52 PM
quark accepted this revision.Aug 10 2017, 9:01 PM
quark added a subscriber: quark.

Looks good to me. Bonus point if you can remove _ so the variable names match the rest of the code.

glandium added a comment.Aug 10 2017, 9:17 PM

Sorry, I rebased to stable, and that created a new differential: D329, even though I updated the local tag.

quark added a comment.Aug 10 2017, 9:31 PM

@glandium phabsend verifies the tags with old versions on Phabricator (so it requires obsstore to work properly). After D122, it will be possible to phabsend --amend and phabsend will use the commit message to update corresponding diffs.

quark requested changes to this revision.Aug 10 2017, 9:36 PM

D329 is a replacement. Maybe abandon this diff then.

This revision now requires changes to proceed.Aug 10 2017, 9:36 PM
glandium abandoned this revision.Aug 10 2017, 10:16 PM

Revision Contents
Changeset List

PathPackages
Msetup.py (8 lines)

Diff 750

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 mingw32_compiler_class = 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) mingw32_compiler_class.__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 msvc_compiler_class = msvccompiler.MSVCCompiler
class HackedMSVCCompiler(msvccompiler.MSVCCompiler): class HackedMSVCCompiler(msvccompiler.MSVCCompiler):
def initialize(self): def initialize(self):
compiler.initialize(self) msvc_compiler_class.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',