diff --git a/src/Xamarin.Android.Tools.Bytecode/ClassPath.cs b/src/Xamarin.Android.Tools.Bytecode/ClassPath.cs index 4ba0119cf..8b7303cd6 100644 --- a/src/Xamarin.Android.Tools.Bytecode/ClassPath.cs +++ b/src/Xamarin.Android.Tools.Bytecode/ClassPath.cs @@ -26,8 +26,6 @@ public class ClassPath { public string ApiSource { get; set; } - public JavaDocletType? DocletType { get; set; } - public IEnumerable DocumentationPaths { get; set; } public string AndroidFrameworkPlatform { get; set; } @@ -233,38 +231,9 @@ void FixupParametersFromDocs (XElement api) } } - JavaDocletType GetDocletType (string path) - { - var kind = JavaDocletType.DroidDoc; - char [] buf = new char [500]; - string packagesHtml = Path.Combine (path, "packages.html"); - if (File.Exists (packagesHtml) && File.ReadAllText (packagesHtml).Contains ("") && rawXML.Contains ("") && rawXML.Contains (" docsPaths.Add (doc) }, { "docstype=", - "{TYPE} of the docs within --docspath. Values:\n " + - string.Join ("\n ", JavaDocletTypeMapping.Keys.OrderBy (s => s)), - t => docsType = GetJavaDocletType (t) }, + "OBSOLETE: Previously used to specify a doc type (now auto detected).", + t => docsType = t != null }, { "v|verbose:", "See stack traces on error.", (int? v) => verbosity = v.HasValue ? v.Value : verbosity + 1 }, @@ -61,6 +59,8 @@ public static void Main (string[] args) p.WriteOptionDescriptions (Console.Out); return; } + if (docsType) + Console.WriteLine ("class-parse: --docstype is obsolete and no longer a valid option."); var output = outputFile == null ? Console.Out : (TextWriter) new StreamWriter (outputFile, append: false, encoding: new UTF8Encoding (encoderShouldEmitUTF8Identifier: false)); @@ -71,7 +71,6 @@ public static void Main (string[] args) ApiSource = "class-parse", AndroidFrameworkPlatform = platform, DocumentationPaths = docsPaths.Count == 0 ? null : docsPaths, - DocletType = docsType, AutoRename = autorename }; foreach (var file in files) { @@ -93,23 +92,6 @@ public static void Main (string[] args) output.Close (); } - static Dictionary JavaDocletTypeMapping = new Dictionary { - { "droiddoc", JavaDocletType.DroidDoc }, - { "droiddoc2", JavaDocletType.DroidDoc2 }, - { "java6", JavaDocletType.Java6 }, - { "java7", JavaDocletType.Java7 }, - { "java8", JavaDocletType.Java8 }, - { "apixml", JavaDocletType._ApiXml }, - }; - - static JavaDocletType GetJavaDocletType (string value) - { - JavaDocletType type; - if (value != null && JavaDocletTypeMapping.TryGetValue (value.ToLowerInvariant (), out type)) - return type; - return JavaDocletType.DroidDoc; - } - static void DumpFileToXml (ClassPath jar, string file) { using (var s = File.OpenRead (file)) {