summaryrefslogtreecommitdiffstats
path: root/PCbuild/build.bat
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2017-03-04 05:32:17 (GMT)
committerGitHub <noreply@github.com>2017-03-04 05:32:17 (GMT)
commitd3e1e9df724d97ab83113c2d5fa15179d1dcd560 (patch)
tree3c6539cde74094d97cadb0e19eb1516d723e6217 /PCbuild/build.bat
parent226af23e858e2914cf78dfa6fd441c7b90a4cc91 (diff)
downloadcpython-d3e1e9df724d97ab83113c2d5fa15179d1dcd560.zip
cpython-d3e1e9df724d97ab83113c2d5fa15179d1dcd560.tar.gz
cpython-d3e1e9df724d97ab83113c2d5fa15179d1dcd560.tar.bz2
bpo-27593: Updates Windows build to use information from git (#262) (#450)
* bpo-27593: Updates Windows build to use information from git
Diffstat (limited to 'PCbuild/build.bat')
-rw-r--r--PCbuild/build.bat8
1 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 70ab340..f7f2858 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -105,9 +105,9 @@ if "%platf%"=="x64" (
)
)
-if not exist "%HG%" where hg > "%TEMP%\hg.loc" 2> nul && set /P HG= < "%TEMP%\hg.loc" & del "%TEMP%\hg.loc"
-if exist "%HG%" set HGProperty=/p:HG="%HG%"
-if not exist "%HG%" echo Cannot find Mercurial on PATH & set HGProperty=
+if not exist "%GIT%" where git > "%TEMP%\git.loc" 2> nul && set /P GIT= < "%TEMP%\git.loc" & del "%TEMP%\git.loc"
+if exist "%GIT%" set GITProperty=/p:GIT="%GIT%"
+if not exist "%GIT%" echo Cannot find Git on PATH & set GITProperty=
rem Setup the environment
call "%dir%env.bat" %vs_platf% >nul
@@ -145,7 +145,7 @@ msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^
/p:Configuration=%conf% /p:Platform=%platf%^
/p:IncludeExternals=%IncludeExternals%^
/p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
- /p:UseTestMarker=%UseTestMarker% %HGProperty%^
+ /p:UseTestMarker=%UseTestMarker% %GITProperty%^
%1 %2 %3 %4 %5 %6 %7 %8 %9
@echo off