Commit 1fcb7190 authored by ArnoldZokas's avatar ArnoldZokas

Migrated target '_GenerateSource'

parent 7f026c71
...@@ -21,9 +21,8 @@ src/ProtoMunge/obj/ ...@@ -21,9 +21,8 @@ src/ProtoMunge/obj/
mono/bin mono/bin
mono/tmp mono/tmp
mono/protoc mono/protoc
_tmp build_output
_dist build_temp
_benchmark
# #
# Untracked files # Untracked files
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="_Clean"> <Target Name="_Clean">
...@@ -7,10 +8,20 @@ ...@@ -7,10 +8,20 @@
</Target> </Target>
<Target Name="_Compile" DependsOnTargets="_Clean"> <Target Name="_Compile" DependsOnTargets="_Clean">
<MSBuild Projects="@(Solution)" Properties="Configuration=$(BuildConfiguration)" BuildInParallel="true" /> <MSBuild Projects="$(SolutionFile)" Properties="Configuration=$(BuildConfiguration)" BuildInParallel="true" />
</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="$(ProtogenExePath) compiled.pb" WorkingDirectory="$(BuildTempDirectory)" />
</Target> </Target>
<Target Name="_Test"> <Target Name="_Test" DependsOnTargets="_GenerateSource">
<Exec Command="&quot;E:\dotnet-protobufs\lib\NUnit 2.2.8.0\nunit-console.exe&quot; %(TestContainer.Identity) /xml:$(BuildOutputDirectory)\%(TestContainer.Filename).$(BuildConfiguration).xml" /> <Exec Command="&quot;E:\dotnet-protobufs\lib\NUnit 2.2.8.0\nunit-console.exe&quot; %(TestContainer.Identity) /xml:$(BuildOutputDirectory)\%(TestContainer.Filename).$(BuildConfiguration).xml" />
</Target> </Target>
......
...@@ -3,25 +3,39 @@ ...@@ -3,25 +3,39 @@
<PropertyGroup> <PropertyGroup>
<ProjectName>Protocol Buffers</ProjectName> <ProjectName>Protocol Buffers</ProjectName>
<BuildConfiguration>Debug</BuildConfiguration> <BuildConfiguration></BuildConfiguration>
<!--Directory Paths--> <!--Directory Paths-->
<ProjectDirectory>$(MSBuildProjectDirectory)\..</ProjectDirectory> <ProjectDirectory>$(MSBuildProjectDirectory)\..</ProjectDirectory>
<ProtosDirectory>$(ProjectDirectory)\protos</ProtosDirectory>
<BuildTempDirectory>$(ProjectDirectory)\build_temp\$(BuildConfiguration)</BuildTempDirectory>
<BuildOutputDirectory>$(ProjectDirectory)\build_output</BuildOutputDirectory> <BuildOutputDirectory>$(ProjectDirectory)\build_output</BuildOutputDirectory>
<!--File Paths--> <!--File Paths-->
<SolutionFile>$(ProjectDirectory)\src\ProtocolBuffers.sln</SolutionFile> <SolutionFile>$(ProjectDirectory)\src\ProtocolBuffers.sln</SolutionFile>
<!--Tool Paths--> <!--Tool Paths-->
<ProtocExePath>$(ProjectDirectory)\lib\protoc.exe</ProtocExePath>
<ProtogenExePath>$(ProjectDirectory)\src\ProtoGen\bin\$(BuildConfiguration)\protogen.exe</ProtogenExePath>
<NUnitExePath>$(ProjectDirectory)\lib\NUnit 2.2.8.0\nunit-console.exe</NUnitExePath> <NUnitExePath>$(ProjectDirectory)\lib\NUnit 2.2.8.0\nunit-console.exe</NUnitExePath>
</PropertyGroup> </PropertyGroup>
<Import Project="Common.targets"/> <Import Project="Common.targets"/>
<ItemGroup> <ItemGroup>
<WorkingDirectories Include="$(BuildTempDirectory)" />
<WorkingDirectories Include="$(BuildOutputDirectory)" /> <WorkingDirectories Include="$(BuildOutputDirectory)" />
<Solution Include="$(SolutionFile)" /> <Protos Include="$(ProtosDirectory)\google\protobuf\descriptor.proto" />
<Protos Include="$(ProtosDirectory)\google\protobuf\csharp_options.proto" />
<Protos Include="$(ProjectDirectory)\protos\google\protobuf\unittest.proto" />
<Protos Include="$(ProjectDirectory)\protos\google\protobuf\unittest_csharp_options.proto" />
<Protos Include="$(ProjectDirectory)\protos\google\protobuf\unittest_custom_options.proto" />
<Protos Include="$(ProjectDirectory)\protos\google\protobuf\unittest_embed_optimize_for.proto" />
<Protos Include="$(ProjectDirectory)\protos\google\protobuf\unittest_import.proto" />
<Protos Include="$(ProjectDirectory)\protos\google\protobuf\unittest_mset.proto" />
<Protos Include="$(ProjectDirectory)\protos\google\protobuf\unittest_optimize_for.proto" />
<Protos Include="$(ProjectDirectory)\protos\tutorial\addressbook.proto" />
<TestContainer Include="$(ProjectDirectory)\src\ProtocolBuffers.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Test.dll" /> <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" /> <TestContainer Include="$(ProjectDirectory)\src\ProtoGen.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.ProtoGen.Test.dll" />
...@@ -30,6 +44,6 @@ ...@@ -30,6 +44,6 @@
<!-- targets --> <!-- targets -->
<Target Name="Build" DependsOnTargets="_Compile;_Test" /> <Target Name="Build" DependsOnTargets="_Compile;_Test" />
<Target Name="RunBenchmarks" DependsOnTargets="_Compile" /> <Target Name="RunBenchmarks" DependsOnTargets="_Compile" />
<Target Name="GeneratePackage" DependsOnTargets="_Compile" /> <Target Name="GeneratePackage" />
</Project> </Project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment