diff options
| author | ArnoldZokas <arnold.zokas@coderoom.net> | 2010-11-29 22:43:16 +0000 |
|---|---|---|
| committer | ArnoldZokas <arnold.zokas@coderoom.net> | 2010-11-29 22:43:16 +0000 |
| commit | b287a2de366cb8ab93d8a6ed466677fe50a0459d (patch) | |
| tree | c265187eae2495a1bf811fbff51a9839a5fce68d /build | |
| parent | b7b80b500fa6a365758e03dad37fcee3d37d8937 (diff) | |
| download | protobuf-b287a2de366cb8ab93d8a6ed466677fe50a0459d.tar.gz protobuf-b287a2de366cb8ab93d8a6ed466677fe50a0459d.tar.bz2 protobuf-b287a2de366cb8ab93d8a6ed466677fe50a0459d.zip | |
Added '_Test' target to build scripts
Diffstat (limited to 'build')
| -rw-r--r-- | build/BuildAll.bat | 2 | ||||
| -rw-r--r-- | build/Common.targets | 4 | ||||
| -rw-r--r-- | build/GenerateCompletePackage.bat | 9 | ||||
| -rw-r--r-- | build/GenerateReleasePackage.bat | 3 | ||||
| -rw-r--r-- | build/build.csproj | 11 |
5 files changed, 19 insertions, 10 deletions
diff --git a/build/BuildAll.bat b/build/BuildAll.bat index f46f7b3e..6e6e1528 100644 --- a/build/BuildAll.bat +++ b/build/BuildAll.bat @@ -1,9 +1,7 @@ -:BEGIN @ECHO OFF %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Debug IF ERRORLEVEL 1 GOTO END -:SILVERLIGHT2 %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Debug_Silverlight2 :END diff --git a/build/Common.targets b/build/Common.targets index e528a732..99ab1f48 100644 --- a/build/Common.targets +++ b/build/Common.targets @@ -10,4 +10,8 @@ <MSBuild Projects="@(Solution)" Properties="Configuration=$(BuildConfiguration)" BuildInParallel="true" /> </Target> + <Target Name="_Test"> + <Exec Command=""E:\dotnet-protobufs\lib\NUnit 2.2.8.0\nunit-console.exe" %(TestContainer.Identity)" /> + </Target> + </Project>
\ No newline at end of file diff --git a/build/GenerateCompletePackage.bat b/build/GenerateCompletePackage.bat index 72d05a16..8b4bde18 100644 --- a/build/GenerateCompletePackage.bat +++ b/build/GenerateCompletePackage.bat @@ -1,13 +1,16 @@ -:BEGIN @ECHO OFF +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Debug +IF ERRORLEVEL 1 GOTO END + +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Debug_Silverlight2 +IF ERRORLEVEL 1 GOTO END + %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Release IF ERRORLEVEL 1 GOTO END -:SILVERLIGHT2 %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Release_Silverlight2 IF ERRORLEVEL 1 GOTO END -:GENERATE_PACKAGE %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:GeneratePackage /p:PackageScope=AllBinariesAndSource :END diff --git a/build/GenerateReleasePackage.bat b/build/GenerateReleasePackage.bat index b1cfa344..fc4e9561 100644 --- a/build/GenerateReleasePackage.bat +++ b/build/GenerateReleasePackage.bat @@ -1,13 +1,10 @@ -:BEGIN @ECHO OFF %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Release IF ERRORLEVEL 1 GOTO END -:SILVERLIGHT2 %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build /p:BuildConfiguration=Release_Silverlight2 IF ERRORLEVEL 1 GOTO END -:GENERATE_PACKAGE %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:GeneratePackage /p:PackageScope=ReleaseBinaries :END diff --git a/build/build.csproj b/build/build.csproj index 21c6affc..493b8fb5 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -11,18 +11,25 @@ <!--File Paths--> <SolutionFile>$(ProjectDirectory)\src\ProtocolBuffers.sln</SolutionFile> + + <!--Tool Paths--> + <NUnitExePath>$(ProjectDirectory)\lib\NUnit 2.2.8.0\nunit-console.exe</NUnitExePath> </PropertyGroup> <Import Project="Common.targets"/> <ItemGroup> <WorkingDirectories Include="$(BuildTempDirectory)" /> + <Solution Include="$(SolutionFile)" /> + + <TestContainer Include="$(ProjectDirectory)\src\ProtocolBuffers.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Test.dll" /> + <TestContainer Include="$(ProjectDirectory)\src\ProtoGen.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.ProtoGen.Test.dll" /> </ItemGroup> <!-- targets --> - <Target Name="Build" DependsOnTargets="_Compile" /> + <Target Name="Build" DependsOnTargets="_Compile;_Test" /> <Target Name="RunBenchmarks" DependsOnTargets="_Compile" /> - <Target Name="GeneratePackage" /> + <Target Name="GeneratePackage" DependsOnTargets="_Compile" /> </Project> |