diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2016-05-27 20:24:08 +0300 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2016-05-27 20:24:16 +0300 |
| commit | 5515e33fb7d956162b38970fdf2d6b4eab609d95 (patch) | |
| tree | ad24f77f08c6fb58426e9ee400562e5aebeea8b5 /mcs/class/RabbitMQ.Client | |
| parent | 0db9b0a3b9e9854745be25ca31b46e71c0d7f6fa (diff) | |
[genproj] Do not use \r on the Unix parts of the build hook, add RabbitMQ hooks
Diffstat (limited to 'mcs/class/RabbitMQ.Client')
3 files changed, 21 insertions, 10 deletions
diff --git a/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs b/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs index 5539fea5854..79d7d285b09 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/Apigen.cs +++ b/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) diff --git a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj index e9f3774767e..2c33e8c5021 100644 --- a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj +++ b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_x.csproj @@ -82,11 +82,22 @@ <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PreBuildEvent>
-
- <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+ <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> +mono $(OutputPath)\RabbitMQ.Client.Apigen.exe /n:v0_9 "/apiName:AMQP_0_9" $(ProjectDir)\..\..\..\docs\specs\amqp0-9.stripped.xml $(ProjectDir)\..\..\..\docs\specs\net_4_x-api-0-9.cs +mono $(OutputPath)\RabbitMQ.Client.Apigen.exe /n:v0_8 "/apiName:AMQP_0_8" $(ProjectDir)\..\..\..\docs\specs\amqp0-8.stripped.xml $(ProjectDir)\..\..\..\docs\specs\net_4_x-api-0-8.cs +mono $(OutputPath)\RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDir)\..\..\..\docs\specs\qpid-amqp.0-8.stripped.xml $(ProjectDir)\..\..\..\docs\specs\net_4_x-api-qpid-0-8.cs + + + + </PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+ $(OutputPath)\RabbitMQ.Client.Apigen.exe /n:v0_9 "/apiName:AMQP_0_9" $(ProjectDir)\..\..\..\docs\specs\amqp0-9.stripped.xml $(ProjectDir)\..\..\..\docs\specs\net_4_x-api-0-9.cs + $(OutputPath)\RabbitMQ.Client.Apigen.exe /n:v0_8 "/apiName:AMQP_0_8" $(ProjectDir)\..\..\..\docs\specs\amqp0-8.stripped.xml $(ProjectDir)\..\..\..\docs\specs\net_4_x-api-0-8.cs + $(OutputPath)\RabbitMQ.Client.Apigen.exe /n:v0_8qpid "/apiName:AMQP_0_8_QPID" $(ProjectDir)\..\..\..\docs\specs\qpid-amqp.0-8.stripped.xml $(ProjectDir)\..\..\..\docs\specs\net_4_x-api-qpid-0-8.cs + + + </PostBuildEvent>
</PropertyGroup>
diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_x.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_x.csproj index 8a2044d1cf6..e062f548163 100644 --- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_x.csproj +++ b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_x.csproj @@ -190,9 +190,8 @@ <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PreBuildEvent>
-
- <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+ <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> + </PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|