734393d0f9
To my surprise, executing generate_protos.sh used the version of Bash installed with Git for Windows by default. After a few modifications to detect the most appropriate protoc to use, this worked pretty simply. This change also: - adds generation of the address book tutorial proto, - fixes the addressbook.proto to specify proto2 explicitly (to avoid a warning from protoc; I don't think we want warnings...) - fixes the addressbook.proto C# namespace (which I thought I'd done before, but apparently hadn't) - includes the regenerated UnittestCustomOptions.cs apart from the DescriptorProtoFIle => Descriptor change
34 lines
730 B
Protocol Buffer
34 lines
730 B
Protocol Buffer
// See README.txt for information and build instructions.
|
|
|
|
syntax = "proto2";
|
|
|
|
package tutorial;
|
|
|
|
option java_package = "com.example.tutorial";
|
|
option java_outer_classname = "AddressBookProtos";
|
|
option csharp_namespace = "Google.ProtocolBuffers.Examples.AddressBook";
|
|
|
|
message Person {
|
|
required string name = 1;
|
|
required int32 id = 2; // Unique ID number for this person.
|
|
optional string email = 3;
|
|
|
|
enum PhoneType {
|
|
MOBILE = 0;
|
|
HOME = 1;
|
|
WORK = 2;
|
|
}
|
|
|
|
message PhoneNumber {
|
|
required string number = 1;
|
|
optional PhoneType type = 2 [default = HOME];
|
|
}
|
|
|
|
repeated PhoneNumber phone = 4;
|
|
}
|
|
|
|
// Our address book file is just one of these.
|
|
message AddressBook {
|
|
repeated Person person = 1;
|
|
}
|