Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4

mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs

@@ -197,7 +197,7 @@ namespace RabbitMQ.Client.Apigen {
 	    m_primitiveTypeFlagMap[amqpType] = isReference;
 	}
 
-        public void HandleOption(string opt) {
+        public bool HandleOption(string opt) {
             if (opt.StartsWith("/n:")) {
                 m_framingSubnamespace = opt.Substring(3);
             } else if (opt.StartsWith("/apiName:")) {
@@ -210,9 +210,9 @@ namespace RabbitMQ.Client.Apigen {
             } else if (opt == "/c") {
                 m_emitComments = true;
             } else {
-                Console.Error.WriteLine("Unsupported command-line option: " + opt);
-                Usage();
+		return false;
             }
+	    return true;
         }
 
         public void Usage() {
@@ -227,7 +227,8 @@ namespace RabbitMQ.Client.Apigen {
 
         public Apigen(ArrayList args) {
             while (args.Count > 0 && ((string) args[0]).StartsWith("/")) {
-                HandleOption((string) args[0]);
+		if (!HandleOption((string) args[0]))
+		  break;
                 args.RemoveAt(0);
             }
             if ((args.Count < 2)

mcs/class/RabbitMQ.Client/src/apigen/Makefile

@@ -4,9 +4,7 @@ SUBDIRS =
 include ../../../../build/rules.make
 
 PROGRAM = RabbitMQ.Client.Apigen.exe
-
-LOCAL_MCS_FLAGS = /r:System.dll     \
-                  /r:System.Xml.dll \
-                  /main:RabbitMQ.Client.Apigen.Apigen
+LIB_REFS = System System.Xml
+LOCAL_MCS_FLAGS = /main:RabbitMQ.Client.Apigen.Apigen
 
 include ../../../../build/executable.make