| mharbison72 |
| hg-reviewers |
This and the following backout exist because the original patches break the
Windows CI for some yet unknown reason.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | setup.py (34 lines) |
| 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) | |||||
| # Also overwrite python3.dll so that hgext.git is usable. | |||||
| # TODO: also handle the MSYS flavor | |||||
| if sys.version_info[0] >= 3: | |||||
| python_x = os.path.join( | |||||
| os.path.dirname(fsdecode(buf.value)), | |||||
| "python3.dll", | |||||
| ) | |||||
| if os.path.exists(python_x): | |||||
| dest = os.path.join( | |||||
| os.path.dirname(self.hgtarget), | |||||
| os.path.basename(python_x), | |||||
| ) | |||||
| shutil.copy(python_x, 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 | ||||