Reduce default LLVM/BTLS Visual Studio build output.

2 files changed, 30 insertions, 20 deletions

diff --git a/msvc/build-external-btls.bat b/msvc/build-external-btls.bat
index 042cdcac924..436a5abb739 100644
--- a/msvc/build-external-btls.bat
+++ b/msvc/build-external-btls.bat
@@ -181,7 +181,6 @@ if "%GIT%" == "" (
 :: Make sure boringssl submodule is up to date.

 pushd

 cd "%BTLS_DIR%"

-echo Updating boringssl submodule.

 "%GIT%" submodule update --init

 if not ERRORLEVEL == 0 (

    "%GIT%" submodule init

@@ -230,7 +229,7 @@ if /i "%CMAKE_GENERATOR%" == "ninja" (
     )

 ) else (

     :: Build BTLS using msbuild build system.

-    call "%MSBUILD%" mono-btls.sln /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:%VS_TARGET% /m:4 || (

+    call "%MSBUILD%" mono-btls.sln /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:%VS_TARGET% /v:m /nologo /m:4 || (

         goto ON_ERROR

     )

 )

@@ -249,10 +248,10 @@ if not exist "%MONO_DIST_DIR%" (
 )

 

 :: Copy files into distribution directory.

-copy "%BTLS_BUILD_OUTPUT_DIR%\libmono-btls-shared.dll" "%MONO_DIST_DIR%"

+copy /Y "%BTLS_BUILD_OUTPUT_DIR%\libmono-btls-shared.dll" "%MONO_DIST_DIR%" >nul 2>&1

 

 if exist "%BTLS_BUILD_OUTPUT_DIR%\libmono-btls-shared.pdb" (

-    copy "%BTLS_BUILD_OUTPUT_DIR%\libmono-btls-shared.pdb" "%MONO_DIST_DIR%"

+    copy /Y "%BTLS_BUILD_OUTPUT_DIR%\libmono-btls-shared.pdb" "%MONO_DIST_DIR%" >nul 2>&1

 )

 

 goto ON_SUCCESS

@@ -267,7 +266,7 @@ if exist "%BTLS_BUILD_DIR%\build.ninja" (
 )

 

 if exist "%BTLS_BUILD_DIR%\mono-btls.sln" (

-    "%MSBUILD%" "%BTLS_BUILD_DIR%\mono-btls.sln" /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:Clean

+    "%MSBUILD%" "%BTLS_BUILD_DIR%\mono-btls.sln" /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:Clean /v:m /nologo

 )

 

 goto ON_SUCCESS

@@ -326,7 +325,9 @@ if "%CMAKE%" == "" (
     goto _SETUP_CMAKE_ENVIRONMENT_EXIT

 )

 

-echo Found CMake: %CMAKE%

+if /i "%VS_TARGET%" == "build" (

+    echo Found CMake: %CMAKE%

+)

 

 :: Check for optional cmake generate and build tools for full BTLS assembler supported build. NOTE, currently BTLS assembler build

 :: can't be done using Visual Studio and must use ninja build generator + yasm and perl.

@@ -340,7 +341,9 @@ if not "%NINJA%" == "" if not "%YASM%" == "" if not "%PERL%" == "" (
 

 :_SETUP_CMAKE_ENVIRONMENT_VS_GENERATOR

 

-echo Using Visual Studio build generator, disabling full assembler build.

+if /i "%VS_TARGET%" == "build" (

+    echo Using Visual Studio build generator, disabling full assembler build.

+)

 

 :: Detect VS version to use right cmake generator.

 set CMAKE_GENERATOR=Visual Studio 14 2015

@@ -358,8 +361,10 @@ goto _SETUP_CMAKE_ENVIRONMENT_EXIT
 

 :_SETUP_CMAKE_ENVIRONMENT_NINJA_GENERATOR

 

-echo Found Ninja: %NINJA%

-echo Using Ninja build generator, enabling full assembler build.

+if /i "%VS_TARGET%" == "build" (

+    echo Found Ninja: %NINJA%

+    echo Using Ninja build generator, enabling full assembler build.

+)

 

 set CMAKE_GENERATOR=Ninja

 set BTLS_BUILD_OUTPUT_DIR=%BTLS_BUILD_DIR%

diff --git a/msvc/build-external-llvm.bat b/msvc/build-external-llvm.bat
index 70d9ff52ff3..5ff55ff09df 100644
--- a/msvc/build-external-llvm.bat
+++ b/msvc/build-external-llvm.bat
@@ -173,7 +173,6 @@ if "%GIT%" == "" (
 :: Make sure llvm submodule is up to date.

 pushd

 cd "%LLVM_DIR%"

-echo Updating llvm submodule.

 "%GIT%" submodule update --init

 if not ERRORLEVEL == 0 (

    "%GIT%" submodule init

@@ -227,7 +226,7 @@ if /i "%CMAKE_GENERATOR%" == "ninja" (
     )

 ) else (

     :: Build LLVM using msbuild build system.

-    call "%MSBUILD%" llvm.sln /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:%VS_TARGET% /m:4 || (

+    call "%MSBUILD%" llvm.sln /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:%VS_TARGET% /v:m /nologo /m:4 || (

         goto ON_ERROR

     )

 )

@@ -254,7 +253,7 @@ if exist "%LLVM_BUILD_DIR%\build.ninja" (
 )

 

 if exist "%LLVM_BUILD_DIR%\llvm.sln" (

-    "%MSBUILD%" "%LLVM_BUILD_DIR%\llvm.sln" /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:Install

+    "%MSBUILD%" "%LLVM_BUILD_DIR%\llvm.sln" /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:Install /v:m /nologo

 )

 

 if not exist "%LLVM_INSTALL_DIR%\bin\opt.exe" (

@@ -267,8 +266,8 @@ if not exist "%LLVM_INSTALL_DIR%\bin\llc.exe" (
     goto ON_ERROR

 )

 

-copy "%LLVM_INSTALL_DIR%\bin\opt.exe" "%MONO_DIST_DIR%"

-copy "%LLVM_INSTALL_DIR%\bin\llc.exe" "%MONO_DIST_DIR%"

+copy /Y "%LLVM_INSTALL_DIR%\bin\opt.exe" "%MONO_DIST_DIR%" >nul 2>&1

+copy /Y "%LLVM_INSTALL_DIR%\bin\llc.exe" "%MONO_DIST_DIR%" >nul 2>&1

 

 goto ON_SUCCESS

 

@@ -282,7 +281,7 @@ if exist "%LLVM_BUILD_DIR%\build.ninja" (
 )

 

 if exist "%LLVM_BUILD_DIR%\llvm.sln" (

-    "%MSBUILD%" "%LLVM_BUILD_DIR%\llvm.sln" /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:Clean

+    "%MSBUILD%" "%LLVM_BUILD_DIR%\llvm.sln" /p:Configuration=%VS_CONFIGURATION% /p:Platform=%VS_PLATFORM% /t:Clean /v:m /nologo

 )

 

 goto ON_SUCCESS

@@ -341,10 +340,12 @@ if "%CMAKE%" == "" (
     goto _SETUP_CMAKE_ENVIRONMENT_EXIT

 )

 

-echo Found CMake: %CMAKE%

+if /i "%VS_TARGET%" == "build" (

+    echo Found CMake: %CMAKE%

+)

 

 :: Check for optional cmake generate and build tools.

-call :FIND_PROGRAM "%NINJA%" "%NINJA_BIN_NAME%" NINJA

+:: call :FIND_PROGRAM "%NINJA%" "%NINJA_BIN_NAME%" NINJA

 

 if not "%NINJA%" == "" (

     goto _SETUP_CMAKE_ENVIRONMENT_NINJA_GENERATOR

@@ -352,7 +353,9 @@ if not "%NINJA%" == "" (
 

 :_SETUP_CMAKE_ENVIRONMENT_VS_GENERATOR

 

-echo Using Visual Studio build generator.

+if /i "%VS_TARGET%" == "build" (

+    echo Using Visual Studio build generator.

+)

 

 :: Detect VS version to use right cmake generator.

 set CMAKE_GENERATOR=Visual Studio 14 2015

@@ -370,8 +373,10 @@ goto _SETUP_CMAKE_ENVIRONMENT_EXIT
 

 :_SETUP_CMAKE_ENVIRONMENT_NINJA_GENERATOR

 

-echo Found Ninja: %NINJA%

-echo Using Ninja build generator.

+if /i "%VS_TARGET%" == "build" (

+    echo Found Ninja: %NINJA%

+    echo Using Ninja build generator.

+)

 

 set CMAKE_GENERATOR=Ninja

 set LLVM_BUILD_OUTPUT_DIR=%LLVM_BUILD_DIR%