diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-25 20:24:43 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-25 20:24:43 -0700 |
| commit | b192ba87f72b5e3e8add09bbcbb7623831e3079b (patch) | |
| tree | affb3beff3c33050e7f93647ddab8606899ff03d /csharp/generate_protos.sh | |
| parent | 5da0b46811a103bd1a953f496d4bcd5ff45d3736 (diff) | |
| parent | cf94f7b74495d08b833056016e045a0ae3fb64fa (diff) | |
| download | protobuf-b192ba87f72b5e3e8add09bbcbb7623831e3079b.tar.gz protobuf-b192ba87f72b5e3e8add09bbcbb7623831e3079b.tar.bz2 protobuf-b192ba87f72b5e3e8add09bbcbb7623831e3079b.zip | |
Merge remote-tracking branch 'origin/master' into beta-1
Diffstat (limited to 'csharp/generate_protos.sh')
| -rwxr-xr-x | csharp/generate_protos.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh index 962f2a9c..0d217a9d 100755 --- a/csharp/generate_protos.sh +++ b/csharp/generate_protos.sh @@ -36,11 +36,8 @@ if [ -z "$PROTOC" ]; then 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 \ |