This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10301

setup: copy python3.dll next to hg.exe when building on Windows for hgext.git
ClosedPublic

Authored by mharbison72 on Apr 3 2021, 11:12 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGed286d150aa8: setup: copy python3.dll next to hg.exe when building on Windows for hgext.git

Summary

I thought I took care of this already, but it must have been that I just
manually copied the file over locally when debugging why the pygit2 library
wasn't loading. The problem with that is what was copied over was from py38,
and then running a py39 build hard crashed when the extension was loaded.

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

mharbison72 created this revision.Apr 3 2021, 11:12 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 3 2021, 11:12 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

mharbison72 added a child revision: D10310: tests: restore the ability to run `black` on Windows.Apr 5 2021, 1:16 PM

pulkit accepted this revision.Apr 8 2021, 1:01 PM

This revision is now accepted and ready to land.Apr 8 2021, 1:01 PM

mharbison72 added a commit: rHGed286d150aa8: setup: copy python3.dll next to hg.exe when building on Windows for hgext.git.Apr 8 2021, 2:17 PM

Closed by commit rHGed286d150aa8: setup: copy python3.dll next to hg.exe when building on Windows for hgext.git (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

mharbison72 added a reverting change: D11455: setup: stop packaging python3.dll and python3X.dll in the wheel distribution.Sep 19 2021, 2:28 PM

mharbison72 added a reverting change: rHGf78d8b8c46d7: setup: stop packaging python3.dll and python3X.dll in the wheel distribution.Oct 12 2021, 1:19 PM

Revision Contents
Changeset List

			Path	Packages
M			setup.py (16 lines)

Status	Author	Revision
Closed	mharbison72	D10312 tests: skip test-git-interop.t on Windows
Closed	mharbison72	D10311 contrib: restore the `hg fix` configuration in the examples
Closed	mharbison72	D10310 tests: restore the ability to run `black` on Windows
Closed	mharbison72	D10301 setup: copy python3.dll next to hg.exe when building on Windows for hgext.git
Closed	mharbison72	D10300 tests: stablize test-hook.t on Windows
Closed	mharbison72	D10299 tests: handle Windows file separator differences in test-config.t
Closed	mharbison72	D10298 tests: update the detailed exit codes for icasefs gated tests
Closed	mharbison72	D10297 tests: update the detailed exit codes in test-phabricator.t

Diff 26718

setup.py

	dest = os.path.join(			dest = os.path.join(
	os.path.dirname(self.hgtarget),			os.path.dirname(self.hgtarget),
	fsdecode(dllbasename),			fsdecode(dllbasename),
	)			)

	if not os.path.exists(dest):			if not os.path.exists(dest):
	shutil.copy(buf.value, 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)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26648		Apr 3 2021, 11:11 PM	★	★
Diff 2	26718	rHGed286d150aa89d742a24015be22f0b1c36855697	Apr 3 2021, 9:15 PM	★	★