diff options
| author | Jon Skeet <jonskeet@google.com> | 2016-01-04 14:02:00 +0000 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2016-01-04 14:02:00 +0000 |
| commit | d49b9c81ecf1e1c40b240d1a9872aa33a1dfdfa4 (patch) | |
| tree | cf35cce03542e5478f9bd115569fa53f2b075864 /csharp/generate_protos.sh | |
| parent | 77831c076dc2b0c5f6892e7cf3be83ac603093a9 (diff) | |
| download | protobuf-d49b9c81ecf1e1c40b240d1a9872aa33a1dfdfa4.tar.gz protobuf-d49b9c81ecf1e1c40b240d1a9872aa33a1dfdfa4.tar.bz2 protobuf-d49b9c81ecf1e1c40b240d1a9872aa33a1dfdfa4.zip | |
Fix C# source generation shell script and remove out of date notes
The conformance tests now use types which are part of src/google/protobuf, so we need to include src in the proto path.
The notes around "fix-ups" have been out of date for some time now.
Diffstat (limited to 'csharp/generate_protos.sh')
| -rwxr-xr-x | csharp/generate_protos.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh index 3a556b0e..9899097d 100755 --- a/csharp/generate_protos.sh +++ b/csharp/generate_protos.sh @@ -3,16 +3,6 @@ # You first need to make sure protoc has been built (see instructions on # building protoc in root of this repository) -# This script performs a few fix-ups as part of generation. These are: -# - descriptor.proto is renamed to descriptor_proto_file.proto before -# generation, to avoid the naming collision between the class for the file -# descriptor and its Descriptor property -# - This change also impacts UnittestCustomOptions, which expects to -# use a class of Descriptor when it's actually been renamed to -# DescriptorProtoFile. -# - Issue 307 (codegen for double-nested types) breaks Unittest.proto and -# its lite equivalents. - set -ex # cd to repository root @@ -68,5 +58,5 @@ $PROTOC -Icsharp/protos --csharp_out=csharp/src/Google.Protobuf.Test \ $PROTOC -Iexamples --csharp_out=csharp/src/AddressBook \ examples/addressbook.proto -$PROTOC -Iconformance --csharp_out=csharp/src/Google.Protobuf.Conformance \ +$PROTOC -Iconformance -Isrc --csharp_out=csharp/src/Google.Protobuf.Conformance \ conformance/conformance.proto |