Skip to content

Commit

Permalink
Refs #10694. Revert buildscript.bat back to msbuild.
Browse files Browse the repository at this point in the history
  • Loading branch information
quantumsteve committed Dec 7, 2014
1 parent 6962ff4 commit 89a3c23
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Code/Mantid/Build/Jenkins/buildscript.bat
Expand Up @@ -60,8 +60,7 @@ if ERRORLEVEL 1 exit /B %ERRORLEVEL%
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Build step
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

"C:\Program Files (x86)\CMake 2.8\bin\cmake.exe" --build . -- /nologo /m:%BUILD_THREADS% /nr:false /p:Configuration=%BUILD_CONFIG% Mantid.sln
msbuild /nologo /m:%BUILD_THREADS% /nr:false /p:Configuration=%BUILD_CONFIG% Mantid.sln
if ERRORLEVEL 1 exit /B %ERRORLEVEL%

:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
Expand All @@ -75,7 +74,7 @@ if ERRORLEVEL 1 exit /B %ERRORLEVEL%
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
if "%CLEANBUILD%" EQU "yes" (
:: Build offline documentation
"C:\Program Files (x86)\CMake 2.8\bin\cmake.exe" --build . -- /nologo /m:%BUILD_THREADS% /nr:false /p:Configuration=%BUILD_CONFIG% docs/docs-qthelp.vcxproj
msbuild /nologo /nr:false /p:Configuration=%BUILD_CONFIG% docs/docs-qthelp.vcxproj

:: ignore errors as the exit code of the build isn't correct
::if ERRORLEVEL 1 exit /B %ERRORLEVEL%
Expand Down

0 comments on commit 89a3c23

Please sign in to comment.