This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7160

packaging: remove hg.exe.local file
ClosedPublic

Authored by indygreg on Oct 23 2019, 9:54 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG24633444ff32: packaging: remove hg.exe.local file
rHGe8ab29e57d40: packaging: remove hg.exe.local file
Summary

<exe>.local files are used by Windows to set up DLL
redirection. But these files are ignored if you embed an
application manifest in your binary, which we do.

So the existence of this file serves no purpose. So we remove
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.

Event Timeline

indygreg created this revision.Oct 23 2019, 9:54 PM
mharbison72 added a subscriber: mharbison72.Oct 24 2019, 3:04 PM

From the referenced URL:

If the application has a manifest, then any .local files are ignored.

We seem to add a manifest now, so maybe this can go away instead?

indygreg abandoned this revision.Oct 24 2019, 11:28 PM
In D7160#105267, @mharbison72 wrote:

From the referenced URL:

If the application has a manifest, then any .local files are ignored.

We seem to add a manifest now, so maybe this can go away instead?

Nice catch!

I confirmed that we are embedding an application manifest in hg.exe. So we can delete this file. I'll update the series.

indygreg reclaimed this revision.Oct 24 2019, 11:28 PM
indygreg retitled this revision from packaging: create empty hg.exe.local file to packaging: remove hg.exe.local file.Oct 24 2019, 11:34 PM
indygreg edited the summary of this revision. (Show Details)
indygreg updated this revision to Diff 17399.
mharbison72 accepted this revision.Oct 24 2019, 11:47 PM

<exe>.manifest files are used by Windows to set up DLL

s/manifest/local/ ?

indygreg edited the summary of this revision. (Show Details)Oct 25 2019, 12:22 AM
indygreg added a commit: rHGe8ab29e57d40: packaging: remove hg.exe.local file.Nov 8 2019, 7:04 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe8ab29e57d40: packaging: remove hg.exe.local file (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 17812

contrib/packaging/hgpackaging/inno.py

'dulwich', 'dulwich',
'keyring', 'keyring',
'pygments', 'pygments',
'win32ctypes', 'win32ctypes',
} }
PACKAGE_FILES_METADATA = { PACKAGE_FILES_METADATA = {
'ReadMe.html': 'Flags: isreadme', 'ReadMe.html': 'Flags: isreadme',
'hg.exe': "AfterInstall: Touch('{app}\\hg.exe.local')",
} }
def build( def build(
source_dir: pathlib.Path, source_dir: pathlib.Path,
build_dir: pathlib.Path, build_dir: pathlib.Path,
python_exe: pathlib.Path, python_exe: pathlib.Path,
iscc_exe: pathlib.Path, iscc_exe: pathlib.Path,

contrib/packaging/inno/mercurial.iss

[INI] [INI]
Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: https://mercurial-scm.org/ Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: https://mercurial-scm.org/
Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad
[UninstallDelete] [UninstallDelete]
Type: files; Name: {app}\Mercurial.url Type: files; Name: {app}\Mercurial.url
Type: filesandordirs; Name: {app}\default.d Type: filesandordirs; Name: {app}\default.d
Type: files; Name: "{app}\hg.exe.local"
[Icons] [Icons]
Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html
Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html
Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html
Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url