( )⚙ D11356 packaging: reference proper output directory

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11356

packaging: reference proper output directory
ClosedPublic

Authored by indygreg on Aug 27 2021, 1:37 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1e6cb23ce6da: packaging: reference proper output directory
Summary

9438e9b7321a changed the name of the PyOxidizer target, which changed
the name of the output directory. The code changed by this patch
wasn't properly updated by that changeset. This resulted in a run-time
failure due to trying to read from a non-existent directory.

This change should fix the building of Python 3 Inno installers.

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.Aug 27 2021, 1:37 AM
Alphare accepted this revision.Aug 27 2021, 4:35 AM
This revision is now accepted and ready to land.Aug 27 2021, 4:35 AM
indygreg added a commit: rHG1e6cb23ce6da: packaging: reference proper output directory.Aug 27 2021, 5:26 AM
Closed by commit rHG1e6cb23ce6da: packaging: reference proper output directory (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30078

contrib/packaging/hgpackaging/pyoxidizer.py

"""Build Mercurial with PyOxidizer and copy additional files into place. """Build Mercurial with PyOxidizer and copy additional files into place.
After successful completion, ``out_dir`` contains files constituting a After successful completion, ``out_dir`` contains files constituting a
Mercurial install. Mercurial install.
""" """
run_pyoxidizer(source_dir, build_dir, target_triple) run_pyoxidizer(source_dir, build_dir, target_triple)
if "windows" in target_triple:
target = "app_windows"
else:
target = "app_posix"
build_dir = ( build_dir = (
source_dir / "build" / "pyoxidizer" / target_triple / "release" / target source_dir / "build" / "pyoxidizer" / target_triple / "release" / "app"
) )
if out_dir.exists(): if out_dir.exists():
print("purging %s" % out_dir) print("purging %s" % out_dir)
shutil.rmtree(out_dir) shutil.rmtree(out_dir)
# Now assemble all the files from PyOxidizer into the staging directory. # Now assemble all the files from PyOxidizer into the staging directory.
shutil.copytree(build_dir, out_dir) shutil.copytree(build_dir, out_dir)