diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-12-03 11:51:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-03 11:51:25 -0500 |
commit | f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5 (patch) | |
tree | b71a425660fc225154547f542ff1dbe0e342ade3 /csharp/generate_protos.sh | |
parent | 4280c2740300f414d95a5f282426f25f5b13e05d (diff) | |
download | protobuf-f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5.tar.gz protobuf-f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5.tar.bz2 protobuf-f1ce60e7b45c16affa4c8a92a9a129755c5fcfd5.zip |
Factored Conformance and Benchmark test messages into shared test schema. (#1971)
* Factored Conformance test messages into shared test schema.
* Updated benchmarks to use new proto3 message locations.
* Fixed include path.
* Conformance: fixed include of Python test messages.
* Make maven in Rakefile use --batch-mode.
* Revert changes to benchmarks.
On second thought I think a separate schema for
CPU benchmarking makes sense.
* Try regenerating C# protos for new test protos.
* Removed benchmark messages from test proto.
* Added Jon Skeet's fixes for C#.
* Removed duplicate/old test messages C# file.
* C# fixes for test schema move.
* Fixed C# to use the correct TestAllTypes message.
* Fixes for Objective C test schema move.
* Added missing EXTRA_DIST file.
Diffstat (limited to 'csharp/generate_protos.sh')
-rwxr-xr-x | csharp/generate_protos.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh index d979aa52..7cbcf436 100755 --- a/csharp/generate_protos.sh +++ b/csharp/generate_protos.sh @@ -54,6 +54,11 @@ $PROTOC -Icsharp/protos --csharp_out=csharp/src/Google.Protobuf.Test \ --csharp_opt=base_namespace=UnitTest.Issues \ csharp/protos/unittest_issues.proto +# Don't specify a base namespace at all; we just want to make sure the +# results end up in TestProtos. +$PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf.Test/TestProtos \ + src/google/protobuf/test_messages_proto3.proto + # AddressBook sample protos $PROTOC -Iexamples --csharp_out=csharp/src/AddressBook \ examples/addressbook.proto |