From patchwork Sun Jul 14 05:36:06 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D6642: automation: correct the path separator in LIBPATH on Windows
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 40919
Message-Id: <differential-rev-PHID-DREV-xsrykqhxbazuhrd5vba2-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Sun, 14 Jul 2019 05:36:06 +0000

mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  contrib/automation/hgautomation/windows.py

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-devel

diff --git a/contrib/automation/hgautomation/windows.py b/contrib/automation/hgautomation/windows.py
--- a/contrib/automation/hgautomation/windows.py
+++ b/contrib/automation/hgautomation/windows.py
@@ -39,7 +39,7 @@
 $Env:PATH = "${root}\VC\Bin;${root}\WinSDK\Bin;$Env:PATH"
 $Env:INCLUDE = "${root}\VC\Include;${root}\WinSDK\Include;$Env:INCLUDE"
 $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()
 
 HG_PURGE = r'''