Closes #17202: Merge with 3.4

This commit is contained in:
Zachary Ware 2015-04-13 12:11:40 -05:00
commit 774ac377da
29 changed files with 1040 additions and 1037 deletions

View file

@ -1,22 +1,22 @@
@echo off
setlocal
set D=%~dp0
set PCBUILD=%~dp0..\..\PCBuild\
echo Building Lib\distutils\command\wininst-xx.0.exe
call "%PCBUILD%env.bat" x86
if errorlevel 1 goto :eof
msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=Win32
if errorlevel 1 goto :eof
echo Building Lib\distutils\command\wininst-xx.0-amd64.exe
call "%PCBUILD%env.bat" x86_amd64
if errorlevel 1 goto :eof
msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=x64
@echo off
setlocal
set D=%~dp0
set PCBUILD=%~dp0..\..\PCBuild\
echo Building Lib\distutils\command\wininst-xx.0.exe
call "%PCBUILD%env.bat" x86
if errorlevel 1 goto :eof
msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=Win32
if errorlevel 1 goto :eof
echo Building Lib\distutils\command\wininst-xx.0-amd64.exe
call "%PCBUILD%env.bat" x86_amd64
if errorlevel 1 goto :eof
msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=x64