Cleanup of build batch files, todo - rework publishrelease.bat

9 files changed, 34 insertions, 45 deletions

diff --git a/build/Build20.bat b/build/Build20.bat
deleted file mode 100644
index 55d66f55..00000000
--- a/build/Build20.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off

-SET BUILD_TARGET=%~1

-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 /nologo build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=NET20"

diff --git a/build/BuildAll.bat b/build/BuildAll.bat
index e35c6f61..9bee73c7 100644
--- a/build/BuildAll.bat
+++ b/build/BuildAll.bat
@@ -1,2 +1,8 @@
 @echo off

-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

+SET BUILD_TARGET=%~1

+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 /nologo build.csproj /t:%BUILD_TARGET% /toolsversion:4.0 "/p:Configuration=%BUILD_CONFIG%" %3 %4 %5 %6

diff --git a/build/BuildSilverlight2.bat b/build/BuildSilverlight2.bat
deleted file mode 100644
index 5b2d2a95..00000000
--- a/build/BuildSilverlight2.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off

-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
deleted file mode 100644
index 10d7fc77..00000000
--- a/build/CleanAll.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off

-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/build.bat b/build/build.bat
new file mode 100644
index 00000000..bd7bd2a0
--- /dev/null
+++ b/build/build.bat
@@ -0,0 +1,20 @@
+@echo off

+SET BUILD_VERSION=%~1

+SET BUILD_TARGET=%~2

+SET BUILD_CONFIG=%~3

+

+IF NOT "%BUILD_VERSION%"=="" GOTO RUN

+ECHO.

+ECHO Usage: build.bat platform [target] [config] [msbuild arguments]

+ECHO.

+ECHO - platform:  CF20, CF35, NET20, NET35, NET40, PL40, SL20, SL30, or SL40

+ECHO - [target]:  Rebuild, Clean, Build, Test, or Publish

+ECHO - [config]:  Debug or Release

+ECHO.

+EXIT /B 1

+

+:RUN

+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 /nologo target.csproj /toolsversion:4.0 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:Configuration=%BUILD_CONFIG%;TargetVersion=%BUILD_VERSION%"

diff --git a/build/build.csproj b/build/build.csproj
index 31d12631..e95137fb 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -2,13 +2,14 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!-- build targets -->
-  <Target Name="CleanAll" DependsOnTargets="_CleanAll" />
-  <Target Name="BuildTools" DependsOnTargets="_BuildTools" /> 
+  <Target Name="Clean" DependsOnTargets="_CleanAll" />
+  <Target Name="BuildTools" DependsOnTargets="_BuildTools" />
   <Target Name="GenerateSource" DependsOnTargets="_GenerateSource;_CopyGeneratedSource" />
-  <Target Name="BuildAll" DependsOnTargets="BuildTools;GenerateSource;_CompileAll" />
-  <Target Name="RebuildAll" DependsOnTargets="CleanAll;BuildAll" />
+  <Target Name="RebuildSource" DependsOnTargets="Clean;BuildTools;GenerateSource" />
+  <Target Name="Build" DependsOnTargets="BuildTools;GenerateSource;_CompileAll" />
+  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
   <Target Name="GeneratePackage" DependsOnTargets="_PackageAll;_GeneratePackage" />
-  <Target Name="FullBuild" DependsOnTargets="RebuildAll;GeneratePackage" />
+  <Target Name="FullBuild" DependsOnTargets="Rebuild;GeneratePackage" />
   <!-- misc targets -->
   <Target Name="RunBenchmarks" DependsOnTargets="_CleanAll;_BuildTools;_RunBenchmarks" />
 
diff --git a/build/build35.bat b/build/build35.bat
deleted file mode 100644
index 8c15d8bc..00000000
--- a/build/build35.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off

-SET BUILD_TARGET=%~1

-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 /nologo build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=NET35"

diff --git a/build/build40.bat b/build/build40.bat
deleted file mode 100644
index 89dafe5a..00000000
--- a/build/build40.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off

-SET BUILD_TARGET=%~1

-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 /nologo build.csproj /toolsversion:4.0 %3 %4 %5 %6 "/t:%BUILD_TARGET%" "/p:BuildConfiguration=%BUILD_CONFIG%;TargetVersion=NET40"

diff --git a/src/ProtocolBuffers.sln b/src/ProtocolBuffers.sln
index 52288611..64103470 100644
--- a/src/ProtocolBuffers.sln
+++ b/src/ProtocolBuffers.sln
@@ -60,12 +60,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{66ED1950
 	ProjectSection(SolutionItems) = preProject

 		..\build\build.bat = ..\build\build.bat

 		..\build\build.csproj = ..\build\build.csproj

-		..\build\Build20.bat = ..\build\Build20.bat

-		..\build\build35.bat = ..\build\build35.bat

-		..\build\build40.bat = ..\build\build40.bat

 		..\build\BuildAll.bat = ..\build\BuildAll.bat

-		..\build\BuildSilverlight2.bat = ..\build\BuildSilverlight2.bat

 		..\build\Common.targets = ..\build\Common.targets

+		..\build\GenerateSource.bat = ..\build\GenerateSource.bat

 		..\build\Google.ProtocolBuffers.nuspec = ..\build\Google.ProtocolBuffers.nuspec

 		..\build\Google.ProtocolBuffersLite.nuspec = ..\build\Google.ProtocolBuffersLite.nuspec

 		..\build\PublishRelease.bat = ..\build\PublishRelease.bat