diff options
| author | csharptest <roger@csharptest.net> | 2010-12-15 13:26:33 -0600 |
|---|---|---|
| committer | csharptest <roger@csharptest.net> | 2010-12-15 13:26:33 -0600 |
| commit | 30d3fa320573ae7be306b97cccb52c1d281d3d03 (patch) | |
| tree | 34dc4ca363a616ee162bacd374642aa9902b7ea8 /build/Common.targets | |
| parent | 727107726dfec2cb81602b6175a654cfcd3f2b27 (diff) | |
| download | protobuf-30d3fa320573ae7be306b97cccb52c1d281d3d03.tar.gz protobuf-30d3fa320573ae7be306b97cccb52c1d281d3d03.tar.bz2 protobuf-30d3fa320573ae7be306b97cccb52c1d281d3d03.zip | |
Converted build to also work under .net 3.5
Diffstat (limited to 'build/Common.targets')
| -rw-r--r-- | build/Common.targets | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/build/Common.targets b/build/Common.targets index a66bcf06..b6bac888 100644 --- a/build/Common.targets +++ b/build/Common.targets @@ -7,17 +7,18 @@ <MakeDir Directories="@(WorkingDirectories)" /> </Target> - <Target Name="_Compile" DependsOnTargets="_Clean"> - <MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(BuildConfiguration)" BuildInParallel="true" /> - </Target> + <Target Name="_Compile" DependsOnTargets="_Clean"> + <MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(BuildConfiguration)" BuildInParallel="true" Condition=" '$(BuildTools)' == '' " /> + <MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(BuildConfiguration);TargetFrameworkVersion=v2.0" Condition=" '$(BuildTools)' == 'v3.5' " /> + </Target> + <Target Name="_CompileGeneratedSource" DependsOnTargets="_CopyGeneratedSource"> + <MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(BuildConfiguration)" BuildInParallel="true" Condition=" '$(BuildTools)' == '' " /> + <MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(BuildConfiguration);TargetFrameworkVersion=v2.0" Condition=" '$(BuildTools)' == 'v3.5' " /> + </Target> + <Target Name="_GenerateSource"> - <PropertyGroup> - <ProtosList>@(Protos)</ProtosList> - <Args>$(ProtosList.Replace(`;`,` `))</Args> - </PropertyGroup> - - <Exec Command="$(ProtocExePath) --proto_path=$(ProtosDirectory) --descriptor_set_out=compiled.pb $(Args)" WorkingDirectory="$(BuildTempDirectory)" /> + <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> @@ -25,10 +26,6 @@ <Copy SourceFiles="%(GeneratedSource.Identity)" DestinationFiles="%(GeneratedSource.TargetDirectory)\%(GeneratedSource.Filename)%(GeneratedSource.Extension)" /> </Target> - <Target Name="_CompileGeneratedSource" DependsOnTargets="_CopyGeneratedSource"> - <MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(BuildConfiguration)" BuildInParallel="true" /> - </Target> - <Target Name="_Test" DependsOnTargets="_CompileGeneratedSource" Condition="$(BuildConfiguration)=='Debug' or $(BuildConfiguration)=='Release'"> <Exec Command=""$(NUnitExePath)" %(TestContainer.Identity) /xml:$(BuildTempDirectory)\..\%(TestContainer.Filename).$(BuildConfiguration).xml" /> </Target> |