Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix MSVC projects to ensure that protoc is built before lite-test attempts to use it and that lite-test and tests don't attempt to generate the same .pb.* files at the same time.

Browse Source
pull/3335/head
kenton@google.com 16 years ago
parent 09b9e99bd3
commit db0bf5a52f
2 changed files with 10 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      vsprojects/protobuf.sln
  2. 82
      vsprojects/tests.vcproj

1
vsprojects/protobuf.sln
Unescape View File

@ -32,6 +32,7 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lite-test", "lite-test.vcproj", "{12015ACE-42BE-4952-A5A0-44A9A46908E2}"
ProjectSection(ProjectDependencies) = postProject
{49EA010D-706F-4BE2-A397-77854B72A040} = {49EA010D-706F-4BE2-A397-77854B72A040}
{1738D5F6-ED1E-47E0-B2F0-456864B93C1E} = {1738D5F6-ED1E-47E0-B2F0-456864B93C1E}
EndProjectSection
EndProject
Global

82
vsprojects/tests.vcproj
Unescape View File

@ -198,14 +198,6 @@
RelativePath=".\google\protobuf\unittest.pb.h"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_lite.pb.h"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_custom_options.pb.h"
>
@ -219,7 +211,7 @@
>
</File>
<File
RelativePath=".\google\protobuf\unittest_import_lite.pb.h"
RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h"
>
</File>
<File
@ -346,14 +338,6 @@
RelativePath=".\google\protobuf\unittest.pb.cc"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_lite.pb.cc"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_lite_imports_nonlite.pb.cc"
>
</File>
<File
RelativePath=".\google\protobuf\unittest_custom_options.pb.cc"
>
@ -367,7 +351,7 @@
>
</File>
<File
RelativePath=".\google\protobuf\unittest_import_lite.pb.cc"
RelativePath=".\google\protobuf\unittest_lite_imports_nonlite.pb.cc"
>
</File>
<File
@ -439,54 +423,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\google\protobuf\unittest_lite.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_lite.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_lite.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\google\protobuf\unittest_lite_imports_nonlite.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\google\protobuf\unittest_custom_options.proto"
>
@ -560,16 +496,16 @@
</FileConfiguration>
</File>
<File
RelativePath="..\src\google\protobuf\unittest_import_lite.proto"
RelativePath="..\src\google\protobuf\unittest_lite_imports_nonlite.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_import_lite.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"
Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
/>
</FileConfiguration>
<FileConfiguration
@ -577,9 +513,9 @@
>
<Tool
Name="VCCustomBuildTool"
Description="Generating unittest_import_lite.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"
Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto&#x0D;&#x0A;"
Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
/>
</FileConfiguration>
</File>

Write Preview
Loading…
Cancel
Save