diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-06-19 10:34:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 10:34:25 -0700 |
| commit | 40a23e88994aca92c83c8e84ab8b8cdc11d7ec54 (patch) | |
| tree | 5a04457af0c0d4be563bf1c153059564bc19c516 /Tools/nuget | |
| parent | eb81795d7d3a8c898fa89a376d63fc3bbfb9a081 (diff) | |
| download | cpython-git-40a23e88994aca92c83c8e84ab8b8cdc11d7ec54.tar.gz | |
bpo-30687: Fixes build scripts to find msbuild.exe and stop relying on vcvarsall.bat (#2252)
* Fixes build scripts to find msbuild.exe and stop relying on vcvarsall.bat
Also fixes bdist_wininst.vcxproj to use correct version in generated name.
Diffstat (limited to 'Tools/nuget')
| -rw-r--r-- | Tools/nuget/build.bat | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Tools/nuget/build.bat b/Tools/nuget/build.bat index 5068c17244..54498ca28a 100644 --- a/Tools/nuget/build.bat +++ b/Tools/nuget/build.bat @@ -21,7 +21,8 @@ if "%~1" EQU "-p" (set PACKAGES=%PACKAGES% %~2) && shift && shift && goto CheckO if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) call "%D%..\msi\get_externals.bat" -call "%PCBUILD%env.bat" x86 +call "%PCBUILD%find_msbuild.bat" %MSBUILD% +if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2) if defined PACKAGES set PACKAGES="/p:Packages=%PACKAGES%" @@ -30,7 +31,7 @@ if defined BUILDX86 ( ) else if not exist "%PCBUILD%win32\python.exe" call "%PCBUILD%build.bat" -e if errorlevel 1 goto :eof - msbuild "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x86 %OUTPUT% %PACKAGES% + %MSBUILD% "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x86 %OUTPUT% %PACKAGES% if errorlevel 1 goto :eof ) @@ -39,7 +40,7 @@ if defined BUILDX64 ( ) else if not exist "%PCBUILD%amd64\python.exe" call "%PCBUILD%build.bat" -p x64 -e if errorlevel 1 goto :eof - msbuild "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x64 %OUTPUT% %PACKAGES% + %MSBUILD% "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x64 %OUTPUT% %PACKAGES% if errorlevel 1 goto :eof ) |