diff options
| author | Jon Skeet <jonskeet@google.com> | 2015-08-25 14:32:28 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-08-25 14:32:28 +0100 |
| commit | ca89a1a118c98d107421d40c4513e5aefdd2c3e3 (patch) | |
| tree | 8c4310bebb4a01ea859f439f850df3ec49079534 /csharp/generate_protos.sh | |
| parent | 3253634dcb2cbd5917d10aebc1a18a7692b237a3 (diff) | |
| download | protobuf-ca89a1a118c98d107421d40c4513e5aefdd2c3e3.tar.gz protobuf-ca89a1a118c98d107421d40c4513e5aefdd2c3e3.tar.bz2 protobuf-ca89a1a118c98d107421d40c4513e5aefdd2c3e3.zip | |
Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
We now do this in protoc instead of the generation simpler.
Benefits:
- Generation script is simpler
- Detection is simpler as we now only need to care about one filename
- The embedded descriptor knows itself as "google/protobuf/descriptor.proto" avoiding dependency issues
This PR also makes the "invalid dependency" exception clearer in terms of expected and actual dependencies.
Diffstat (limited to 'csharp/generate_protos.sh')
| -rwxr-xr-x | csharp/generate_protos.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh index 962f2a9c..da6f940e 100755 --- a/csharp/generate_protos.sh +++ b/csharp/generate_protos.sh @@ -37,10 +37,8 @@ fi # Descriptor proto # TODO(jonskeet): Remove fixup -cp src/google/protobuf/descriptor.proto src/google/protobuf/descriptor_proto_file.proto $PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf/Reflection \ - src/google/protobuf/descriptor_proto_file.proto -rm src/google/protobuf/descriptor_proto_file.proto + src/google/protobuf/descriptor.proto $PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf/WellKnownTypes \ src/google/protobuf/any.proto \ |