This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6135

packaging: don't bundle DLLs in py2exe library.zip for x86 builds
ClosedPublic

Authored by indygreg on Mar 14 2019, 9:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd6e3c16d48ab: packaging: don't bundle DLLs in py2exe library.zip for x86 builds
Summary

I had ported the x86/x64 behavior difference from the Inno
Setup installer files. Why things were this way, I'm not sure.

The WiX configuration files are expecting to have standalone
DLL files for both configurations. And the 32-bit WiX installers
were broken due to missing DLLs.

Let's standardize on standalone DLL files on all configurations
for consistency. I /think/ this will be faster, as I /think/
py2exe binaries would have to extract the DLL to a temporary file
in order to load it. But I'm not 100% sure about that.

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

indygreg created this revision.Mar 14 2019, 9:39 PM
Closed by commit rHGd6e3c16d48ab: packaging: don't bundle DLLs in py2exe library.zip for x86 builds (authored by indygreg). · Explain WhyMar 15 2019, 11:11 PM
This revision was automatically updated to reflect the committed changes.
indygreg added a comment.Mar 16 2019, 1:39 PM

According to a private email, things were inconsistent because py2exe didn't (doesn't?) support bundling DLLs in the zip several years ago, so things *had* to be a certain way.

I haven't tested things today, but py2exe does have code to load DLLs from a memory location. So it /might/ be loading from the zip without filesystem I/O. If it does, we may want to change this to level 2 by default.

It's not a big deal though and can be done as a follow-up.

Revision Contents
Changeset List

Diff 14515

contrib/packaging/hgpackaging/py2exe.py

# Register location of msgfmt and other binaries. # Register location of msgfmt and other binaries.
env['PATH'] = '%s%s%s' % ( env['PATH'] = '%s%s%s' % (
env['PATH'], os.pathsep, str(gettext_root / 'bin')) env['PATH'], os.pathsep, str(gettext_root / 'bin'))
print('building Mercurial') print('building Mercurial')
subprocess.run( subprocess.run(
[str(venv_python), 'setup.py', [str(venv_python), 'setup.py',
'py2exe', '-b', '3' if vc_x64 else '2', 'py2exe',
'build_doc', '--html'], 'build_doc', '--html'],
cwd=str(source_dir), cwd=str(source_dir),
env=env, env=env,
check=True) check=True)

contrib/packaging/inno/mercurial.iss

Source: contrib\xml.rnc; DestDir: {app}/Contrib Source: contrib\xml.rnc; DestDir: {app}/Contrib
Source: contrib\mercurial.el; DestDir: {app}/Contrib Source: contrib\mercurial.el; DestDir: {app}/Contrib
Source: contrib\mq.el; DestDir: {app}/Contrib Source: contrib\mq.el; DestDir: {app}/Contrib
Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib
Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib
Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local') Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
#if ARCH == "x64"
Source: dist\lib\*.dll; Destdir: {app}\lib Source: dist\lib\*.dll; Destdir: {app}\lib
Source: dist\lib\*.pyd; Destdir: {app}\lib Source: dist\lib\*.pyd; Destdir: {app}\lib
#endif
Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist
Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist
Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist
Source: dist\lib\library.zip; DestDir: {app}\lib Source: dist\lib\library.zip; DestDir: {app}\lib
Source: doc\*.html; DestDir: {app}\Docs Source: doc\*.html; DestDir: {app}\Docs
Source: doc\style.css; DestDir: {app}\Docs Source: doc\style.css; DestDir: {app}\Docs
Source: mercurial\help\*.txt; DestDir: {app}\help Source: mercurial\help\*.txt; DestDir: {app}\help
Source: mercurial\help\internals\*.txt; DestDir: {app}\help\internals Source: mercurial\help\internals\*.txt; DestDir: {app}\help\internals

setup.py

packages=packages, packages=packages,
ext_modules=extmodules, ext_modules=extmodules,
data_files=datafiles, data_files=datafiles,
package_data=packagedata, package_data=packagedata,
cmdclass=cmdclass, cmdclass=cmdclass,
distclass=hgdist, distclass=hgdist,
options={ options={
'py2exe': { 'py2exe': {
'bundle_files': 3,
'dll_excludes': py2exedllexcludes, 'dll_excludes': py2exedllexcludes,
'excludes': py2exeexcludes, 'excludes': py2exeexcludes,
'packages': py2exepackages, 'packages': py2exepackages,
}, },
'bdist_mpkg': { 'bdist_mpkg': {
'zipdist': False, 'zipdist': False,
'license': 'COPYING', 'license': 'COPYING',
'readme': 'contrib/packaging/macosx/Readme.html', 'readme': 'contrib/packaging/macosx/Readme.html',
'welcome': 'contrib/packaging/macosx/Welcome.html', 'welcome': 'contrib/packaging/macosx/Welcome.html',
}, },
}, },
**extra) **extra)