This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6642

automation: correct the path separator in LIBPATH on Windows
ClosedPublic

Authored by mharbison72 on Jul 14 2019, 1:36 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG862f6bddacce: automation: correct the path separator in LIBPATH on Windows
Summary

I haven't tried building the x86 installer, but happened to notice this when
working on the thg installer. Experimenting in PowerShell seems to show that
LIBPATH was expanded at the end, but with ':' between, it effectively corrupted
${root}\WinSDK\Lib and the first path in LIBPATH.

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

mharbison72 created this revision.Jul 14 2019, 1:36 AM
mharbison72 added a commit: rHG862f6bddacce: automation: correct the path separator in LIBPATH on Windows.Jul 14 2019, 2:35 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG862f6bddacce: automation: correct the path separator in LIBPATH on Windows (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15902

contrib/automation/hgautomation/windows.py

ACTIVATE_VC9_X86 = r''' ACTIVATE_VC9_X86 = r'''
Write-Output "activating Visual Studio 2008 environment for x86" Write-Output "activating Visual Studio 2008 environment for x86"
$root = "$env:LOCALAPPDATA\Programs\Common\Microsoft\Visual C++ for Python\9.0" $root = "$env:LOCALAPPDATA\Programs\Common\Microsoft\Visual C++ for Python\9.0"
$Env:VCINSTALLDIR = "${root}\VC\" $Env:VCINSTALLDIR = "${root}\VC\"
$Env:WindowsSdkDir = "${root}\WinSDK\" $Env:WindowsSdkDir = "${root}\WinSDK\"
$Env:PATH = "${root}\VC\Bin;${root}\WinSDK\Bin;$Env:PATH" $Env:PATH = "${root}\VC\Bin;${root}\WinSDK\Bin;$Env:PATH"
$Env:INCLUDE = "${root}\VC\Include;${root}\WinSDK\Include;$Env:INCLUDE" $Env:INCLUDE = "${root}\VC\Include;${root}\WinSDK\Include;$Env:INCLUDE"
$Env:LIB = "${root}\VC\Lib;${root}\WinSDK\Lib;$Env:LIB" $Env:LIB = "${root}\VC\Lib;${root}\WinSDK\Lib;$Env:LIB"
$Env:LIBPATH = "${root}\VC\lib;${root}\WinSDK\Lib:$Env:LIBPATH" $Env:LIBPATH = "${root}\VC\lib;${root}\WinSDK\Lib;$Env:LIBPATH"
'''.lstrip() '''.lstrip()
HG_PURGE = r''' HG_PURGE = r'''
$Env:PATH = "C:\hgdev\venv-bootstrap\Scripts;$Env:PATH" $Env:PATH = "C:\hgdev\venv-bootstrap\Scripts;$Env:PATH"
Set-Location C:\hgdev\src Set-Location C:\hgdev\src
hg.exe --config extensions.purge= purge --all hg.exe --config extensions.purge= purge --all
if ($LASTEXITCODE -ne 0) { if ($LASTEXITCODE -ne 0) {
throw "process exited non-0: $LASTEXITCODE" throw "process exited non-0: $LASTEXITCODE"