diff options
| author | Kirill Osenkov <github@osenkov.com> | 2019-04-05 00:05:07 +0300 |
|---|---|---|
| committer | Kirill Osenkov <github@osenkov.com> | 2019-04-05 01:04:02 +0300 |
| commit | 9b0bf92e1618d3e6663cd0db12ec2afcc74a19bb (patch) | |
| tree | 49895d543c4b7b3dd3e3c6896142ade5b6904415 /main/winbuild.bat | |
| parent | bb974bf7ba8ed3f329fdd92230dc5eff839e4e1c (diff) | |
Fix Windows build.
Update winbuild.bat for VS 16.0.
Fix MSBuild condition.
Don't build StandardClassification.csproj on Windows.
Temporarily exclude some code to get the build working on Windows.
Diffstat (limited to 'main/winbuild.bat')
| -rw-r--r-- | main/winbuild.bat | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/main/winbuild.bat b/main/winbuild.bat index 7216799d94..229ccd918c 100644 --- a/main/winbuild.bat +++ b/main/winbuild.bat @@ -3,22 +3,30 @@ setlocal enableextensions enabledelayedexpansion if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
FOR /F "delims=" %%E in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\installer\vswhere.exe" -latest -property installationPath') DO (
+ set "MSBUILD_EXE=%%E\MSBuild\Current\Bin\MSBuild.exe"
+ if exist "!MSBUILD_EXE!" goto :build
set "MSBUILD_EXE=%%E\MSBuild\15.0\Bin\MSBuild.exe"
if exist "!MSBUILD_EXE!" goto :build
)
)
FOR %%E in (Enterprise, Professional, Community) DO (
+ set "MSBUILD_EXE=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\%%E\MSBuild\Current\Bin\MSBuild.exe"
+ if exist "!MSBUILD_EXE!" goto :build
set "MSBUILD_EXE=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\%%E\MSBuild\15.0\Bin\MSBuild.exe"
if exist "!MSBUILD_EXE!" goto :build
)
REM Couldn't be located in the standard locations, expand search
FOR /F "delims=" %%E IN ('dir /b /ad "%ProgramFiles(x86)%\Microsoft Visual Studio\"') DO (
+ set "MSBUILD_EXE=%ProgramFiles(x86)%\Microsoft Visual Studio\%%E\MSBuild\Current\Bin\MSBuild.exe"
+ if exist "!MSBUILD_EXE!" goto :build
set "MSBUILD_EXE=%ProgramFiles(x86)%\Microsoft Visual Studio\%%E\MSBuild\15.0\Bin\MSBuild.exe"
if exist "!MSBUILD_EXE!" goto :build
FOR /F "delims=" %%F IN ('dir /b /ad "%ProgramFiles(x86)%\Microsoft Visual Studio\%%E"') DO (
+ set "MSBUILD_EXE=%ProgramFiles(x86)%\Microsoft Visual Studio\%%E\%%F\MSBuild\Current\Bin\MSBuild.exe"
+ if exist "!MSBUILD_EXE!" goto :build
set "MSBUILD_EXE=%ProgramFiles(x86)%\Microsoft Visual Studio\%%E\%%F\MSBuild\15.0\Bin\MSBuild.exe"
if exist "!MSBUILD_EXE!" goto :build
)
|