diff options
Diffstat (limited to 'src/ProtoGen')
-rw-r--r-- | src/ProtoGen/DescriptorUtil.cs | 25 | ||||
-rw-r--r-- | src/ProtoGen/Generator.cs | 93 | ||||
-rw-r--r-- | src/ProtoGen/GeneratorOptions.cs | 337 | ||||
-rw-r--r-- | src/ProtoGen/Program.cs | 24 | ||||
-rw-r--r-- | src/ProtoGen/ProgramPreprocess.cs | 277 | ||||
-rw-r--r-- | src/ProtoGen/ServiceGenerator.cs | 2 | ||||
-rw-r--r-- | src/ProtoGen/UmbrellaClassGenerator.cs | 18 |
7 files changed, 371 insertions, 405 deletions
diff --git a/src/ProtoGen/DescriptorUtil.cs b/src/ProtoGen/DescriptorUtil.cs index f485db6f..af5a2f9a 100644 --- a/src/ProtoGen/DescriptorUtil.cs +++ b/src/ProtoGen/DescriptorUtil.cs @@ -45,24 +45,25 @@ namespace Google.ProtocolBuffers.ProtoGen { internal static string GetFullUmbrellaClassName(IDescriptor descriptor) { CSharpFileOptions options = descriptor.File.CSharpOptions; string result = options.Namespace; - if (result != "") result += '.'; - result += QualifiedUmbrellaClassName(options); + if (result != "") { + result += '.'; + } + result += GetQualifiedUmbrellaClassName(options); return "global::" + result; } /// <summary> - /// ROK 2010-09-03 /// Evaluates the options and returns the qualified name of the umbrella class - /// relative to the descriptor type's namespace. Basically contacts the - /// UmbrellaNamespace + UmbrellaClassname fields. + /// relative to the descriptor type's namespace. Basically concatenates the + /// UmbrellaNamespace + UmbrellaClassname fields. /// </summary> - internal static string QualifiedUmbrellaClassName(CSharpFileOptions options) - { - string fullName = options.UmbrellaClassname; - if (!options.NestClasses && options.UmbrellaNamespace != "") - fullName = String.Format("{0}.{1}", options.UmbrellaNamespace, options.UmbrellaClassname); - return fullName; - } + internal static string GetQualifiedUmbrellaClassName(CSharpFileOptions options) { + string fullName = options.UmbrellaClassname; + if (!options.NestClasses && options.UmbrellaNamespace != "") { + fullName = String.Format("{0}.{1}", options.UmbrellaNamespace, options.UmbrellaClassname); + } + return fullName; + } internal static string GetMappedTypeName(MappedType type) { switch(type) { diff --git a/src/ProtoGen/Generator.cs b/src/ProtoGen/Generator.cs index b2d4e23f..f588c141 100644 --- a/src/ProtoGen/Generator.cs +++ b/src/ProtoGen/Generator.cs @@ -60,30 +60,30 @@ namespace Google.ProtocolBuffers.ProtoGen { } public void Generate() { - - List<FileDescriptorSet> descriptorProtos = new List<FileDescriptorSet>(); + + List<FileDescriptorSet> descriptorProtos = new List<FileDescriptorSet>(); foreach (string inputFile in options.InputFiles) { ExtensionRegistry extensionRegistry = ExtensionRegistry.CreateInstance(); extensionRegistry.Add(CSharpOptions.CSharpFileOptions); extensionRegistry.Add(CSharpOptions.CSharpFieldOptions); using (Stream inputStream = File.OpenRead(inputFile)) { - descriptorProtos.Add(FileDescriptorSet.ParseFrom(inputStream, extensionRegistry)); + descriptorProtos.Add(FileDescriptorSet.ParseFrom(inputStream, extensionRegistry)); } - } + } - IList<FileDescriptor> descriptors = ConvertDescriptors(options.FileOptions, descriptorProtos.ToArray()); + IList<FileDescriptor> descriptors = ConvertDescriptors(options.FileOptions, descriptorProtos.ToArray()); - //ROK Combine with Options... - foreach (FileDescriptor descriptor in descriptors) - descriptor.ConfigureWithDefaultOptions(options.FileOptions); - - foreach (FileDescriptor descriptor in descriptors) { - //ROK 2010-09-03 Ignore google protobuf package - if(descriptor.CSharpOptions.IgnoreGoogleProtobuf && descriptor.Package == "google.protobuf") - continue; + // Combine with options from command line + foreach (FileDescriptor descriptor in descriptors) { + descriptor.ConfigureWithDefaultOptions(options.FileOptions); + } - Generate(descriptor); - + foreach (FileDescriptor descriptor in descriptors) { + // Optionally exclude descriptors in google.protobuf + if (descriptor.CSharpOptions.IgnoreGoogleProtobuf && descriptor.Package == "google.protobuf") { + continue; + } + Generate(descriptor); } } @@ -102,13 +102,9 @@ namespace Google.ProtocolBuffers.ProtoGen { private string GetOutputFile(FileDescriptor descriptor) { CSharpFileOptions fileOptions = descriptor.CSharpOptions; - //ROK 2010-09-03 - added the ability to sepcify the extension used within the options - //string filename = descriptor.CSharpOptions.UmbrellaClassname + ".cs"; - string filename = descriptor.CSharpOptions.UmbrellaClassname + descriptor.CSharpOptions.FileExtension; + string filename = descriptor.CSharpOptions.UmbrellaClassname + descriptor.CSharpOptions.FileExtension; - //ROK 2010-09-03 - output directory can be specific to a descriptor file - //string outputDirectory = options.OutputDirectory; - string outputDirectory = descriptor.CSharpOptions.OutputDirectory; + string outputDirectory = descriptor.CSharpOptions.OutputDirectory; if (fileOptions.ExpandNamespaceDirectories) { string package = fileOptions.Namespace; if (!string.IsNullOrEmpty(package)) { @@ -117,29 +113,25 @@ namespace Google.ProtocolBuffers.ProtoGen { outputDirectory = Path.Combine(outputDirectory, bit); } } - } - //ROK 2010-09-03 - Always force output directory exists since they can specify this in .proto options - Directory.CreateDirectory(outputDirectory); + } + + // As the directory can be explicitly specified in options, we need to make sure it exists + Directory.CreateDirectory(outputDirectory); return Path.Combine(outputDirectory, filename); } - // ROK 2010-09-03 - used by unit tests, we will continue to allow them to function as-is. - internal static IList<FileDescriptor> ConvertDescriptors(FileDescriptorSet descriptorProtos) { - return ConvertDescriptors(CSharpFileOptions.DefaultInstance, descriptorProtos); - } - /// <summary> /// Resolves any dependencies and converts FileDescriptorProtos into FileDescriptors. /// The list returned is in the same order as the protos are listed in the descriptor set. /// Note: this method is internal rather than private to allow testing. /// </summary> /// <exception cref="DependencyResolutionException">Not all dependencies could be resolved.</exception> - private static IList<FileDescriptor> ConvertDescriptors(CSharpFileOptions options, params FileDescriptorSet[] descriptorProtos) { + internal static IList<FileDescriptor> ConvertDescriptors(CSharpFileOptions options, params FileDescriptorSet[] descriptorProtos) { // Simple strategy: Keep going through the list of protos to convert, only doing ones where // we've already converted all the dependencies, until we get to a stalemate List<FileDescriptorProto> fileList = new List<FileDescriptorProto>(); - foreach (FileDescriptorSet set in descriptorProtos) - fileList.AddRange(set.FileList); + foreach (FileDescriptorSet set in descriptorProtos) + fileList.AddRange(set.FileList); FileDescriptor[] converted = new FileDescriptor[fileList.Count]; @@ -158,31 +150,28 @@ namespace Google.ProtocolBuffers.ProtoGen { FileDescriptorProto candidate = fileList[i]; FileDescriptor[] dependencies = new FileDescriptor[candidate.DependencyList.Count]; - - CSharpFileOptions.Builder builder = options.ToBuilder(); - if (candidate.Options.HasExtension(DescriptorProtos.CSharpOptions.CSharpFileOptions)) { - builder.MergeFrom(candidate.Options.GetExtension(DescriptorProtos.CSharpOptions.CSharpFileOptions)); - } + + CSharpFileOptions.Builder builder = options.ToBuilder(); + if (candidate.Options.HasExtension(DescriptorProtos.CSharpOptions.CSharpFileOptions)) { + builder.MergeFrom(candidate.Options.GetExtension(DescriptorProtos.CSharpOptions.CSharpFileOptions)); + } CSharpFileOptions localOptions = builder.Build(); bool foundAllDependencies = true; for (int j = 0; j < dependencies.Length; j++) { if (!convertedMap.TryGetValue(candidate.DependencyList[j], out dependencies[j])) { - - // ROK 2010-09-03 - we can auto-magically resolve these since we already have their description - // This way if the file is only referencing options it does not need to be built with the - // --include_imports definition. - if (localOptions.IgnoreGoogleProtobuf && (candidate.DependencyList[j] == "google/protobuf/csharp_options.proto")) - { - dependencies[j] = CSharpOptions.Descriptor; - continue; - } - if (localOptions.IgnoreGoogleProtobuf && (candidate.DependencyList[j] == "google/protobuf/descriptor.proto")) - { - dependencies[j] = DescriptorProtoFile.Descriptor; - continue; - } - foundAllDependencies = false; + // We can auto-magically resolve these since we already have their description + // This way if the file is only referencing options it does not need to be built with the + // --include_imports definition. + if (localOptions.IgnoreGoogleProtobuf && (candidate.DependencyList[j] == "google/protobuf/csharp_options.proto")) { + dependencies[j] = CSharpOptions.Descriptor; + continue; + } + if (localOptions.IgnoreGoogleProtobuf && (candidate.DependencyList[j] == "google/protobuf/descriptor.proto")) { + dependencies[j] = DescriptorProtoFile.Descriptor; + continue; + } + foundAllDependencies = false; break; } } diff --git a/src/ProtoGen/GeneratorOptions.cs b/src/ProtoGen/GeneratorOptions.cs index 53c65a40..8781c5ec 100644 --- a/src/ProtoGen/GeneratorOptions.cs +++ b/src/ProtoGen/GeneratorOptions.cs @@ -1,4 +1,5 @@ #region Copyright notice and license + // Protocol Buffers - Google's data interchange format // Copyright 2008 Google Inc. All rights reserved. // http://github.com/jskeet/dotnet-protobufs/ @@ -30,6 +31,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #endregion using System; @@ -40,7 +42,6 @@ using Google.ProtocolBuffers.DescriptorProtos; using Google.ProtocolBuffers.Descriptors; namespace Google.ProtocolBuffers.ProtoGen { - /// <summary> /// All the configuration required for the generator - where to generate /// output files, the location of input files etc. While this isn't immutable @@ -48,7 +49,6 @@ namespace Google.ProtocolBuffers.ProtoGen { /// the generator. /// </summary> public sealed class GeneratorOptions { - //ROK, see below - public string OutputDirectory { get; set; } public IList<string> InputFiles { get; set; } /// <summary> @@ -61,13 +61,13 @@ namespace Google.ProtocolBuffers.ProtoGen { public bool TryValidate(out IList<string> reasons) { List<string> tmpReasons = new List<string>(); - //ROK 2010-09-03 see population of options below - ParseArguments(tmpReasons); + ParseArguments(tmpReasons); // Output directory validation if (string.IsNullOrEmpty(FileOptions.OutputDirectory)) { tmpReasons.Add("No output directory specified"); - } else { + } + else { if (!Directory.Exists(FileOptions.OutputDirectory)) { tmpReasons.Add("Specified output directory (" + FileOptions.OutputDirectory + " doesn't exist."); } @@ -76,7 +76,8 @@ namespace Google.ProtocolBuffers.ProtoGen { // Input file validation (just in terms of presence) if (InputFiles == null || InputFiles.Count == 0) { tmpReasons.Add("No input files specified"); - } else { + } + else { foreach (string input in InputFiles) { FileInfo fi = new FileInfo(input); if (!fi.Exists) { @@ -106,178 +107,160 @@ namespace Google.ProtocolBuffers.ProtoGen { } } + // Raw arguments, used to provide defaults for proto file options + public IList<string> Arguments { get; set; } + + [Obsolete("Please use GeneratorOptions.FileOptions.OutputDirectory instead")] + public string OutputDirectory { + get { return FileOptions.OutputDirectory; } + set { + CSharpFileOptions.Builder bld = FileOptions.ToBuilder(); + bld.OutputDirectory = value; + FileOptions = bld.Build(); + } + } + + private static readonly Regex ArgMatch = new Regex(@"^[-/](?<name>[\w_]+?)[:=](?<value>.*)$"); + private CSharpFileOptions fileOptions; + public CSharpFileOptions FileOptions { + get { return fileOptions ?? (fileOptions = CSharpFileOptions.DefaultInstance); } + set { fileOptions = value; } + } + + private void ParseArguments(IList<string> tmpReasons) { + bool doHelp = Arguments.Count == 0; - // ROK - added to provide defaults for any of the options - //Raw arguments - public IList<string> Arguments { get; set; } - [Obsolete("Please use GeneratorOptions.FileOptions.OutputDirectory instead")] - public string OutputDirectory - { - get { - return FileOptions.OutputDirectory; - } - set { - CSharpFileOptions.Builder bld = FileOptions.ToBuilder(); - bld.OutputDirectory = value; - FileOptions = bld.Build(); - } - } - - private static readonly Regex ArgMatch = new Regex(@"^[-/](?<name>[\w_]+?)[:=](?<value>.*)$"); - CSharpFileOptions _fileOptions; - public CSharpFileOptions FileOptions - { - get { return _fileOptions ?? (_fileOptions = CSharpFileOptions.DefaultInstance); } - set { _fileOptions = value; } - } - - private void ParseArguments(IList<string> tmpReasons) - { - bool doHelp = Arguments.Count == 0; - - //ROK Parse the raw arguments - InputFiles = new List<string>(); - CSharpFileOptions.Builder builder = FileOptions.ToBuilder(); - Dictionary<string, FieldDescriptor> fields = - new Dictionary<string, FieldDescriptor>(StringComparer.OrdinalIgnoreCase); - foreach (FieldDescriptor fld in builder.DescriptorForType.Fields) - fields.Add(fld.Name, fld); - - foreach (string argument in Arguments) - { - if (StringComparer.OrdinalIgnoreCase.Equals("-help", argument) || - StringComparer.OrdinalIgnoreCase.Equals("/help", argument) || - StringComparer.OrdinalIgnoreCase.Equals("-?", argument) || - StringComparer.OrdinalIgnoreCase.Equals("/?", argument)) - { - doHelp = true; - break; - } - - Match m = ArgMatch.Match(argument); - if (m.Success) - { - FieldDescriptor fld; - string name = m.Groups["name"].Value; - string value = m.Groups["value"].Value; - - if (fields.TryGetValue(name, out fld)) - { - object obj; - if (TryCoerceType(value, fld, out obj, tmpReasons)) - builder[fld] = obj; - } - else if (!File.Exists(argument)) - { - doHelp = true; - tmpReasons.Add("Unknown argument '" + name + "'."); - } - else - InputFiles.Add(argument); - } - else - InputFiles.Add(argument); - } - - if (doHelp || InputFiles.Count == 0) - { - tmpReasons.Add("Arguments:"); - foreach (KeyValuePair<string, FieldDescriptor> field in fields) - { - tmpReasons.Add(String.Format("-{0}=[{1}]", field.Key, field.Value.FieldType)); - } - tmpReasons.Add("followed by one or more file paths."); - } - else - FileOptions = builder.Build(); - } - - private static bool TryCoerceType(string text, FieldDescriptor field, out object value, IList<string> tmpReasons) - { - value = null; - - switch (field.FieldType) - { - case FieldType.Int32: - case FieldType.SInt32: - case FieldType.SFixed32: - value = Int32.Parse(text); - break; - - case FieldType.Int64: - case FieldType.SInt64: - case FieldType.SFixed64: - value = Int64.Parse(text); - break; - - case FieldType.UInt32: - case FieldType.Fixed32: - value = UInt32.Parse(text); - break; - - case FieldType.UInt64: - case FieldType.Fixed64: - value = UInt64.Parse(text); - break; - - case FieldType.Float: - value = float.Parse(text); - break; - - case FieldType.Double: - value = Double.Parse(text); - break; - - case FieldType.Bool: - value = Boolean.Parse(text); - break; - - case FieldType.String: - value = text; - break; - - case FieldType.Enum: - { - - EnumDescriptor enumType = field.EnumType; - - int number; - if (int.TryParse(text, out number)) - { - value = enumType.FindValueByNumber(number); - if (value == null) - { - tmpReasons.Add( - "Enum type \"" + enumType.FullName + - "\" has no value with number " + number + "."); - return false; - } - } - else - { - value = enumType.FindValueByName(text); - if (value == null) - { - tmpReasons.Add( - "Enum type \"" + enumType.FullName + - "\" has no value named \"" + text + "\"."); - return false; - } - } - - break; - } - - case FieldType.Bytes: - case FieldType.Message: - case FieldType.Group: - tmpReasons.Add("Unhandled field type " + field.FieldType.ToString() + "."); - return false; - } - - return true; - } + InputFiles = new List<string>(); + CSharpFileOptions.Builder builder = FileOptions.ToBuilder(); + Dictionary<string, FieldDescriptor> fields = + new Dictionary<string, FieldDescriptor>(StringComparer.OrdinalIgnoreCase); + foreach (FieldDescriptor fld in builder.DescriptorForType.Fields) { + fields.Add(fld.Name, fld); + } + + foreach (string argument in Arguments) { + if (StringComparer.OrdinalIgnoreCase.Equals("-help", argument) || + StringComparer.OrdinalIgnoreCase.Equals("/help", argument) || + StringComparer.OrdinalIgnoreCase.Equals("-?", argument) || + StringComparer.OrdinalIgnoreCase.Equals("/?", argument)) { + doHelp = true; + break; + } + Match m = ArgMatch.Match(argument); + if (m.Success) { + FieldDescriptor fld; + string name = m.Groups["name"].Value; + string value = m.Groups["value"].Value; + + if (fields.TryGetValue(name, out fld)) { + object obj; + if (TryCoerceType(value, fld, out obj, tmpReasons)) { + builder[fld] = obj; + } + } + else if (!File.Exists(argument)) { + doHelp = true; + tmpReasons.Add("Unknown argument '" + name + "'."); + } + else { + InputFiles.Add(argument); + } + } + else { + InputFiles.Add(argument); + } + } + + if (doHelp || InputFiles.Count == 0) { + tmpReasons.Add("Arguments:"); + foreach (KeyValuePair<string, FieldDescriptor> field in fields) { + tmpReasons.Add(String.Format("-{0}=[{1}]", field.Key, field.Value.FieldType)); + } + tmpReasons.Add("followed by one or more file paths."); + } + else { + FileOptions = builder.Build(); + } + } + + private static bool TryCoerceType(string text, FieldDescriptor field, out object value, IList<string> tmpReasons) { + value = null; + + switch (field.FieldType) { + case FieldType.Int32: + case FieldType.SInt32: + case FieldType.SFixed32: + value = Int32.Parse(text); + break; + + case FieldType.Int64: + case FieldType.SInt64: + case FieldType.SFixed64: + value = Int64.Parse(text); + break; + + case FieldType.UInt32: + case FieldType.Fixed32: + value = UInt32.Parse(text); + break; + + case FieldType.UInt64: + case FieldType.Fixed64: + value = UInt64.Parse(text); + break; + + case FieldType.Float: + value = float.Parse(text); + break; + + case FieldType.Double: + value = Double.Parse(text); + break; + + case FieldType.Bool: + value = Boolean.Parse(text); + break; + + case FieldType.String: + value = text; + break; + + case FieldType.Enum: { + EnumDescriptor enumType = field.EnumType; + + int number; + if (int.TryParse(text, out number)) { + value = enumType.FindValueByNumber(number); + if (value == null) { + tmpReasons.Add( + "Enum type \"" + enumType.FullName + + "\" has no value with number " + number + "."); + return false; + } + } + else { + value = enumType.FindValueByName(text); + if (value == null) { + tmpReasons.Add( + "Enum type \"" + enumType.FullName + + "\" has no value named \"" + text + "\"."); + return false; + } + } + + break; + } + + case FieldType.Bytes: + case FieldType.Message: + case FieldType.Group: + tmpReasons.Add("Unhandled field type " + field.FieldType.ToString() + "."); + return false; + } + + return true; + } } -} +}
\ No newline at end of file diff --git a/src/ProtoGen/Program.cs b/src/ProtoGen/Program.cs index a9bc47ce..e8c486cf 100644 --- a/src/ProtoGen/Program.cs +++ b/src/ProtoGen/Program.cs @@ -1,4 +1,5 @@ #region Copyright notice and license + // Protocol Buffers - Google's data interchange format // Copyright 2008 Google Inc. All rights reserved. // http://github.com/jskeet/dotnet-protobufs/ @@ -30,6 +31,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #endregion using System; @@ -40,12 +42,12 @@ namespace Google.ProtocolBuffers.ProtoGen { /// <summary> /// Entry point for the Protocol Buffers generator. /// </summary> - class Program { - internal static int Main(string[] args) { + internal class Program { + internal static int Main(string[] args) { try { // Hack to make sure everything's initialized DescriptorProtoFile.Descriptor.ToString(); - GeneratorOptions options = ParseCommandLineArguments(args); + GeneratorOptions options = new GeneratorOptions {Arguments = args}; IList<string> validationFailures; if (!options.TryValidate(out validationFailures)) { @@ -58,25 +60,13 @@ namespace Google.ProtocolBuffers.ProtoGen { Generator generator = Generator.CreateGenerator(options); generator.Generate(); return 0; - } catch (Exception e) { + } + catch (Exception e) { Console.Error.WriteLine("Error: {0}", e.Message); Console.Error.WriteLine(); Console.Error.WriteLine("Detailed exception information: {0}", e); return 1; } } - - private static GeneratorOptions ParseCommandLineArguments(string[] args) { - GeneratorOptions options = new GeneratorOptions(); - //string baseDir = "c:\\Users\\Jon\\Documents\\Visual Studio 2008\\Projects\\ProtocolBuffers"; - //options.OutputDirectory = baseDir + "\\tmp"; - //options.InputFiles = new[] { baseDir + "\\protos\\nwind-solo.protobin" }; - - //ROK 2010-09-03 - fixes to allow parsing these options... - //options.OutputDirectory = "."; - //options.InputFiles = args; - options.Arguments = args; - return options; - } } }
\ No newline at end of file diff --git a/src/ProtoGen/ProgramPreprocess.cs b/src/ProtoGen/ProgramPreprocess.cs index 2081b016..f6032a54 100644 --- a/src/ProtoGen/ProgramPreprocess.cs +++ b/src/ProtoGen/ProgramPreprocess.cs @@ -3,148 +3,151 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -namespace Google.ProtocolBuffers.ProtoGen -{ - /// <summary> - /// Preprocesses any input files with an extension of '.proto' by running protoc.exe. If arguments - /// are supplied with '--' prefix they are provided to protoc.exe, otherwise they are assumed to - /// be used for ProtoGen.exe which is run on the resulting output proto buffer. If the option - /// --descriptor_set_out= is specified the proto buffer file is kept, otherwise it will be removed - /// after code generation. - /// </summary> - internal class ProgramPreprocess - { - static int Main(string[] args) - { - try - { - return Environment.ExitCode = Run(args); - } - catch (Exception ex) - { - Console.Error.WriteLine(ex); - return Environment.ExitCode = 2; - } +namespace Google.ProtocolBuffers.ProtoGen { + /// <summary> + /// Preprocesses any input files with an extension of '.proto' by running protoc.exe. If arguments + /// are supplied with '--' prefix they are provided to protoc.exe, otherwise they are assumed to + /// be used for ProtoGen.exe which is run on the resulting output proto buffer. If the option + /// --descriptor_set_out= is specified the proto buffer file is kept, otherwise it will be removed + /// after code generation. + /// </summary> + internal class ProgramPreprocess { + private static int Main(string[] args) { + try { + return Environment.ExitCode = Run(args); + } + catch (Exception ex) { + Console.Error.WriteLine(ex); + return Environment.ExitCode = 2; + } + } + + internal static int Run(params string[] args) { + bool deleteFile = false; + string tempFile = null; + int result; + bool doHelp = args.Length == 0; + try { + List<string> protocArgs = new List<string>(); + List<string> protoGenArgs = new List<string>(); + + foreach (string arg in args) { + doHelp |= StringComparer.OrdinalIgnoreCase.Equals(arg, "/?"); + doHelp |= StringComparer.OrdinalIgnoreCase.Equals(arg, "/help"); + doHelp |= StringComparer.OrdinalIgnoreCase.Equals(arg, "-?"); + doHelp |= StringComparer.OrdinalIgnoreCase.Equals(arg, "-help"); + + if (arg.StartsWith("--descriptor_set_out=")) { + tempFile = arg.Substring("--descriptor_set_out=".Length); + protoGenArgs.Add(tempFile); + } } - - internal static int Run(params string[] args) - { - bool deleteFile = false; - string tempFile = null; - int result = 1; - bool doHelp = args.Length == 0; - try - { - List<string> protocArgs = new List<string>(); - List<string> protoGenArgs = new List<string>(); - - foreach (string arg in args) - { - doHelp |= StringComparer.OrdinalIgnoreCase.Equals(arg, "/?"); - doHelp |= StringComparer.OrdinalIgnoreCase.Equals(arg, "/help"); - doHelp |= StringComparer.OrdinalIgnoreCase.Equals(arg, "-?"); - doHelp |= StringComparer.OrdinalIgnoreCase.Equals(arg, "-help"); - - if(arg.StartsWith("--descriptor_set_out=")) - { - tempFile = arg.Substring("--descriptor_set_out=".Length); - protoGenArgs.Add(tempFile); - } - } - - if (doHelp) - { - Console.WriteLine(); - Console.WriteLine("PROTOC.exe: Use any of the following options that begin with '--':"); - Console.WriteLine(); - try { RunProtoc("--help"); } - catch (Exception ex) { Console.Error.WriteLine(ex.Message); } - Console.WriteLine(); - Console.WriteLine(); - Console.WriteLine("PRTOGEN.exe: The following options are used to specify defaults for code generation."); - Console.WriteLine(); - Program.Main(new string[0]); - return 0; - } - - foreach (string arg in args) - { - if (arg.StartsWith("--")) - protocArgs.Add(arg); - else if (File.Exists(arg) && StringComparer.OrdinalIgnoreCase.Equals(".proto", Path.GetExtension(arg))) - { - if (tempFile == null) - { - deleteFile = true; - tempFile = Path.GetTempFileName(); - protocArgs.Add(String.Format("--descriptor_set_out={0}", tempFile)); - protoGenArgs.Add(tempFile); - } - protocArgs.Add(arg); - } - else - protoGenArgs.Add(arg); - } - - if (tempFile != null) - { - result = RunProtoc(protocArgs.ToArray()); - if (result != 0) - return result; - } - - result = Program.Main(protoGenArgs.ToArray()); - } - finally - { - if (deleteFile && tempFile != null && File.Exists(tempFile)) - File.Delete(tempFile); + + if (doHelp) { + Console.WriteLine(); + Console.WriteLine("PROTOC.exe: Use any of the following options that begin with '--':"); + Console.WriteLine(); + try { + RunProtoc("--help"); + } + catch (Exception ex) { + Console.Error.WriteLine(ex.Message); + } + Console.WriteLine(); + Console.WriteLine(); + Console.WriteLine("PRTOGEN.exe: The following options are used to specify defaults for code generation."); + Console.WriteLine(); + Program.Main(new string[0]); + return 0; + } + + foreach (string arg in args) { + if (arg.StartsWith("--")) { + protocArgs.Add(arg); + } + else if (File.Exists(arg) && StringComparer.OrdinalIgnoreCase.Equals(".proto", Path.GetExtension(arg))) { + if (tempFile == null) { + deleteFile = true; + tempFile = Path.GetTempFileName(); + protocArgs.Add(String.Format("--descriptor_set_out={0}", tempFile)); + protoGenArgs.Add(tempFile); } + protocArgs.Add(arg); + } + else { + protoGenArgs.Add(arg); + } + } + + if (tempFile != null) { + result = RunProtoc(protocArgs.ToArray()); + if (result != 0) { return result; + } } - private static int RunProtoc(params string[] args) - { - const string protoc = "protoc.exe"; - string exePath = protoc; - - //why oh why is this not in System.IO.Path or Environment... - List<string> searchPath = new List<string>(); - searchPath.Add(Environment.CurrentDirectory); - searchPath.Add(AppDomain.CurrentDomain.BaseDirectory); - searchPath.AddRange((Environment.GetEnvironmentVariable("PATH") ?? String.Empty).Split(Path.PathSeparator)); - - foreach (string path in searchPath) - if (File.Exists(exePath = Path.Combine(path, protoc))) - break; - - if (!File.Exists(exePath)) - throw new FileNotFoundException("Unable to locate " + protoc + " make sure it is in the PATH, cwd, or exe dir."); - - for (int i = 0; i < args.Length; i++) - if (args[i].IndexOf(' ') > 0 && args[i][0] != '"') - args[i] = '"' + args[i] + '"'; - - ProcessStartInfo psi = new ProcessStartInfo(exePath); - psi.Arguments = String.Join(" ", args); - psi.RedirectStandardError = true; - psi.RedirectStandardInput = false; - psi.RedirectStandardOutput = true; - psi.ErrorDialog = false; - psi.CreateNoWindow = true; - psi.UseShellExecute = false; - psi.WorkingDirectory = Environment.CurrentDirectory; - - Process process = Process.Start(psi); - if (process == null) return 1; - - process.WaitForExit(); - - string tmp = process.StandardOutput.ReadToEnd(); - if(tmp.Trim().Length > 0) Console.Out.WriteLine(tmp); - tmp = process.StandardError.ReadToEnd(); - if (tmp.Trim().Length > 0) Console.Error.WriteLine(tmp); - return process.ExitCode; + result = Program.Main(protoGenArgs.ToArray()); + } + finally { + if (deleteFile && tempFile != null && File.Exists(tempFile)) { + File.Delete(tempFile); + } + } + return result; + } + + private static int RunProtoc(params string[] args) { + const string protoc = "protoc.exe"; + string exePath = protoc; + + // Why oh why is this not in System.IO.Path or Environment...? + List<string> searchPath = new List<string>(); + searchPath.Add(Environment.CurrentDirectory); + searchPath.Add(AppDomain.CurrentDomain.BaseDirectory); + searchPath.AddRange((Environment.GetEnvironmentVariable("PATH") ?? String.Empty).Split(Path.PathSeparator)); + + foreach (string path in searchPath) { + if (File.Exists(exePath = Path.Combine(path, protoc))) { + break; + } + } + + if (!File.Exists(exePath)) { + throw new FileNotFoundException("Unable to locate " + protoc + " make sure it is in the PATH, cwd, or exe dir."); + } + + for (int i = 0; i < args.Length; i++) { + if (args[i].IndexOf(' ') > 0 && args[i][0] != '"') { + args[i] = '"' + args[i] + '"'; } + } + + ProcessStartInfo psi = new ProcessStartInfo(exePath); + psi.Arguments = String.Join(" ", args); + psi.RedirectStandardError = true; + psi.RedirectStandardInput = false; + psi.RedirectStandardOutput = true; + psi.ErrorDialog = false; + psi.CreateNoWindow = true; + psi.UseShellExecute = false; + psi.WorkingDirectory = Environment.CurrentDirectory; + + Process process = Process.Start(psi); + if (process == null) { + return 1; + } + + process.WaitForExit(); + + string tmp = process.StandardOutput.ReadToEnd(); + if (tmp.Trim().Length > 0) { + Console.Out.WriteLine(tmp); + } + tmp = process.StandardError.ReadToEnd(); + if (tmp.Trim().Length > 0) { + Console.Error.WriteLine(tmp); + } + return process.ExitCode; } + } } diff --git a/src/ProtoGen/ServiceGenerator.cs b/src/ProtoGen/ServiceGenerator.cs index 83d8a6a3..03d2f120 100644 --- a/src/ProtoGen/ServiceGenerator.cs +++ b/src/ProtoGen/ServiceGenerator.cs @@ -61,7 +61,7 @@ namespace Google.ProtocolBuffers.ProtoGen { writer.WriteLine(); writer.WriteLine("{0} static pbd::ServiceDescriptor Descriptor {{", ClassAccessLevel); writer.WriteLine(" get {{ return {0}.Descriptor.Services[{1}]; }}", - DescriptorUtil.QualifiedUmbrellaClassName(Descriptor.File.CSharpOptions), Descriptor.Index); + DescriptorUtil.GetQualifiedUmbrellaClassName(Descriptor.File.CSharpOptions), Descriptor.Index); writer.WriteLine("}"); writer.WriteLine("{0} pbd::ServiceDescriptor DescriptorForType {{", ClassAccessLevel); writer.WriteLine(" get { return Descriptor; }"); diff --git a/src/ProtoGen/UmbrellaClassGenerator.cs b/src/ProtoGen/UmbrellaClassGenerator.cs index d596f1a1..cdc275c6 100644 --- a/src/ProtoGen/UmbrellaClassGenerator.cs +++ b/src/ProtoGen/UmbrellaClassGenerator.cs @@ -93,12 +93,12 @@ namespace Google.ProtocolBuffers.ProtoGen { writer.Outdent(); writer.WriteLine("}"); - //ROK 2010-09-03 - close the namespace around the umbrella class if defined - if (!Descriptor.CSharpOptions.NestClasses && Descriptor.CSharpOptions.UmbrellaNamespace != "") { - writer.Outdent(); - writer.WriteLine("}"); - } - } + // Close the namespace around the umbrella class if defined + if (!Descriptor.CSharpOptions.NestClasses && Descriptor.CSharpOptions.UmbrellaNamespace != "") { + writer.Outdent(); + writer.WriteLine("}"); + } + } WriteChildren(writer, "Enums", Descriptor.EnumTypes); WriteChildren(writer, "Messages", Descriptor.MessageTypes); WriteChildren(writer, "Services", Descriptor.Services); @@ -122,12 +122,12 @@ namespace Google.ProtocolBuffers.ProtoGen { writer.Indent(); writer.WriteLine(); } - //ROK 2010-09-03 - add the namespace around the umbrella class if defined - if(!Descriptor.CSharpOptions.NestClasses && Descriptor.CSharpOptions.UmbrellaNamespace != "") { + // Add the namespace around the umbrella class if defined + if(!Descriptor.CSharpOptions.NestClasses && Descriptor.CSharpOptions.UmbrellaNamespace != "") { writer.WriteLine("namespace {0} {{", Descriptor.CSharpOptions.UmbrellaNamespace); writer.Indent(); writer.WriteLine(); - } + } if (Descriptor.CSharpOptions.CodeContracts) { writer.WriteLine("[global::System.Diagnostics.Contracts.ContractVerificationAttribute(false)]"); |