This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9362

setup: copy pythonXY.dll next to the hg.exe wrapper when building
ClosedPublic

Authored by mharbison72 on Nov 21 2020, 4:22 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2960b7fac966: setup: copy pythonXY.dll next to the hg.exe wrapper when building
Summary

This avoids the problem of having the newly built binary complaining that it
can't find the DLL. There is an option in the python.org installer to add the
python install to PATH (which defaulted to "on" with py2, and therefore was not
an issue up to this point), but that makes switching between python versions
harder.

This shouldn't be an issue with the PyOxidizer binary, but that current has
issues running some of the tests, and took noticeably longer to build last time
I tried it.

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.

Revision Contents
Changeset List

PathPackages
Msetup.py (18 lines)

Diff 23701

setup.py

if os.name != 'nt': if os.name != 'nt':
return return
if isinstance(self.compiler, HackedMingw32CCompiler): if isinstance(self.compiler, HackedMingw32CCompiler):
self.compiler.compiler_so = self.compiler.compiler # no -mdll self.compiler.compiler_so = self.compiler.compiler # no -mdll
self.compiler.dll_libraries = [] # no -lmsrvc90 self.compiler.dll_libraries = [] # no -lmsrvc90
pythonlib = None pythonlib = None
dir = os.path.dirname(self.get_ext_fullpath('dummy'))
self.hgtarget = os.path.join(dir, 'hg')
if getattr(sys, 'dllhandle', None): if getattr(sys, 'dllhandle', None):
# Different Python installs can have different Python library # Different Python installs can have different Python library
# names. e.g. the official CPython distribution uses pythonXY.dll # names. e.g. the official CPython distribution uses pythonXY.dll
# and MinGW uses libpythonX.Y.dll. # and MinGW uses libpythonX.Y.dll.
_kernel32 = ctypes.windll.kernel32 _kernel32 = ctypes.windll.kernel32
_kernel32.GetModuleFileNameA.argtypes = [ _kernel32.GetModuleFileNameA.argtypes = [
ctypes.c_void_p, ctypes.c_void_p,
ctypes.c_void_p, ctypes.c_void_p,
if filelen > 0 and filelen != size: if filelen > 0 and filelen != size:
dllbasename = os.path.basename(buf.value) dllbasename = os.path.basename(buf.value)
if not dllbasename.lower().endswith(b'.dll'): if not dllbasename.lower().endswith(b'.dll'):
raise SystemExit( raise SystemExit(
'Python DLL does not end with .dll: %s' % dllbasename 'Python DLL does not end with .dll: %s' % dllbasename
) )
pythonlib = dllbasename[:-4] pythonlib = dllbasename[:-4]
# Copy the pythonXY.dll next to the binary so that it runs
# without tampering with PATH.
fsdecode = lambda x: x
if sys.version_info[0] >= 3:
fsdecode = os.fsdecode
dest = os.path.join(
os.path.dirname(self.hgtarget),
fsdecode(dllbasename),
)
if not os.path.exists(dest):
shutil.copy(buf.value, dest)
if not pythonlib: if not pythonlib:
log.warn( log.warn(
'could not determine Python DLL filename; assuming pythonXY' 'could not determine Python DLL filename; assuming pythonXY'
) )
hv = sys.hexversion hv = sys.hexversion
pythonlib = b'python%d%d' % (hv >> 24, (hv >> 16) & 0xFF) pythonlib = b'python%d%d' % (hv >> 24, (hv >> 16) & 0xFF)
log.info('using %s as Python library name' % pythonlib) log.info('using %s as Python library name' % pythonlib)
with open('mercurial/hgpythonlib.h', 'wb') as f: with open('mercurial/hgpythonlib.h', 'wb') as f:
f.write(b'/* this file is autogenerated by setup.py */\n') f.write(b'/* this file is autogenerated by setup.py */\n')
f.write(b'#define HGPYTHONLIB "%s"\n' % pythonlib) f.write(b'#define HGPYTHONLIB "%s"\n' % pythonlib)
macros = None macros = None
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
macros = [('_UNICODE', None), ('UNICODE', None)] macros = [('_UNICODE', None), ('UNICODE', None)]
objects = self.compiler.compile( objects = self.compiler.compile(
['mercurial/exewrapper.c'], ['mercurial/exewrapper.c'],
output_dir=self.build_temp, output_dir=self.build_temp,
macros=macros, macros=macros,
) )
dir = os.path.dirname(self.get_ext_fullpath('dummy'))
self.hgtarget = os.path.join(dir, 'hg')
self.compiler.link_executable( self.compiler.link_executable(
objects, self.hgtarget, libraries=[], output_dir=self.build_temp objects, self.hgtarget, libraries=[], output_dir=self.build_temp
) )
if self.long_paths_support: if self.long_paths_support:
self.addlongpathsmanifest() self.addlongpathsmanifest()
def addlongpathsmanifest(self): def addlongpathsmanifest(self):
r"""Add manifest pieces so that hg.exe understands long paths r"""Add manifest pieces so that hg.exe understands long paths