diff options
| author | csharptest <roger@csharptest.net> | 2011-10-04 15:43:13 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2011-10-04 15:43:13 -0500 |
| commit | 4bb080a774888517cd9dee84972aaa467ca7ead2 (patch) | |
| tree | 2b9f6b0d0ab414da9a413c07890f2817dec1a28e | |
| parent | 6f5bf8d48bda3f415796428f16b33be662a08329 (diff) | |
| download | protobuf-4bb080a774888517cd9dee84972aaa467ca7ead2.tar.gz protobuf-4bb080a774888517cd9dee84972aaa467ca7ead2.tar.bz2 protobuf-4bb080a774888517cd9dee84972aaa467ca7ead2.zip | |
Added removal of build_output and build_temp to CleanAll.bat
Added /nologo for all msbuild calls
| -rw-r--r-- | build/Build20.bat | 2 | ||||
| -rw-r--r-- | build/BuildAll.bat | 2 | ||||
| -rw-r--r-- | build/BuildSilverlight2.bat | 2 | ||||
| -rw-r--r-- | build/CleanAll.bat | 12 | ||||
| -rw-r--r-- | build/RunBenchmarks.bat | 2 | ||||
| -rw-r--r-- | build/build35.bat | 2 | ||||
| -rw-r--r-- | build/build40.bat | 2 |
7 files changed, 14 insertions, 10 deletions
diff --git a/build/Build20.bat b/build/Build20.bat index 25ac20a5..8c58d2e4 100644 --- a/build/Build20.bat +++ b/build/Build20.bat @@ -5,4 +5,4 @@ SET BUILD_CONFIG=%~2 IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild
IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=2"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=2"
diff --git a/build/BuildAll.bat b/build/BuildAll.bat index 9f2ef1aa..e35c6f61 100644 --- a/build/BuildAll.bat +++ b/build/BuildAll.bat @@ -1,2 +1,2 @@ @echo off
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /t:FullBuild /toolsversion:4.0 %1 %2 %3 %4 %5 %6
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /t:FullBuild /toolsversion:4.0 %1 %2 %3 %4 %5 %6
diff --git a/build/BuildSilverlight2.bat b/build/BuildSilverlight2.bat index efc6ed41..5b2d2a95 100644 --- a/build/BuildSilverlight2.bat +++ b/build/BuildSilverlight2.bat @@ -1,2 +1,2 @@ @echo off
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 /t:Rebuild %1 %2 %3 %4 "/p:BuildConfiguration=Debug_Silverlight;TargetVersion=2"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Rebuild %1 %2 %3 %4 "/p:BuildConfiguration=Debug_Silverlight;TargetVersion=2"
diff --git a/build/CleanAll.bat b/build/CleanAll.bat index 64df6f3f..10d7fc77 100644 --- a/build/CleanAll.bat +++ b/build/CleanAll.bat @@ -1,5 +1,9 @@ @echo off
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 "/t:Clean" "/p:BuildConfiguration=Release;TargetVersion=2"
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 "/t:Clean" "/p:BuildConfiguration=Debug;TargetVersion=2"
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 "/t:Clean" "/p:BuildConfiguration=Release_Silverlight;TargetVersion=2"
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 "/t:Clean" "/p:BuildConfiguration=Debug_Silverlight;TargetVersion=2"
+PUSHD %~dp0
+IF EXIST ..\build_output RMDIR /S /Q ..\build_output
+IF EXIST ..\build_temp RMDIR /S /Q ..\build_temp
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Clean /v:m "/p:BuildConfiguration=Release;TargetVersion=2"
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Clean /v:m "/p:BuildConfiguration=Debug;TargetVersion=2"
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Clean /v:m "/p:BuildConfiguration=Release_Silverlight;TargetVersion=2"
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:Clean /v:m "/p:BuildConfiguration=Debug_Silverlight;TargetVersion=2"
+POPD
\ No newline at end of file diff --git a/build/RunBenchmarks.bat b/build/RunBenchmarks.bat index 5cb3e6a5..9091b0d1 100644 --- a/build/RunBenchmarks.bat +++ b/build/RunBenchmarks.bat @@ -1,2 +1,2 @@ @echo off
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 /t:RunBenchmarks %1 %2 %3 %4 "/p:BuildConfiguration=Release;TargetVersion=2"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 /t:RunBenchmarks %1 %2 %3 %4 "/p:BuildConfiguration=Release;TargetVersion=2"
diff --git a/build/build35.bat b/build/build35.bat index 34cb141b..46a625d5 100644 --- a/build/build35.bat +++ b/build/build35.bat @@ -5,4 +5,4 @@ SET BUILD_CONFIG=%~2 IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild
IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=3"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=3"
diff --git a/build/build40.bat b/build/build40.bat index 1a0518ce..6cfe0484 100644 --- a/build/build40.bat +++ b/build/build40.bat @@ -5,4 +5,4 @@ SET BUILD_CONFIG=%~2 IF "%BUILD_TARGET%"=="" SET BUILD_TARGET=Rebuild
IF "%BUILD_CONFIG%"=="" SET BUILD_CONFIG=Debug
-CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=4"
+CMD.exe /Q /C "CD %~dp0 && %WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /nologo build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=4"
|