From: Atsushi Eno <atsushieno@gmail.com>
Date: Sat, 7 Aug 2004 14:42:08 +0000 (-0000)
Subject: 2004-08-07  Atsushi Enomoto <atsushi@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=c47479a795fb22603e5d03e7d9bcb212588bd27a;p=mono.git

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 02f3abab883..a1ec7b05c80 100644
--- 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 cee56970c58..61e77025bd4 100755
--- 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)
 					) 
 				{
-					if (arg.EndsWith (".dll") || arg.EndsWith (".exe"))
+					if ((arg.EndsWith (".dll") || arg.EndsWith (".exe")) && !arg.Substring (1).StartsWith ("generator:") && !arg.Substring (1).StartsWith ("g:"))
 					{
 						if (!readingFiles) throw new Exception (incorrectOrder);
 						assemblies.Add (arg);