Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4

mcs/class/RabbitMQ.Client/ChangeLog

@@ -1,79 +0,0 @@
-2010-07-09  Andrew Jorgensen  <ajorgensen@novell.com>
-
-	* Makefile: Fix make dist again (IntAllocator.cs)
-	  ... and fix an embarassing typo
-
-2010-06-27  Michael Barker  <mike@middlesoft.co.uk>
-
-	* docs/specs/Makefile: Added uninstall-local 
-
-2010-06-23  Michael Barker  <mike@middlesoft.co.uk>
-
-	* Updated to version 1.8 of the RabbitMQ libraries
-	  
-2009-12-23  Jo Shields  <directhex@apebox.org>
-
-	* docs/specs/Makefile: Use compiled Mono, not system Mono (fixes 
-	  broken build on systems without Mono already installed)
-
-2009-12-19  Michael Barker  <mike@middlesoft.co.uk>
-
-	* Added stripped xml to avoid licensing issues.
-
-2009-08-31  Michael Barker  <mike@middlesoft.co.uk>
-
-	* Updated to version 1.6 of the RabbitMQ libraries
-
-2009-05-26  Andrew Jorgensen  <ajorgensen@novell.com>Rabbit
-
-	* Makefile: Fixed dist from last commit here
-
-2009-05-25  Michael Barker  <mike@middlesoft.co.uk>
-
-	* Removed amqp spec files and modified generated code to fix licensing 
-	issues.
-
-2009-05-21  Michael Barker  <mike@middlesoft.co.uk>
-
-	* Updated to version 1.5.3 of the RabbitMQ libraries.
-
-2008-12-09  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile: those paths are all wrong!
-
-2008-12-09  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile: huh, more messy sources.
-
-2008-12-09  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile : sigh, there was missing extension.
-
-2008-12-08  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile : I find SUBDIRS almost dumb. another attempt.
-
-2008-12-08  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile, src/client/Makefile : another attempt to fix build.
-
-2008-12-08  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile : it was wrong fix.
-
-2008-12-08  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* Makefile : add docs/specs directory, to workaround build breakage.
-
-2008-12-07  Michael BArker  <mike@middlesoft.co.uk>
-
-	* Makefile:  Removed apigen, bootstrap and spec.  The code for
-	the generated interfaces is added to source control.
-
-2008-10-20  Atsushi Enomoto  <atsushi@ximian.com>
-
-	(This ChangeLog is for Mono integration.)
-
-	Patch by Michael Barker (patches are on bug #432471). Imported
-	RabbitMQ.Client assembly from RabbitMQ project.
-	http://www.rabbitmq.com/

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