This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8482

automation: add extra arguments when building Inno
ClosedPublic

Authored by indygreg on Apr 24 2020, 7:23 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG47609da15379: automation: add extra arguments when building Inno
rHGfc6fb941ceb6: automation: add extra arguments when building Inno
Summary

These were being fed into the template expansion but not being
used. This meant --version was not getting set when it should have
been.

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.Apr 24 2020, 7:23 PM
indygreg added a commit: rHGfc6fb941ceb6: automation: add extra arguments when building Inno.Apr 30 2020, 1:53 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGfc6fb941ceb6: automation: add extra arguments when building Inno (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21248

contrib/automation/hgautomation/windows.py

}} }}
hg.exe log -r . hg.exe log -r .
Write-Output "updated Mercurial working directory to {revision}" Write-Output "updated Mercurial working directory to {revision}"
'''.lstrip() '''.lstrip()
BUILD_INNO = r''' BUILD_INNO = r'''
Set-Location C:\hgdev\src Set-Location C:\hgdev\src
$python = "C:\hgdev\python27-{arch}\python.exe" $python = "C:\hgdev\python27-{arch}\python.exe"
C:\hgdev\python37-x64\python.exe contrib\packaging\packaging.py inno --python $python C:\hgdev\python37-x64\python.exe contrib\packaging\packaging.py inno --python $python {extra_args}
if ($LASTEXITCODE -ne 0) {{ if ($LASTEXITCODE -ne 0) {{
throw "process exited non-0: $LASTEXITCODE" throw "process exited non-0: $LASTEXITCODE"
}} }}
'''.lstrip() '''.lstrip()
BUILD_WHEEL = r''' BUILD_WHEEL = r'''
Set-Location C:\hgdev\src Set-Location C:\hgdev\src
C:\hgdev\python{python_version}-{arch}\python.exe -m pip wheel --wheel-dir dist . C:\hgdev\python{python_version}-{arch}\python.exe -m pip wheel --wheel-dir dist .