Patchwork D11356: packaging: reference proper output directory

login
register
mail settings
Submitter phabricator
Date Aug. 27, 2021, 5:38 a.m.
Message ID <differential-rev-PHID-DREV-fkm2p4oz4o7gxjer4cin-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49671/
State Superseded
Headers show

Comments

phabricator - Aug. 27, 2021, 5:38 a.m.
indygreg created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  9438e9b7321a <https://phab.mercurial-scm.org/rHG9438e9b7321a5ddea820ee6abe6acdda19906527> 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.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11356

AFFECTED FILES
  contrib/packaging/hgpackaging/pyoxidizer.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/contrib/packaging/hgpackaging/pyoxidizer.py b/contrib/packaging/hgpackaging/pyoxidizer.py
--- a/contrib/packaging/hgpackaging/pyoxidizer.py
+++ b/contrib/packaging/hgpackaging/pyoxidizer.py
@@ -136,13 +136,8 @@ 
 
     run_pyoxidizer(source_dir, build_dir, target_triple)
 
-    if "windows" in target_triple:
-        target = "app_windows"
-    else:
-        target = "app_posix"
-
     build_dir = (
-        source_dir / "build" / "pyoxidizer" / target_triple / "release" / target
+        source_dir / "build" / "pyoxidizer" / target_triple / "release" / "app"
     )
 
     if out_dir.exists():