This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9858

contrib: update PyOxidizer to 0.10.3
ClosedPublic

Authored by indygreg on Jan 24 2021, 9:28 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGa6c5ec6b4728: contrib: update PyOxidizer to 0.10.3
Summary

This is necessary to work around a bug that caused build failures on
current stable with 0.9.0. This patch was used to build the 5.7rc0 Windows
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.Jan 24 2021, 9:28 PM
mharbison72 accepted this revision.Jan 24 2021, 10:13 PM
This revision is now accepted and ready to land.Jan 24 2021, 10:13 PM
indygreg added a commit: rHGa6c5ec6b4728: contrib: update PyOxidizer to 0.10.3.Jan 24 2021, 10:19 PM
Closed by commit rHGa6c5ec6b4728: contrib: update PyOxidizer to 0.10.3 (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25240

contrib/automation/hgautomation/linux.py

wget -O rustup-init --progress dot:mega https://static.rust-lang.org/rustup/archive/1.18.3/x86_64-unknown-linux-gnu/rustup-init wget -O rustup-init --progress dot:mega https://static.rust-lang.org/rustup/archive/1.18.3/x86_64-unknown-linux-gnu/rustup-init
echo "${RUSTUP_INIT_SHA256} rustup-init" | sha256sum --check - echo "${RUSTUP_INIT_SHA256} rustup-init" | sha256sum --check -
chmod +x rustup-init chmod +x rustup-init
sudo -H -u hg -g hg ./rustup-init -y sudo -H -u hg -g hg ./rustup-init -y
sudo -H -u hg -g hg /home/hg/.cargo/bin/rustup install 1.31.1 1.46.0 sudo -H -u hg -g hg /home/hg/.cargo/bin/rustup install 1.31.1 1.46.0
sudo -H -u hg -g hg /home/hg/.cargo/bin/rustup component add clippy sudo -H -u hg -g hg /home/hg/.cargo/bin/rustup component add clippy
sudo -H -u hg -g hg /home/hg/.cargo/bin/cargo install --version 0.9.0 pyoxidizer sudo -H -u hg -g hg /home/hg/.cargo/bin/cargo install --version 0.10.3 pyoxidizer
''' '''
BOOTSTRAP_VIRTUALENV = r''' BOOTSTRAP_VIRTUALENV = r'''
/usr/bin/virtualenv /hgdev/venv-bootstrap /usr/bin/virtualenv /hgdev/venv-bootstrap
HG_SHA256=35fc8ba5e0379c1b3affa2757e83fb0509e8ac314cbd9f1fd133cf265d16e49f HG_SHA256=35fc8ba5e0379c1b3affa2757e83fb0509e8ac314cbd9f1fd133cf265d16e49f
HG_TARBALL=mercurial-5.1.1.tar.gz HG_TARBALL=mercurial-5.1.1.tar.gz

contrib/install-windows-dependencies.ps1

$Env:CARGO_HOME = "${prefix}\cargo" $Env:CARGO_HOME = "${prefix}\cargo"
Invoke-Process "${prefix}\assets\rustup-init.exe" "-y --default-host x86_64-pc-windows-msvc" Invoke-Process "${prefix}\assets\rustup-init.exe" "-y --default-host x86_64-pc-windows-msvc"
Invoke-Process "${prefix}\cargo\bin\rustup.exe" "target add i686-pc-windows-msvc" Invoke-Process "${prefix}\cargo\bin\rustup.exe" "target add i686-pc-windows-msvc"
Invoke-Process "${prefix}\cargo\bin\rustup.exe" "install 1.46.0" Invoke-Process "${prefix}\cargo\bin\rustup.exe" "install 1.46.0"
Invoke-Process "${prefix}\cargo\bin\rustup.exe" "component add clippy" Invoke-Process "${prefix}\cargo\bin\rustup.exe" "component add clippy"
# Install PyOxidizer for packaging. # Install PyOxidizer for packaging.
Invoke-Process "${prefix}\cargo\bin\cargo.exe" "install --version 0.9.0 pyoxidizer" Invoke-Process "${prefix}\cargo\bin\cargo.exe" "install --version 0.10.3 pyoxidizer"
} }
function Install-Dependencies($prefix) { function Install-Dependencies($prefix) {
if (!(Test-Path -Path $prefix\assets)) { if (!(Test-Path -Path $prefix\assets)) {
New-Item -Path $prefix\assets -ItemType Directory New-Item -Path $prefix\assets -ItemType Directory
} }
$pip = "${prefix}\assets\get-pip.py" $pip = "${prefix}\assets\get-pip.py"