2004-08-07 Atsushi Enomoto <atsushi@ximian.com>

	* NewMonoXSD.cs : /generator (/g) option didn't work, since it usually
	  ends with .dll (or .exe) and regarded as mere assembly filename.

svn path=/trunk/mcs/; revision=32012

diff --git a/mcs/tools/mono-xsd/ChangeLog b/mcs/tools/mono-xsd/ChangeLog
index 02f3abab8836fbab5c502b2cc6e084cd0aadd06a..a1ec7b05c80433a65921e2ce125fc345caeb06a1 100644 (file)
--- a/mcs/tools/mono-xsd/ChangeLog
+++ b/mcs/tools/mono-xsd/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-07  Atsushi Enomoto <atsushi@ximian.com>
+
+       * NewMonoXSD.cs : /generator (/g) option didn't work, since it usually
+         ends with .dll (or .exe) and regarded as mere assembly filename.
+
 2004-07-12  Lluis Sanchez Gual  <lluis@novell.com>
 
        * NewMonoXSD.cs: Accept files with absolute paths.

diff --git a/mcs/tools/mono-xsd/NewMonoXSD.cs b/mcs/tools/mono-xsd/NewMonoXSD.cs
index cee56970c58f2117ed2d170487373db40bacdaec..61e77025bd4177fa86912b8969008920a95ba5cd 100755 (executable)
--- a/mcs/tools/mono-xsd/NewMonoXSD.cs
+++ b/mcs/tools/mono-xsd/NewMonoXSD.cs
@@ -114,7 +114,7 @@ namespace Mono.Util {
                                        (arg.StartsWith ("/") && arg.IndexOfAny (Path.InvalidPathChars) == -1)\r
                                        ) \r
                                {\r
-                                       if (arg.EndsWith (".dll") || arg.EndsWith (".exe"))\r
+                                       if ((arg.EndsWith (".dll") || arg.EndsWith (".exe")) && !arg.Substring (1).StartsWith ("generator:") && !arg.Substring (1).StartsWith ("g:"))\r
                                        {\r
                                                if (!readingFiles) throw new Exception (incorrectOrder);\r
                                                assemblies.Add (arg);\r