From 734393d0f9e1f746f4bd228f709c5b1142faa16d Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Thu, 14 May 2015 09:11:57 +0100 Subject: 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 --- examples/addressbook.proto | 3 +++ 1 file changed, 3 insertions(+) (limited to 'examples') 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; -- cgit v1.2.3