diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-05-18 20:58:22 +0300 |
|---|---|---|
| committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-05-18 20:58:22 +0300 |
| commit | 311bcdc98bcd9fe0d6cd4fb0a0736a6cd4f71528 (patch) | |
| tree | d747298e4b645a537d155ad0a6d94862a8b66f9c /build.cmd | |
| parent | 01d5c10ad2090a20a49c00a602adb31de014ae89 (diff) | |
Remove OfficialBuildId handling (#8401)
Diffstat (limited to 'build.cmd')
| -rw-r--r-- | build.cmd | 18 |
1 files changed, 4 insertions, 14 deletions
@@ -8,7 +8,6 @@ setlocal EnableDelayedExpansion :ReadArguments :: Read in the args to determine whether to run the native build, managed build, or both (default) -set OfficialBuildIdArg= set "__args= %*" set processedArgs= set unprocessedBuildArgs= @@ -28,17 +27,6 @@ if /I [%1] == [managed] ( goto Next ) -if /I [%1] == [/p:OfficialBuildId] ( - if /I [%2]==[] ( - echo Error: officialbuildid arg should have a value - exit /b 1 - ) - set processedArgs=!processedArgs! %1=%2 - set OfficialBuildIdArg=/p:OfficialBuildId=%2 - shift /1 - goto Next -) - if [!processedArgs!]==[] ( call set unprocessedBuildArgs=!__args! ) else ( @@ -75,7 +63,9 @@ echo [%time%] Building Native Libraries... :: Generate Native versioning assets set __binDir=%~dp0bin set __versionLog=%~dp0version.log -msbuild "%~dp0build.proj" /nologo /t:GenerateVersionHeader /p:NativeVersionHeaderFile="%__binDir%\obj\_version.h" /p:GenerateVersionHeader=true %OfficialBuildIdArg% > "%__versionLog%" +if not exist "%__binDir%\obj\_version.h" ( + msbuild "%~dp0build.proj" /nologo /t:GenerateVersionHeader /p:GenerateNativeVersionInfo=true > "%__versionLog%" +) IF EXIST "%~dp0src\native\Windows\build-native.cmd" ( call %~dp0src\native\Windows\build-native.cmd %__args% >nativebuild.log IF ERRORLEVEL 1 ( @@ -113,7 +103,7 @@ call :build %__args% goto :AfterBuild :build -%_buildprefix% msbuild "%_buildproj%" /nologo /maxcpucount /v:minimal /clp:Summary /nodeReuse:false /flp:v=normal;LogFile="%_buildlog%";Append "/l:BinClashLogger,%_binclashLoggerDll%;LogFile=%_binclashlog%" !unprocessedBuildArgs! %_buildpostfix% %OfficialBuildIdArg% +%_buildprefix% msbuild "%_buildproj%" /nologo /maxcpucount /v:minimal /clp:Summary /nodeReuse:false /flp:v=normal;LogFile="%_buildlog%";Append "/l:BinClashLogger,%_binclashLoggerDll%;LogFile=%_binclashlog%" !unprocessedBuildArgs! %_buildpostfix% set BUILDERRORLEVEL=%ERRORLEVEL% goto :eof |