diff options
| author | Jon Skeet <jonskeet@google.com> | 2015-05-14 09:11:57 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-05-14 09:11:57 +0100 |
| commit | 734393d0f9e1f746f4bd228f709c5b1142faa16d (patch) | |
| tree | 3cb105db805c328c1823d1c191301f2fb45397af /examples | |
| parent | 2d9b1c592ff7319ee9d6520c9df4838087522e05 (diff) | |
| download | protobuf-734393d0f9e1f746f4bd228f709c5b1142faa16d.tar.gz protobuf-734393d0f9e1f746f4bd228f709c5b1142faa16d.tar.bz2 protobuf-734393d0f9e1f746f4bd228f709c5b1142faa16d.zip | |
Make generate_protos.sh Windows-friendly.
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
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/addressbook.proto | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/addressbook.proto b/examples/addressbook.proto index b14829e9..91c9ffc4 100644 --- a/examples/addressbook.proto +++ b/examples/addressbook.proto @@ -1,9 +1,12 @@ // 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; |