diff options
| author | Jon Skeet <skeet@pobox.com> | 2011-04-03 20:15:29 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2011-04-03 20:15:29 +0100 |
| commit | bf9821e0749de1b45e4167afc4fa941295dd9bf2 (patch) | |
| tree | 72b594662d92b8156779d3bd34b4b436017a633b | |
| parent | ce58e301534fd6cd1cf04f388318601112876732 (diff) | |
| download | protobuf-bf9821e0749de1b45e4167afc4fa941295dd9bf2.tar.gz protobuf-bf9821e0749de1b45e4167afc4fa941295dd9bf2.tar.bz2 protobuf-bf9821e0749de1b45e4167afc4fa941295dd9bf2.zip | |
Fixes to package generation, and convert all tabs to spaces in MSBuild files.
| -rw-r--r-- | build/Common.targets | 148 | ||||
| -rw-r--r-- | build/GenerateCompletePackage.bat | 8 | ||||
| -rw-r--r-- | build/GenerateReleasePackage.bat | 4 | ||||
| -rw-r--r-- | build/build.csproj | 196 |
4 files changed, 178 insertions, 178 deletions
diff --git a/build/Common.targets b/build/Common.targets index 07b93ebd..59f431bd 100644 --- a/build/Common.targets +++ b/build/Common.targets @@ -10,8 +10,8 @@ </Target> <Target Name="_Clean"> - <RemoveDir Directories="@(WorkingDirectories)" Condition="Exists(%(WorkingDirectories.Identity))" /> - <MakeDir Directories="@(WorkingDirectories)" /> + <RemoveDir Directories="@(WorkingDirectories)" Condition="Exists(%(WorkingDirectories.Identity))" /> + <MakeDir Directories="@(WorkingDirectories)" /> <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="SolutionTarget=Clean;BuildConfiguration=$(BuildConfiguration)" Targets="_BuildSolution" ContinueOnError="true" /> </Target> @@ -24,13 +24,13 @@ <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="Step=Two;SolutionTarget=Build;BuildConfiguration=$(BuildConfiguration)" Targets="_BuildSolution" /> </Target> - <Target Name="_GenerateSource"> + <Target Name="_GenerateSource"> <Exec Command="$(ProtocExePath) --proto_path=$(ProtosDirectory) --descriptor_set_out=compiled.pb @(Protos->'%(RelativeDir)%(Filename)%(Extension)', ' ')" WorkingDirectory="$(BuildTempDirectory)" /> - <Exec Command="$(ProtogenExePath) compiled.pb" WorkingDirectory="$(BuildTempDirectory)" /> - </Target> + <Exec Command="$(ProtogenExePath) compiled.pb" WorkingDirectory="$(BuildTempDirectory)" /> + </Target> - <Target Name="_CopyGeneratedSource" DependsOnTargets="_GenerateSource"> - <Copy SourceFiles="%(GeneratedSource.Identity)" DestinationFiles="%(GeneratedSource.TargetDirectory)\%(GeneratedSource.Filename)%(GeneratedSource.Extension)" /> + <Target Name="_CopyGeneratedSource" DependsOnTargets="_GenerateSource"> + <Copy SourceFiles="%(GeneratedSource.Identity)" DestinationFiles="%(GeneratedSource.TargetDirectory)\%(GeneratedSource.Filename)%(GeneratedSource.Extension)" /> </Target> <Target Name="_Test" DependsOnTargets="_CompileGeneratedSource" Condition="$(BuildConfiguration)=='Debug' or $(BuildConfiguration)=='Release'"> @@ -38,74 +38,74 @@ </Target> <Target Name="_RunTests"> - <Exec Command=""$(NUnitExePath)" /noshadow %(TestContainer.Identity) /xml:$(BuildTempDirectory)\..\%(TestContainer.Filename).$(BuildConfiguration).xml" /> - </Target> - - <!--## Package Generation ##--> - <Target Name="_CleanOutputDirectory"> - <RemoveDir Directories="$(BuildOutputDirectory)" ContinueOnError="true" /> - <MakeDir Directories="$(BuildOutputDirectory)" ContinueOnError="true" /> - </Target> - - <Target Name="_PreparePackageComponent"> - <Copy SourceFiles="@(DynamicPackageItem)" DestinationFolder="$(BuildOutputDirectory)\%(DynamicPackageItem.TargetDirectory)\%(DynamicPackageItem.RecursiveDir)" /> - </Target> - - <Target Name="_GeneratePackage"> - <Copy SourceFiles="@(StaticPackageItem)" DestinationFolder="$(BuildOutputDirectory)\%(StaticPackageItem.TargetDirectory)\%(StaticPackageItem.RecursiveDir)" /> - <Exec Command=""$(ZipExePath)" a -tzip $(PackageName) * -r" WorkingDirectory="$(BuildOutputDirectory)" /> - - </Target> - - <!--## Benchmark ##--> - <Target Name="_GenerateBenchmarkSource" DependsOnTargets="_Clean;_Compile"> - <PropertyGroup> - <Args>$(BenchmarkProtosDirectory)\google_size.proto $(BenchmarkProtosDirectory)\google_speed.proto</Args> - </PropertyGroup> - - <Exec Command="$(ProtocExePath) --proto_path=$(BenchmarkProtosDirectory);$(ProtosDirectory) --include_imports=compiled.pb --descriptor_set_out=compiled.pb $(Args)" WorkingDirectory="$(BuildTempDirectory)" /> - <Exec Command="$(ProtogenExePath) compiled.pb" WorkingDirectory="$(BuildTempDirectory)" /> - </Target> - - <Target Name="_CompileBenchmarkAssembly" DependsOnTargets="_GenerateBenchmarkSource"> - <ItemGroup> - <BenchmarkSources Include="$(BuildTempDirectory)\GoogleSizeProtoFile.cs" /> + <Exec Command=""$(NUnitExePath)" /noshadow %(TestContainer.Identity) /xml:$(BuildTempDirectory)\..\%(TestContainer.Filename).$(BuildConfiguration).xml" /> + </Target> + + <!--## Package Generation ##--> + <Target Name="_CleanOutputDirectory"> + <RemoveDir Directories="$(ProjectDirectory)\build_output\Package" ContinueOnError="true" /> + <RemoveDir Directories="$(ProjectDirectory)\build_output" ContinueOnError="true" /> + <MakeDir Directories="$(ProjectDirectory)\build_output" ContinueOnError="true" /> + </Target> + + <Target Name="_PreparePackageComponent"> + <Copy SourceFiles="@(DynamicPackageItem)" DestinationFolder="$(ProjectDirectory)\build_output\Package\$(BuildConfiguration)\%(DynamicPackageItem.TargetDirectory)\%(DynamicPackageItem.RecursiveDir)" /> + </Target> + + <Target Name="_GeneratePackage"> + <Copy SourceFiles="@(StaticPackageItem)" DestinationFolder="$(ProjectDirectory)\build_output\Package\%(StaticPackageItem.TargetDirectory)\%(StaticPackageItem.RecursiveDir)" /> + <Exec Command=""$(ZipExePath)" a -tzip ..\$(PackageName) * -r" WorkingDirectory="$(ProjectDirectory)\build_output\Package" /> + </Target> + + <!--## Benchmark ##--> + <Target Name="_GenerateBenchmarkSource" DependsOnTargets="_Clean;_Compile"> + <PropertyGroup> + <Args>$(BenchmarkProtosDirectory)\google_size.proto $(BenchmarkProtosDirectory)\google_speed.proto</Args> + </PropertyGroup> + + <Exec Command="$(ProtocExePath) --proto_path=$(BenchmarkProtosDirectory);$(ProtosDirectory) --include_imports=compiled.pb --descriptor_set_out=compiled.pb $(Args)" WorkingDirectory="$(BuildTempDirectory)" /> + <Exec Command="$(ProtogenExePath) compiled.pb" WorkingDirectory="$(BuildTempDirectory)" /> + </Target> + + <Target Name="_CompileBenchmarkAssembly" DependsOnTargets="_GenerateBenchmarkSource"> + <ItemGroup> + <BenchmarkSources Include="$(BuildTempDirectory)\GoogleSizeProtoFile.cs" /> <BenchmarkSources Include="$(BuildTempDirectory)\GoogleSpeedProtoFile.cs" /> <BenchmarkSources Include="$(SourceDirectory)\ProtoBench\Properties\AssemblyInfo.cs" /> - </ItemGroup> - - <Csc TargetType="library" OutputAssembly="$(BuildTempDirectory)\BenchmarkTypes.dll" Optimize="true" Sources="@(BenchmarkSources)" References="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.dll" /> - </Target> - - <Target Name="_PrepareBenchmarkEnvironment" DependsOnTargets="_CompileBenchmarkAssembly"> - <ItemGroup> - <BenchmarkResources Include="$(BenchmarkProtosDirectory)\google_message1.dat" /> - <BenchmarkResources Include="$(BenchmarkProtosDirectory)\google_message2.dat" /> - <BenchmarkResources Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.dll" /> - <BenchmarkResources Include="$(SourceDirectory)\ProtoBench\bin\$(BuildConfiguration)\ProtoBench.exe" /> - </ItemGroup> - - <Copy SourceFiles="@(BenchmarkResources)" DestinationFolder="$(BuildTempDirectory)" /> - </Target> - - <Target Name="_RunBenchmarks" DependsOnTargets="_PrepareBenchmarkEnvironment"> - <ItemGroup> - <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SizeMessage1,BenchmarkTypes" /> - <BenchmarkParameter Include="google_message1.dat" /> - <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SpeedMessage1,BenchmarkTypes" /> - <BenchmarkParameter Include="google_message1.dat" /> - <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SizeMessage2,BenchmarkTypes" /> - <BenchmarkParameter Include="google_message2.dat" /> - <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SpeedMessage2,BenchmarkTypes" /> - <BenchmarkParameter Include="google_message2.dat" /> - </ItemGroup> - - <PropertyGroup> - <BenchmarkParameterList>@(BenchmarkParameter)</BenchmarkParameterList> - <Args>$(BenchmarkParameterList.Replace(`;`,` `))</Args> - </PropertyGroup> - - <Exec Command=""$(ProtoBenchExePath)" @(BenchmarkParameter->'%(Identity)', ' ') > "$(BuildTempDirectory)\..\BenchmarkResults.txt"" WorkingDirectory="$(BuildTempDirectory)" /> - </Target> + </ItemGroup> + + <Csc TargetType="library" OutputAssembly="$(BuildTempDirectory)\BenchmarkTypes.dll" Optimize="true" Sources="@(BenchmarkSources)" References="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.dll" /> + </Target> + + <Target Name="_PrepareBenchmarkEnvironment" DependsOnTargets="_CompileBenchmarkAssembly"> + <ItemGroup> + <BenchmarkResources Include="$(BenchmarkProtosDirectory)\google_message1.dat" /> + <BenchmarkResources Include="$(BenchmarkProtosDirectory)\google_message2.dat" /> + <BenchmarkResources Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.dll" /> + <BenchmarkResources Include="$(SourceDirectory)\ProtoBench\bin\$(BuildConfiguration)\ProtoBench.exe" /> + </ItemGroup> + + <Copy SourceFiles="@(BenchmarkResources)" DestinationFolder="$(BuildTempDirectory)" /> + </Target> + + <Target Name="_RunBenchmarks" DependsOnTargets="_PrepareBenchmarkEnvironment"> + <ItemGroup> + <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SizeMessage1,BenchmarkTypes" /> + <BenchmarkParameter Include="google_message1.dat" /> + <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SpeedMessage1,BenchmarkTypes" /> + <BenchmarkParameter Include="google_message1.dat" /> + <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SizeMessage2,BenchmarkTypes" /> + <BenchmarkParameter Include="google_message2.dat" /> + <BenchmarkParameter Include="Google.ProtocolBuffers.ProtoBench.SpeedMessage2,BenchmarkTypes" /> + <BenchmarkParameter Include="google_message2.dat" /> + </ItemGroup> + + <PropertyGroup> + <BenchmarkParameterList>@(BenchmarkParameter)</BenchmarkParameterList> + <Args>$(BenchmarkParameterList.Replace(`;`,` `))</Args> + </PropertyGroup> + + <Exec Command=""$(ProtoBenchExePath)" @(BenchmarkParameter->'%(Identity)', ' ') > "$(BuildTempDirectory)\..\BenchmarkResults.txt"" WorkingDirectory="$(BuildTempDirectory)" /> + </Target> </Project>
\ No newline at end of file diff --git a/build/GenerateCompletePackage.bat b/build/GenerateCompletePackage.bat index 959dc788..bc1b8e1b 100644 --- a/build/GenerateCompletePackage.bat +++ b/build/GenerateCompletePackage.bat @@ -2,16 +2,16 @@ %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory IF ERRORLEVEL 1 GOTO END -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Debug /p:Platform="Any CPU" +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Debug /p:Platform="Any CPU" IF ERRORLEVEL 1 GOTO END -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Debug_Silverlight2 /p:Platform="Any CPU" +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Debug_Silverlight2 /p:Platform="Any CPU" IF ERRORLEVEL 1 GOTO END -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU" +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU" IF ERRORLEVEL 1 GOTO END -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" IF ERRORLEVEL 1 GOTO END %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:GeneratePackage /p:PackageName=AllBinariesAndSource.zip /p:Platform="Any CPU" diff --git a/build/GenerateReleasePackage.bat b/build/GenerateReleasePackage.bat index 70111b74..7516d5d6 100644 --- a/build/GenerateReleasePackage.bat +++ b/build/GenerateReleasePackage.bat @@ -2,10 +2,10 @@ %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:PrepareOutputDirectory IF ERRORLEVEL 1 GOTO END -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU" +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release /p:Platform="Any CPU" IF ERRORLEVEL 1 GOTO END -%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Build;PreparePackageComponent /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" +%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:Rebuild;PreparePackageComponent /p:BuildConfiguration=Release_Silverlight2 /p:Platform="Any CPU" IF ERRORLEVEL 1 GOTO END %WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild build.csproj /m /t:GeneratePackage /p:PackageName=ReleaseBinaries.zip /p:Platform="Any CPU" diff --git a/build/build.csproj b/build/build.csproj index ad8d4c87..a3f342e6 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -1,102 +1,102 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <ProjectName>Protocol Buffers</ProjectName> + <PropertyGroup> + <ProjectName>Protocol Buffers</ProjectName> <BuildConfiguration Condition=" '$(BuildConfiguration)' == '' ">Error</BuildConfiguration> <BuildTools Condition=" '$(BuildTools)' == '' ">4.0</BuildTools> <ForcedFrameworkVersion Condition=" '$(BuildTools)' == '3.5' ">TargetFrameworkVersion=v2.0;</ForcedFrameworkVersion> <!--Directory Paths--> <ProjectDirectory>$(MSBuildProjectDirectory)\..</ProjectDirectory> - <SourceDirectory>$(ProjectDirectory)\src</SourceDirectory> - <LibDirectory>$(ProjectDirectory)\lib</LibDirectory> - <ProtosDirectory>$(ProjectDirectory)\protos</ProtosDirectory> - <BenchmarkProtosDirectory>$(ProjectDirectory)\benchmarks</BenchmarkProtosDirectory> - <BuildTempDirectory>$(ProjectDirectory)\build_temp\$(BuildConfiguration)</BuildTempDirectory> - <BuildOutputDirectory>$(ProjectDirectory)\build_output\$(BuildConfiguration)</BuildOutputDirectory> + <SourceDirectory>$(ProjectDirectory)\src</SourceDirectory> + <LibDirectory>$(ProjectDirectory)\lib</LibDirectory> + <ProtosDirectory>$(ProjectDirectory)\protos</ProtosDirectory> + <BenchmarkProtosDirectory>$(ProjectDirectory)\benchmarks</BenchmarkProtosDirectory> + <BuildTempDirectory>$(ProjectDirectory)\build_temp\$(BuildConfiguration)</BuildTempDirectory> + <BuildOutputDirectory>$(ProjectDirectory)\build_output\$(BuildConfiguration)</BuildOutputDirectory> <PackageName Condition=" '$(PackageName)' == '' ">$(BuildConfiguration)</PackageName> - <!--File Paths--> + <!--File Paths--> <SolutionFile Condition=" '$(BuildTools)' == '4.0' ">$(SourceDirectory)\ProtocolBuffers.sln</SolutionFile> <SolutionFile Condition=" '$(BuildTools)' == '3.5' ">$(SourceDirectory)\ProtocolBuffers2008.sln</SolutionFile> <!--Tool Paths--> - <ProtocExePath>$(LibDirectory)\protoc.exe</ProtocExePath> - <ProtogenExePath>$(SourceDirectory)\ProtoGen\bin\$(BuildConfiguration)\protogen.exe</ProtogenExePath> - <ProtoBenchExePath>$(BuildTempDirectory)\ProtoBench.exe</ProtoBenchExePath> - <NUnitExePath>$(LibDirectory)\NUnit 2.2.8.0\nunit-console.exe</NUnitExePath> - <ZipExePath>$(LibDirectory)\7-Zip 9.20\7za.exe</ZipExePath> - </PropertyGroup> + <ProtocExePath>$(LibDirectory)\protoc.exe</ProtocExePath> + <ProtogenExePath>$(SourceDirectory)\ProtoGen\bin\$(BuildConfiguration)\protogen.exe</ProtogenExePath> + <ProtoBenchExePath>$(BuildTempDirectory)\ProtoBench.exe</ProtoBenchExePath> + <NUnitExePath>$(LibDirectory)\NUnit 2.2.8.0\nunit-console.exe</NUnitExePath> + <ZipExePath>$(LibDirectory)\7-Zip 9.20\7za.exe</ZipExePath> + </PropertyGroup> - <Import Project="Common.targets"/> + <Import Project="Common.targets"/> - <ItemGroup> - <WorkingDirectories Include="$(BuildTempDirectory)" /> - <WorkingDirectories Include="$(BuildOutputDirectory)" /> + <ItemGroup> + <WorkingDirectories Include="$(BuildTempDirectory)" /> + <WorkingDirectories Include="$(BuildOutputDirectory)" /> - <Protos Include="$(ProtosDirectory)\extest\unittest_extras_full.proto" /> - <Protos Include="$(ProtosDirectory)\extest\unittest_extras_lite.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\descriptor.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\csharp_options.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_csharp_options.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_custom_options.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_embed_optimize_for.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_empty.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import_lite.proto" /> + <Protos Include="$(ProtosDirectory)\extest\unittest_extras_full.proto" /> + <Protos Include="$(ProtosDirectory)\extest\unittest_extras_lite.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\descriptor.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\csharp_options.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_csharp_options.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_custom_options.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_embed_optimize_for.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_empty.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_import_lite.proto" /> <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_lite.proto" /> <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_lite_imports_nonlite.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_mset.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_no_generic_services.proto" /> - <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_optimize_for.proto" /> - <Protos Include="$(ProtosDirectory)\tutorial\addressbook.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_mset.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_no_generic_services.proto" /> + <Protos Include="$(ProtosDirectory)\google\protobuf\unittest_optimize_for.proto" /> + <Protos Include="$(ProtosDirectory)\tutorial\addressbook.proto" /> <!-- Main protos --> - <GeneratedSource Include="$(BuildTempDirectory)\CSharpOptions.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\DescriptorProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory> - </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\CSharpOptions.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\DescriptorProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers\DescriptorProtos</TargetDirectory> + </GeneratedSource> <!-- Address book sample --> - <GeneratedSource Include="$(BuildTempDirectory)\AddressBookProtos.cs"> - <TargetDirectory>$(SourceDirectory)\AddressBook</TargetDirectory> - </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\AddressBookProtos.cs"> + <TargetDirectory>$(SourceDirectory)\AddressBook</TargetDirectory> + </GeneratedSource> <!-- Unit test --> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestCSharpOptionsProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestCustomOptionsProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestEmbedOptimizeForProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestEmptyProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestImportLiteProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestImportProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestMessageSetProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestNoGenericServicesProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestOptimizeForProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> - <GeneratedSource Include="$(BuildTempDirectory)\UnitTestProtoFile.cs"> - <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> - </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestCSharpOptionsProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestCustomOptionsProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestEmbedOptimizeForProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestEmptyProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestImportLiteProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestImportProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestMessageSetProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestNoGenericServicesProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestOptimizeForProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> + <GeneratedSource Include="$(BuildTempDirectory)\UnitTestProtoFile.cs"> + <TargetDirectory>$(SourceDirectory)\ProtocolBuffers.Test\TestProtos</TargetDirectory> + </GeneratedSource> <!-- Lite unit test --> <GeneratedSource Include="$(BuildTempDirectory)\UnitTestExtrasFullProtoFile.cs"> <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory> @@ -116,29 +116,29 @@ <GeneratedSource Include="$(BuildTempDirectory)\UnitTestProtoFile.cs"> <TargetDirectory>$(SourceDirectory)\ProtocolBuffersLite.Test\TestProtos</TargetDirectory> </GeneratedSource> - - <TestContainer Include="$(SourceDirectory)\ProtocolBuffers.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Test.dll" /> - <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.Test.dll" /> - <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersMixedLite.Test.dll" /> - <TestContainer Include="$(SourceDirectory)\ProtoGen.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.ProtoGen.Test.dll" /> + + <TestContainer Include="$(SourceDirectory)\ProtocolBuffers.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Test.dll" /> + <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.Test.dll" /> + <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersMixedLite.Test.dll" /> + <TestContainer Include="$(SourceDirectory)\ProtoGen.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.ProtoGen.Test.dll" /> - <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.*" /> - <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.*" /> - <DynamicPackageItem Include="$(SourceDirectory)\ProtoGen\bin\$(BuildConfiguration)\ProtoGen.*" /> - <DynamicPackageItem Include="$(SourceDirectory)\ProtoMunge\bin\$(BuildConfiguration)\ProtoMunge.*" /> - <DynamicPackageItem Include="$(SourceDirectory)\ProtoDump\bin\$(BuildConfiguration)\ProtoDump.*" /> - <DynamicPackageItem Include="$(SourceDirectory)\ProtoBench\bin\$(BuildConfiguration)\ProtoBench.*" /> + <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.*" /> + <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.*" /> + <DynamicPackageItem Include="$(SourceDirectory)\ProtoGen\bin\$(BuildConfiguration)\ProtoGen.*" /> + <DynamicPackageItem Include="$(SourceDirectory)\ProtoMunge\bin\$(BuildConfiguration)\ProtoMunge.*" /> + <DynamicPackageItem Include="$(SourceDirectory)\ProtoDump\bin\$(BuildConfiguration)\ProtoDump.*" /> + <DynamicPackageItem Include="$(SourceDirectory)\ProtoBench\bin\$(BuildConfiguration)\ProtoBench.*" /> - <StaticPackageItem Include="$(ProjectDirectory)\readme.txt" /> - <StaticPackageItem Include="$(ProjectDirectory)\license.txt" /> - <StaticPackageItem Include="$(ProjectDirectory)\protos\**\*.*"> - <TargetDirectory>\protos</TargetDirectory> - </StaticPackageItem> - <StaticPackageItem Include="$(LibDirectory)\Protoc*"> - <TargetDirectory>\Protoc</TargetDirectory> - </StaticPackageItem> - - </ItemGroup> + <StaticPackageItem Include="$(ProjectDirectory)\readme.txt" /> + <StaticPackageItem Include="$(ProjectDirectory)\license.txt" /> + <StaticPackageItem Include="$(ProjectDirectory)\protos\**\*.*"> + <TargetDirectory>\protos</TargetDirectory> + </StaticPackageItem> + <StaticPackageItem Include="$(LibDirectory)\Protoc*"> + <TargetDirectory>\Protoc</TargetDirectory> + </StaticPackageItem> + + </ItemGroup> <!-- targets --> <Target Name="Clean" DependsOnTargets="_Clean" /> @@ -146,9 +146,9 @@ <Target Name="Test" DependsOnTargets="_RunTests" /> <Target Name="Rebuild" DependsOnTargets="Clean;Build" /> <Target Name="BuildPackage" DependsOnTargets="PrepareOutputDirectory;PreparePackageComponent;GeneratePackage" /> - <Target Name="PrepareOutputDirectory" DependsOnTargets="_CleanOutputDirectory" /> - <Target Name="PreparePackageComponent" DependsOnTargets="_PreparePackageComponent" /> - <Target Name="GeneratePackage" DependsOnTargets="_GeneratePackage" /> - <Target Name="RunBenchmarks" DependsOnTargets="_RunBenchmarks" /> + <Target Name="PrepareOutputDirectory" DependsOnTargets="_CleanOutputDirectory" /> + <Target Name="PreparePackageComponent" DependsOnTargets="_PreparePackageComponent" /> + <Target Name="GeneratePackage" DependsOnTargets="_GeneratePackage" /> + <Target Name="RunBenchmarks" DependsOnTargets="_RunBenchmarks" /> </Project> |