From 5c8fccfe7be795566e4fa1d7616acdcc6c1997a1 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Mon, 30 Aug 2010 19:38:31 +0000 Subject: QPID-2827 - QPID Cpp WinSDK does not contain 64-bit libraries Patch from Chuck Rolke * Adds the x64 platform to the cpp\example solution and six example projects. * Adds the x64 platform to the qpid messaging .NET binding dlls and examples. * Adds QPID_BUILD_ROOT environment variable to .NET binding projects for locating C++ libraries and headers, and for storing generated output. This is required to compensate for the varying location of cmake-generated directories. For a given build QPID_BUILD_ROOT must be set to the directory in which cmake was run. * Reorganize the bld-winsdk.ps1 script to build x86 (Win32) and x64 platforms. * Update Readme-winsdk.txt content. Also switch this file to DOS line endings to improve its usability on a Windows system. * Add a shadow solution file and shadow project files for the C# examples. The new build process copies the development example source tree to get the example sources organized into a hierarchy and then overlays the copied tree with the shadow .sln and .csproj files. Users then build the examples directly using the customized solution. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@990917 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/README-winsdk.txt | 67 +--- .../csharp.direct.receiver.csproj | 24 +- .../csharp.direct.sender.csproj | 24 +- .../csharp.example.client.csproj | 24 +- .../csharp.example.declare_queues.csproj | 24 +- .../csharp.example.drain.csproj | 24 +- .../csharp.example.helloworld.csproj | 24 +- .../csharp.example.server.csproj | 24 +- .../csharp.example.spout.csproj | 24 +- .../csharp.map.callback.receiver.csproj | 24 +- .../csharp.map.callback.sender.csproj | 25 +- .../csharp.map.receiver/csharp.map.receiver.csproj | 24 +- .../csharp.map.sender/csharp.map.sender.csproj | 24 +- .../visualbasic.example.client.vbproj | 30 +- .../qpid/dotnet/org.apache.qpid.messaging.sln | 66 ++++ .../dotnet/src/org.apache.qpid.messaging.vcproj | 175 +++++++++- ...rg.apache.qpid.messaging.sessionreceiver.csproj | 24 +- .../test/messaging.test/messaging.test.csproj | 24 +- .../csharp.direct.receiver.csproj | 95 ++++++ .../csharp.direct.sender.csproj | 78 +++++ .../csharp.example.client.csproj | 95 ++++++ .../csharp.example.declare_queues.csproj | 95 ++++++ .../csharp.example.drain.csproj | 96 ++++++ .../csharp.example.helloworld.csproj | 95 ++++++ .../csharp.example.server.csproj | 95 ++++++ .../csharp.example.spout.csproj | 96 ++++++ .../csharp.map.callback.receiver.csproj | 99 ++++++ .../csharp.map.callback.sender.csproj | 98 ++++++ .../csharp.map.receiver/csharp.map.receiver.csproj | 95 ++++++ .../csharp.map.sender/csharp.map.sender.csproj | 95 ++++++ .../winsdk_sources/winsdk_dotnet_examples.sln | 195 +++++++++++ qpid/cpp/bld-winsdk.ps1 | 362 ++++++++++++++------- qpid/cpp/examples/examples.sln | 26 ++ .../cpp/examples/messaging/messaging_client.vcproj | 192 +++++++++++ qpid/cpp/examples/messaging/messaging_drain.vcproj | 158 +++++++++ .../messaging/messaging_map_receiver.vcproj | 194 ++++++++++- .../examples/messaging/messaging_map_sender.vcproj | 192 +++++++++++ .../cpp/examples/messaging/messaging_server.vcproj | 192 +++++++++++ qpid/cpp/examples/messaging/messaging_spout.vcproj | 158 +++++++++ 39 files changed, 3236 insertions(+), 240 deletions(-) create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj create mode 100644 qpid/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln diff --git a/qpid/cpp/README-winsdk.txt b/qpid/cpp/README-winsdk.txt index 76d5f56681..2928894d3f 100644 --- a/qpid/cpp/README-winsdk.txt +++ b/qpid/cpp/README-winsdk.txt @@ -16,6 +16,12 @@ Qpid-Cpp-Win-Sdk is a software development kit for users who wish to write code using the Qpid-Cpp program libraries in a Windows environment. +This kit is distributed as two zip files: + qpid-cpp-x86-.zip - projects and libraries for 32-bit + x86 and Win32 development. + qpid-cpp-x64-.zip - projects and libraries for 64-bit + x64 development. + For additional software or information on the Qpid project go to: http://cwiki.apache.org/qpid/ @@ -58,8 +64,8 @@ The kit directories hold the content described here. to demonstrate using this SDK in C++. \dotnet_examples - A set of example source files written in C#, Visual Basic, and - PowerShell. + A Visual Studio solution file and associated project files + to demonstrate using this SDK in C#. \management A python scripting code set for generating QMF data structures. @@ -71,59 +77,20 @@ The kit directories hold the content described here. 4. Building dotnet_examples =========================== -Each file in the \dotnet_examples directory is a stand-alone, main -console program that illustrates some facet of programming the Qpid -Messaging API. Use the following steps to create a project that -builds and executes an example csharp program. - -A. Assume that the WinSdk was downloaded to d:\winsdk. -B. Start Visual Studio -C. Add File->New->Project... - 1. Select C#, Console Application - 2. Name: csharp.direct.receiver - 3. Location: D:\winsdk\dotnet_examples - 4. Check: "Create directory for solution" - 5. Press OK -D. In Solution Explorer - 1. Delete program.cs - 2. Add->Existing Item. - Select d:\winsdk\dotnet_examples\csharp.direct.receiver.cs - 3. Add Reference to d:\winsdk\bin\org.apache.qpid.messaging.dll - Note: In each source file a 'using' statement selects - Org.Apache.Qpid.Messaging, Org.Apache.Qpid.Messaging.Sessionreceiver, - or both. Resolve these statements with references to the files - in \bin. - 4. Right-click the project and select Properties - Select the Build tab. - Select Configuration pulldown entry "All Configurations" - Set the Output Path to "d:\winsdk\bin" -E. Right-click the solution and select Configuration Manager - 1. Select Configuration -> Debug - 2. Select Platform -> - pick x86, OK -F. In the standard toolbar verify that - 1. Configuration selects Debug - 2. Platform selects x86 -G. Build the solution. - 1. The solution should build with no errors or warnings. -H. Verify that the solution placed the executables in the proper place: - 1. Directory d:\winsdk\bin has files csharp.direct.receiver.exe, - csharp.direct.receiver.pdb, and csharp.direct.receiver.vshost.exe. - -The solution is now ready to execute. You may set breakpoints in the -Visual Studio source file or run the executable directly from -d:\winsdk\bin. - -This process may be repeated for each example csharp source file. A similar -process is followed for the Visual Basic example. The PowerShell example -is executed directly in a PowerShell window. +From the \dotnet_examples directory launch the winsdk_dotnet_examples.sln +solution file. In the platform pulldown list select "x86" or "x64" to +match the development kit you are using. Then build the solution in the +Debug configuration. + +The resulting executable programs may be run from within Visual Studio +or stand-alone from the \bin directory. 5. Notes ======== -* The Qpid-Cpp binaries are produced for the 32-bit Win32 platform. - * Only the Release variant of Qpid code uses the redistributable MSVC90 libraries in the /bin directory. Users who wish to link to the Debug variant of Qpid code may do so under their own copy of Visual Studio 2008 where the debug versions of MSVC90 runtime libraries are available. + +* The dotnet_examples are only available in the Debug configuration. diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj index 172e25a9cb..4c55bc1890 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj index 8e8371c97e..96f541f12c 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj index 76fb1c5e19..5618ac5996 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj index fb7e950dea..fa9d648e94 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj index 198900ceb5..c9404fdb61 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj index 3038ed64a3..04e3d4f7ab 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj index 1fa2cc0bc0..336d1e751b 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj index 15fc644c8c..a3f949d467 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj index c32574a694..0141c5f8cb 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj index 1f37ce8dfe..c54423eec9 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -26,14 +26,14 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE true full @@ -41,13 +41,30 @@ prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + true + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj index c3d87ee276..3e3e248331 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj index 516e7cc07a..11bbd58839 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj @@ -17,7 +17,7 @@ true full false - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE prompt 4 @@ -25,27 +25,43 @@ pdbonly true - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE prompt 4 true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ DEBUG;TRACE full x86 prompt - ..\..\..\..\..\src\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ TRACE true pdbonly x86 prompt + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + DEBUG;TRACE + full + x64 + prompt + + + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + TRACE + true + pdbonly + x64 + prompt + diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj index ae1c01232e..267b003d90 100644 --- a/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj +++ b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj @@ -23,7 +23,7 @@ full true true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ visualbasic.example.client.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -32,7 +32,7 @@ false true true - bin\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ visualbasic.example.client.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -40,7 +40,7 @@ true true true - ..\..\..\..\..\src\Debug\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ visualbasic.example.client.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 full @@ -48,13 +48,32 @@ true - bin\x86\Release\ + $(QPID_BUILD_ROOT)\src\$(Configuration)\ visualbasic.example.client.xml true 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 pdbonly x86 + + true + true + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + visualbasic.example.client.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + full + x64 + + + true + $(QPID_BUILD_ROOT)\src\$(Configuration)\ + visualbasic.example.client.xml + true + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + pdbonly + x64 + @@ -123,6 +142,9 @@ Org.Apache.Qpid.Messaging + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj new file mode 100644 index 0000000000..28726c7b74 --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj @@ -0,0 +1,78 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068} + Exe + Properties + csharp.direct.sender + csharp.direct.sender + v3.5 + 512 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj new file mode 100644 index 0000000000..84fa6e8bb6 --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj @@ -0,0 +1,95 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {0DE01712-C2D1-4CA4-B42C-5856456A8696} + Exe + Properties + csharp.example.client + csharp.example.client + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj new file mode 100644 index 0000000000..b86694ef59 --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj @@ -0,0 +1,95 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {E31B349C-830C-4583-8BD9-30DA4398349F} + Exe + Properties + csharp.example.declare_queues + csharp.example.declare_queues + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj new file mode 100644 index 0000000000..a7937dd00e --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj @@ -0,0 +1,96 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {C43DEB69-8088-420B-B0CA-C699535E6D08} + Exe + Properties + csharp.example.drain + csharp.example.drain + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj new file mode 100644 index 0000000000..ae63171e10 --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj @@ -0,0 +1,95 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {8CC1C265-0507-44A3-9483-8FAF48513F4D} + Exe + Properties + csharp.example.helloworld + csharp.example.helloworld + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj new file mode 100644 index 0000000000..77953a584d --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj @@ -0,0 +1,95 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {090A081D-E8B5-4949-AA43-EE182B7101E3} + Exe + Properties + csharp.example.server + csharp.example.server + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj new file mode 100644 index 0000000000..c04951a327 --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj @@ -0,0 +1,96 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {EB36626D-36C2-41B3-B65E-762BAF27F137} + Exe + Properties + csharp.example.spout + csharp.example.spout + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj new file mode 100644 index 0000000000..8ade4b6f06 --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj @@ -0,0 +1,99 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {68A43817-2358-4A31-8FDF-FE21722BFBCF} + Exe + Properties + csharp.map.callback.receiver + csharp.map.callback.receiver + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messaging.sessionreceiver.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj new file mode 100644 index 0000000000..a2c6d0b770 --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj @@ -0,0 +1,98 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {12F1C14F-5C7D-4075-9BAE-C091394FF99A} + Exe + Properties + csharp.map.callback.sender + csharp.map.callback.sender + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + true + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + true + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + true + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj new file mode 100644 index 0000000000..350c64b832 --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj @@ -0,0 +1,95 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9} + Exe + Properties + csharp.map.receiver + csharp.map.receiver + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj new file mode 100644 index 0000000000..fa0e05f4ff --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj @@ -0,0 +1,95 @@ + + + + Debug + x86 + 9.0.21022 + 2.0 + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10} + Exe + Properties + csharp.map.sender + csharp.map.sender + v3.5 + 512 + + + true + full + false + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + $(ProjectDir)..\..\..\bin\ + TRACE + prompt + 4 + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x86 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x86 + prompt + + + true + $(ProjectDir)..\..\..\bin\ + DEBUG;TRACE + full + x64 + prompt + + + $(ProjectDir)..\..\..\bin\ + TRACE + true + pdbonly + x64 + prompt + + + + False + $(ProjectDir)..\..\..\bin\org.apache.qpid.messagingd.dll + + + + 3.5 + + + 3.5 + + + 3.5 + + + + + + + + + + + diff --git a/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln new file mode 100644 index 0000000000..9fe026ec35 --- /dev/null +++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln @@ -0,0 +1,195 @@ +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{34C477FB-B0CC-4AB9-A346-EA7B055469AC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Direct", "Direct", "{DE58D329-10DC-4C8D-9EFA-230A57314089}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "examples\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "examples\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StructuredMessage", "StructuredMessage", "{E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "examples\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "examples\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "examples\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "examples\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client-Server", "Client-Server", "{9232212E-F3C6-4D18-8D25-0C31DD5FF3DB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "examples\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "examples\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drain-Spout", "Drain-Spout", "{89CE04CB-21DE-4ABB-9236-50529DD8C022}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "examples\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "examples\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "examples\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hello World", "Hello World", "{4408A2DA-ED2D-44AE-A465-0B6D75E1FF86}" + ProjectSection(SolutionItems) = preProject + examples\powershell.example.helloworld\powershell.example.helloworld.ps1 = examples\powershell.example.helloworld\powershell.example.helloworld.ps1 + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "examples\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|Win32.ActiveCfg = Debug|Any CPU + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x64.ActiveCfg = Debug|x64 + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x64.Build.0 = Debug|x64 + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x86.ActiveCfg = Debug|x86 + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x86.Build.0 = Debug|x86 + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|Win32.ActiveCfg = Release|Any CPU + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x64.ActiveCfg = Release|x64 + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x64.Build.0 = Release|x64 + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x86.ActiveCfg = Release|x86 + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x86.Build.0 = Release|x86 + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|Win32.ActiveCfg = Debug|Any CPU + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x64.ActiveCfg = Debug|x64 + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x64.Build.0 = Debug|x64 + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x86.ActiveCfg = Debug|x86 + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x86.Build.0 = Debug|x86 + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|Win32.ActiveCfg = Release|Any CPU + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x64.ActiveCfg = Release|x64 + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x64.Build.0 = Release|x64 + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x86.ActiveCfg = Release|x86 + {52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x86.Build.0 = Release|x86 + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|Win32.ActiveCfg = Debug|Any CPU + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x64.ActiveCfg = Debug|x64 + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x64.Build.0 = Debug|x64 + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x86.ActiveCfg = Debug|x86 + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x86.Build.0 = Debug|x86 + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|Win32.ActiveCfg = Release|Any CPU + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x64.ActiveCfg = Release|x64 + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x64.Build.0 = Release|x64 + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x86.ActiveCfg = Release|x86 + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x86.Build.0 = Release|x86 + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|Win32.ActiveCfg = Debug|Any CPU + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x64.ActiveCfg = Debug|x64 + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x64.Build.0 = Debug|x64 + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x86.ActiveCfg = Debug|x86 + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x86.Build.0 = Debug|x86 + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|Win32.ActiveCfg = Release|Any CPU + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x64.ActiveCfg = Release|x64 + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x64.Build.0 = Release|x64 + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x86.ActiveCfg = Release|x86 + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x86.Build.0 = Release|x86 + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|Win32.ActiveCfg = Debug|Any CPU + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x64.ActiveCfg = Debug|x64 + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x64.Build.0 = Debug|x64 + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x86.ActiveCfg = Debug|x86 + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x86.Build.0 = Debug|x86 + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|Win32.ActiveCfg = Release|Any CPU + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x64.ActiveCfg = Release|x64 + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x64.Build.0 = Release|x64 + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x86.ActiveCfg = Release|x86 + {68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x86.Build.0 = Release|x86 + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|Win32.ActiveCfg = Debug|Any CPU + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x64.ActiveCfg = Debug|x64 + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x64.Build.0 = Debug|x64 + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x86.ActiveCfg = Debug|x86 + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x86.Build.0 = Debug|x86 + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|Win32.ActiveCfg = Release|Any CPU + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x64.ActiveCfg = Release|x64 + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x64.Build.0 = Release|x64 + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x86.ActiveCfg = Release|x86 + {12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x86.Build.0 = Release|x86 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|Win32.ActiveCfg = Debug|x86 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x64.ActiveCfg = Debug|x64 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x64.Build.0 = Debug|x64 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x86.ActiveCfg = Debug|x86 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x86.Build.0 = Debug|x86 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|Win32.ActiveCfg = Release|x86 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x64.ActiveCfg = Release|x64 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x64.Build.0 = Release|x64 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x86.ActiveCfg = Release|x86 + {0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x86.Build.0 = Release|x86 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|Win32.ActiveCfg = Debug|x86 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x64.ActiveCfg = Debug|x64 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x64.Build.0 = Debug|x64 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x86.ActiveCfg = Debug|x86 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x86.Build.0 = Debug|x86 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|Win32.ActiveCfg = Release|x86 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x64.ActiveCfg = Release|x64 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x64.Build.0 = Release|x64 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x86.ActiveCfg = Release|x86 + {090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x86.Build.0 = Release|x86 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|Win32.ActiveCfg = Debug|x86 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x64.ActiveCfg = Debug|x64 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x64.Build.0 = Debug|x64 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x86.ActiveCfg = Debug|x86 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x86.Build.0 = Debug|x86 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|Win32.ActiveCfg = Release|x86 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x64.ActiveCfg = Release|x64 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x64.Build.0 = Release|x64 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x86.ActiveCfg = Release|x86 + {C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x86.Build.0 = Release|x86 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|Win32.ActiveCfg = Debug|x86 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x64.ActiveCfg = Debug|x64 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x64.Build.0 = Debug|x64 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x86.ActiveCfg = Debug|x86 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x86.Build.0 = Debug|x86 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|Win32.ActiveCfg = Release|x86 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x64.ActiveCfg = Release|x64 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x64.Build.0 = Release|x64 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x86.ActiveCfg = Release|x86 + {EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x86.Build.0 = Release|x86 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|Win32.ActiveCfg = Debug|x86 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x64.ActiveCfg = Debug|x64 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x64.Build.0 = Debug|x64 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x86.ActiveCfg = Debug|x86 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x86.Build.0 = Debug|x86 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Release|Win32.ActiveCfg = Release|x86 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x64.ActiveCfg = Release|x64 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x64.Build.0 = Release|x64 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x86.ActiveCfg = Release|x86 + {E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x86.Build.0 = Release|x86 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|Win32.ActiveCfg = Debug|x86 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x64.ActiveCfg = Debug|x64 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x64.Build.0 = Debug|x64 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x86.ActiveCfg = Debug|x86 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x86.Build.0 = Debug|x86 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|Win32.ActiveCfg = Release|x86 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x64.ActiveCfg = Release|x64 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x64.Build.0 = Release|x64 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x86.ActiveCfg = Release|x86 + {8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {DE58D329-10DC-4C8D-9EFA-230A57314089} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC} + {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC} + {9232212E-F3C6-4D18-8D25-0C31DD5FF3DB} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC} + {89CE04CB-21DE-4ABB-9236-50529DD8C022} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC} + {4408A2DA-ED2D-44AE-A465-0B6D75E1FF86} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC} + {7B71CE78-8E78-4632-ADBE-F4D5DFAE0068} = {DE58D329-10DC-4C8D-9EFA-230A57314089} + {52F880E7-D677-4C91-8516-D679CE0F46A8} = {DE58D329-10DC-4C8D-9EFA-230A57314089} + {5D8252F5-E1D3-44A0-94C7-7CB75E843C10} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960} + {AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960} + {68A43817-2358-4A31-8FDF-FE21722BFBCF} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960} + {12F1C14F-5C7D-4075-9BAE-C091394FF99A} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960} + {0DE01712-C2D1-4CA4-B42C-5856456A8696} = {9232212E-F3C6-4D18-8D25-0C31DD5FF3DB} + {090A081D-E8B5-4949-AA43-EE182B7101E3} = {9232212E-F3C6-4D18-8D25-0C31DD5FF3DB} + {C43DEB69-8088-420B-B0CA-C699535E6D08} = {89CE04CB-21DE-4ABB-9236-50529DD8C022} + {EB36626D-36C2-41B3-B65E-762BAF27F137} = {89CE04CB-21DE-4ABB-9236-50529DD8C022} + {E31B349C-830C-4583-8BD9-30DA4398349F} = {89CE04CB-21DE-4ABB-9236-50529DD8C022} + {8CC1C265-0507-44A3-9483-8FAF48513F4D} = {4408A2DA-ED2D-44AE-A465-0B6D75E1FF86} + EndGlobalSection +EndGlobal diff --git a/qpid/cpp/bld-winsdk.ps1 b/qpid/cpp/bld-winsdk.ps1 index 0bf7c4c20f..f6790013bb 100644 --- a/qpid/cpp/bld-winsdk.ps1 +++ b/qpid/cpp/bld-winsdk.ps1 @@ -17,19 +17,225 @@ # under the License. # -# This script requires cmake, and 7z to be already on the path devenv should be on the path as -# a result of installing Visual Studio +# This script builds a WinSDK from a raw Qpid source checkout. +# +# On entry: +# 1. Args[0] holds the relative path to Qpid/trunk. +# Directory ".\$args[0]" holds the "cpp" directory and +# file QPID_VERSION.txt. +# 2. Args[1] holds the x86 32-bit BOOST_ROOT. "c:\boost" +# 3. Args[2] holds the x64 64-bit BOOST_ROOT. "c:\boost_x64" +# 4. Args[1] holds the version number. "0.7.946106-99" +# 5. The current directory will receive x86 and x64 subdirs. +# 6. The x86 an x64 dirs are where cmake will run. +# 7. Two Boost installations, 32- and 64-bit, are available. +# 9. No Boost directory must be on the path. +# 9. cmake, 7z, and devenv are already on the path. +# 10. devenv is Visual Studio 2008 +# +# This script creates separate zip kits for 32- and +# for 64-bit variants. +# +Set-PSDebug -Trace 1 Set-PSDebug -strict $ErrorActionPreference='Stop' -if ($args.length -lt 1) { - Write-Host 'Need to specify location of qpid src tree' - exit +# +# Global variables +# +# Define boost +[string] $global:bldwinsdkDirectory = Split-Path -parent $MyInvocation.MyCommand.Definition +[string] $global:sourceDirectory = Split-Path -parent $global:bldwinsdkDirectory +[string] $global:currentDirectory = Split-Path -parent $global:sourceDirectory + + +################################ +# +# BuildAPlatform +# Build a platform, x86 or x64. +# Compiles and packages Debug and RelWithDebInfo configurations. +# +function BuildAPlatform +{ + param + ( + [string] $qpid_cpp_dir, + [string] $platform, + [string] $cmakeGenerator, + [string] $vsTargetDebug, + [string] $vsTargetRelease, + [string] $boostRoot, + [string] $randomness + ) + + [string] $install_dir = "install_$randomness" + [string] $preserve_dir = "preserve_$randomness" + [string] $zipfile = "qpid-cpp-$platform-$ver.zip" + [string] $platform_dir = "$global:currentDirectory/$platform" + [string] $qpid_cpp_src = "$global:currentDirectory/$qpid_cpp_dir" + + # + # Create the platform directory if necessary + # + if (!(Test-Path -path $platform_dir)) + { + New-Item $platform_dir -type Directory | Out-Null + } + + # + # Descend into platform directory + # + Set-Location $platform_dir + + # + # Set environment for this build + # + $env:BOOST_ROOT = "$boostRoot" + $env:QPID_BUILD_ROOT = Get-Location + + # + # Run cmake + # + cmake -G "$cmakeGenerator" "-DCMAKE_INSTALL_PREFIX=$install_dir" $qpid_cpp_src + + # Need to build doxygen api docs separately as nothing depends on them. + # Build for both x86 and x64 or cmake_install fails. + if ("x86" -eq $platform) { + devenv qpid-cpp.sln /build "Release|Win32" /project docs-user-api + } else { + devenv qpid-cpp.sln /build "Release|$platform" /project docs-user-api + } + + # Build both Debug and Release builds so we can ship both sets of libs: + # Make RelWithDebInfo for debuggable release code. + # (Do Release after Debug so that the release executables overwrite the + # debug executables. Don't skip Debug as it creates some needed content.) + devenv qpid-cpp.sln /build "$vsTargetDebug" /project INSTALL + devenv qpid-cpp.sln /build "$vsTargetRelease" /project INSTALL + + # Build the .NET binding + devenv $qpid_cpp_src\bindings\qpid\dotnet\org.apache.qpid.messaging.sln ` + /build "Debug|$platform" /project org.apache.qpid.messaging.sessionreceiver + + # This would be kludgy if we have only one entry as the array declaration syntax + # can't cope with just one nested array + # Target must be a directory + $move=( + ('bin/*.lib','lib'), + ('bin/boost/*.dll','bin') + ) + + $preserve=( + 'include/qpid/agent', + 'include/qpid/amqp_0_10', + 'include/qpid/management', + 'include/qpid/messaging', + 'include/qpid/sys/IntegerTypes.h', + 'include/qpid/sys/windows/IntegerTypes.h', + 'include/qpid/sys/posix/IntegerTypes.h', + 'include/qpid/types', + 'include/qpid/CommonImportExport.h') + $remove=( + 'bin/qpidd.exe', 'bin/qpidbroker*.*', + 'bin/*PDB/qpidd.exe', 'bin/*PDB/qpidbroker*.*', + 'bin/qmfengine*.*', 'bin/qpidxarm*.*', + 'bin/*PDB/qmfengine*.*', 'bin/*PDB/qpidxarm*.*', + 'bin/boost_regex*.*', + 'bin/boost', + 'conf', + 'examples/direct', + 'examples/failover', + 'examples/fanout', + 'examples/pub-sub', + 'examples/qmf-console', + 'examples/request-response', + 'examples/tradedemo', + 'examples/old-examples.sln', + 'examples/README.*', + 'examples/verify*', + 'include', + 'plugins') + + # Move some files around in the install tree + foreach ($pattern in $move) { + $target = Join-Path $install_dir $pattern[1] + New-Item -force -type directory $target + Move-Item -force -path "$install_dir/$($pattern[0])" -destination "$install_dir/$($pattern[1])" + } + + # Copy aside the files to preserve + New-Item -path $preserve_dir -type directory + foreach ($pattern in $preserve) { + $target = Join-Path $preserve_dir $pattern + $tparent = Split-Path -parent $target + New-Item -force -type directory $tparent + Move-Item -force -path "$install_dir/$pattern" -destination "$preserve_dir/$pattern" + } + + # Remove everything to remove + foreach ($pattern in $remove) { + Remove-Item -recurse "$install_dir/$pattern" + } + + # Copy back the preserved things + foreach ($pattern in $preserve) { + $target = Join-Path $install_dir $pattern + $tparent = Split-Path -parent $target + New-Item -force -type directory $tparent + Move-Item -force -path "$preserve_dir/$pattern" -destination "$install_dir/$pattern" + } + Remove-Item -recurse $preserve_dir + + # Install the README + Copy-Item -force -path "$qpid_cpp_src/README-winsdk.txt" -destination "$install_dir/README-winsdk.txt" + + # Install the .NET binding + Copy-Item -force -path "./src/Debug/org.apache.qpid.messaging*.dll" -destination "$install_dir/bin" + Copy-Item -force -path "./src/Debug/org.apache.qpid.messaging*.pdb" -destination "$install_dir/bin/DebugPDB" + + # Install the .NET binding examples + New-Item -path $(Join-Path $(Get-Location) $install_dir) -name dotnet_examples -type directory + New-Item -path $(Join-Path $(Get-Location) $install_dir/dotnet_examples) -name examples -type directory + + $src = Resolve-Path "$qpid_cpp_src/bindings/qpid/dotnet/examples" + $dst = Resolve-Path "$install_dir/dotnet_examples" + Copy-Item "$src\" -destination "$dst\" -recurse -force + + $src = Resolve-Path "$qpid_cpp_src/bindings/qpid/dotnet/winsdk_sources" + $dst = Resolve-Path "$install_dir/dotnet_examples" + Copy-Item "$src\*" -destination "$dst\" -recurse -force + + # Zip the /bin PDB files into two zip files. + # we previously arranged that the Debug pdbs go in the DebugPDB subdirectory + # and the Release pdbs go in the ReleasePDB subdirectory + &'7z' a -mx9 ".\$install_dir\bin\symbols-debug.zip" ".\$install_dir\bin\DebugPDB\*.pdb" + &'7z' a -mx9 ".\$install_dir\bin\symbols-release.zip" ".\$install_dir\bin\ReleasePDB\*.pdb" + + Remove-Item -recurse ".\$install_dir\bin\DebugPDB" + Remove-Item -recurse ".\$install_dir\bin\ReleasePDB" + + # Create a new zip for the whole kit. + # Exclude *.pdb so as not include the debug symbols twice + if (Test-Path $zipfile) {Remove-Item $zipfile} + &'7z' a $zipfile ".\$install_dir\*" -xr!*pdb +} + +################################ +# +# Main() +# +# Process the args +# +if ($args.length -lt 3) { + Write-Host 'Usage: bld-winsdk.ps1 qpid_src_dir boost32_dir boost64_dir [version]' + exit } -$qpid_src=$args[0] -$ver=$args[1] +$qpid_src = $args[0] +$boostRoot32 = $args[1] +$boostRoot64 = $args[2] +$ver = $args[3] if ($ver -eq $null) { $qpid_version_file="$qpid_src\QPID_VERSION.txt" @@ -40,122 +246,36 @@ if ($ver -eq $null) { $ver=Get-Content $qpid_version_file } -$randomness=[System.IO.Path]::GetRandomFileName() - -$qpid_cpp_src="$qpid_src\cpp" -$install_dir="install_$randomness" -$preserve_dir="preserve_$randomness" -$zipfile="qpid-cpp-$ver.zip" - -# This assumes Visual Studio 2008 -cmake -G "Visual Studio 9 2008" "-DCMAKE_INSTALL_PREFIX=$install_dir" $qpid_cpp_src - -# Need to build doxygen api docs separately as nothing depends on them -devenv qpid-cpp.sln /build "Release|Win32" /project docs-user-api - -# Build both Debug and Release builds so we can ship both sets of libs: -# Make RelWithDebInfo for debuggable release code. -# (Do Release after Debug so that the release executables overwrite the -# debug executables. Don't skip Debug as it creates some needed content.) -devenv qpid-cpp.sln /build "Debug|Win32" /project INSTALL -devenv qpid-cpp.sln /build "RelWithDebInfo|Win32" /project INSTALL - -# Build the .NET binding -devenv $qpid_cpp_src\bindings\qpid\dotnet\bld\bld-org.apache.qpid.messaging.sln /build "Debug|x86" /project bld-org.apache.qpid.messaging -devenv $qpid_cpp_src\bindings\qpid\dotnet\bld\bld-org.apache.qpid.messaging.sln /build "Debug|x86" /project bld-org.apache.qpid.messaging.sessionreceiver - -# This would be kludgy if we have only one entry as the array declaration syntax -# can't cope with just one nested array -# Target must be a directory -$move=( - ('bin/*.lib','lib'), - ('bin/boost/*.dll','bin') -) - -$preserve=( - 'include/qpid/agent', - 'include/qpid/amqp_0_10', - 'include/qpid/management', - 'include/qpid/messaging', - 'include/qpid/sys/IntegerTypes.h', - 'include/qpid/sys/windows/IntegerTypes.h', 'include/qpid/sys/posix/IntegerTypes.h', - 'include/qpid/types', - 'include/qpid/CommonImportExport.h') -$remove=( - 'bin/qpidd.exe', 'bin/qpidbroker*.*', - 'bin/*PDB/qpidd.exe', 'bin/*PDB/qpidbroker*.*', - 'bin/qmfengine*.*', 'bin/qpidxarm*.*', - 'bin/*PDB/qmfengine*.*', 'bin/*PDB/qpidxarm*.*', - 'bin/boost_regex*.*', - 'bin/boost', - 'conf', - 'examples/direct', - 'examples/failover', - 'examples/fanout', - 'examples/pub-sub', - 'examples/qmf-console', - 'examples/request-response', - 'examples/tradedemo', - 'examples/old-examples.sln', - 'examples/README.*', - 'examples/verify*', - 'include', - 'plugins') - -# Move some files around in the install tree -foreach ($pattern in $move) { - $target = Join-Path $install_dir $pattern[1] - New-Item -force -type directory $target - Move-Item -force -path "$install_dir/$($pattern[0])" -destination "$install_dir/$($pattern[1])" -} - -# Copy aside the files to preserve -New-Item -path $preserve_dir -type directory -foreach ($pattern in $preserve) { - $target = Join-Path $preserve_dir $pattern - $tparent = Split-Path -parent $target - New-Item -force -type directory $tparent - Move-Item -force -path "$install_dir/$pattern" -destination "$preserve_dir/$pattern" -} -# Remove everything to remove -foreach ($pattern in $remove) { - Remove-Item -recurse "$install_dir/$pattern" -} -# Copy back the preserved things -foreach ($pattern in $preserve) { - $target = Join-Path $install_dir $pattern - $tparent = Split-Path -parent $target - New-Item -force -type directory $tparent - Move-Item -force -path "$preserve_dir/$pattern" -destination "$install_dir/$pattern" +# +# Verify that Boost is not in PATH +# +[string] $oldPath = $env:PATH +$oldPath = $oldPath.ToLower() +if ($oldPath.Contains("boost")) +{ + Write-Host "This script will not work with BOOST defined in the path environment variable." + Exit } -Remove-Item -recurse $preserve_dir - -# Install the README -Copy-Item -force -path "$qpid_cpp_src/README-winsdk.txt" -destination "$install_dir/README-winsdk.txt" - -# Install the .NET binding -Copy-Item -force -path "./src/Debug/org.apache.qpid.messaging*.dll" -destination "$install_dir/bin" -Copy-Item -force -path "./src/Debug/org.apache.qpid.messaging*.pdb" -destination "$install_dir/bin/DebugPDB" -New-Item -path $(Join-Path $(Get-Location) $install_dir) -name dotnet_examples -type directory -Dir -recurse $qpid_cpp_src/bindings/qpid/dotnet/examples csharp*.cs | Copy -destination $install_dir/dotnet_examples -Dir -recurse $qpid_cpp_src/bindings/qpid/dotnet/examples visualbasic*.vb | Copy -destination $install_dir/dotnet_examples -Dir -recurse $qpid_cpp_src/bindings/qpid/dotnet/examples *.ps1 | Copy -destination $install_dir/dotnet_examples - -# Zip the /bin PDB files into two zip files. -# we previously arranged that the Debug pdbs go in the DebugPDB subdirectory -# and the Release pdbs go in the ReleasePDB subdirectory -&'7z' a -mx9 ".\$install_dir\bin\symbols-debug.zip" ".\$install_dir\bin\DebugPDB\*.pdb" -&'7z' a -mx9 ".\$install_dir\bin\symbols-release.zip" ".\$install_dir\bin\ReleasePDB\*.pdb" - -# It would be very good to cut down on the shipped boost include files too, ideally by -# starting with the qpid files and recursively noting all boost headers actually needed +$randomness=[System.IO.Path]::GetRandomFileName() +$qpid_cpp_src="$qpid_src\cpp" -# Create a new zip for the whole kit. -# Exclude *.pdb so as not include the debug symbols twice -if (Test-Path $zipfile) {Remove-Item $zipfile} -&'7z' a $zipfile ".\$install_dir\*" -xr!*pdb +# +# buid +# +BuildAPlatform $qpid_cpp_src ` + "x64" ` + "Visual Studio 9 2008 Win64" ` + "Debug|x64" ` + "RelWithDebInfo|x64" ` + $boostRoot64 ` + $randomness -# Remove temporary install area -# Remove-Item -recurse $install_dir +BuildAPlatform $qpid_cpp_src ` + "x86" ` + "Visual Studio 9 2008" ` + "Debug|Win32" ` + "RelWithDebInfo|Win32" ` + $boostRoot32 ` + $randomness diff --git a/qpid/cpp/examples/examples.sln b/qpid/cpp/examples/examples.sln index 4a26ac7c7c..8511fe3cce 100644 --- a/qpid/cpp/examples/examples.sln +++ b/qpid/cpp/examples/examples.sln @@ -35,33 +35,59 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.ActiveCfg = Debug|Win32 {80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.Build.0 = Debug|Win32 + {80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.ActiveCfg = Debug|x64 + {80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.Build.0 = Debug|x64 {80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.ActiveCfg = Release|Win32 {80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32 + {80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.ActiveCfg = Release|x64 + {80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.Build.0 = Release|x64 {92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.ActiveCfg = Debug|Win32 {92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.Build.0 = Debug|Win32 + {92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.ActiveCfg = Debug|x64 + {92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.Build.0 = Debug|x64 {92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.ActiveCfg = Release|Win32 {92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32 + {92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.ActiveCfg = Release|x64 + {92D8F5AA-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.Build.0 = Release|x64 {3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.ActiveCfg = Debug|Win32 {3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.Build.0 = Debug|Win32 + {3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.ActiveCfg = Debug|x64 + {3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.Build.0 = Debug|x64 {3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.ActiveCfg = Release|Win32 {3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32 + {3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.ActiveCfg = Release|x64 + {3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.Build.0 = Release|x64 {E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.ActiveCfg = Debug|Win32 {E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|Win32.Build.0 = Debug|Win32 + {E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.ActiveCfg = Debug|x64 + {E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Debug|x64.Build.0 = Debug|x64 {E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.ActiveCfg = Release|Win32 {E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32 + {E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.ActiveCfg = Release|x64 + {E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Release|x64.Build.0 = Release|x64 {D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|Win32.ActiveCfg = Debug|Win32 {D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|Win32.Build.0 = Debug|Win32 + {D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|x64.ActiveCfg = Debug|x64 + {D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|x64.Build.0 = Debug|x64 {D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|Win32.ActiveCfg = Release|Win32 {D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|Win32.Build.0 = Release|Win32 + {D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|x64.ActiveCfg = Release|x64 + {D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|x64.Build.0 = Release|x64 {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|Win32.ActiveCfg = Debug|Win32 {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|Win32.Build.0 = Debug|Win32 + {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|x64.ActiveCfg = Debug|x64 + {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|x64.Build.0 = Debug|x64 {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|Win32.ActiveCfg = Release|Win32 {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|Win32.Build.0 = Release|Win32 + {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|x64.ActiveCfg = Release|x64 + {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/qpid/cpp/examples/messaging/messaging_client.vcproj b/qpid/cpp/examples/messaging/messaging_client.vcproj index dcca4a66cd..0313a9f585 100644 --- a/qpid/cpp/examples/messaging/messaging_client.vcproj +++ b/qpid/cpp/examples/messaging/messaging_client.vcproj @@ -32,6 +32,9 @@ + @@ -207,6 +210,179 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,6 +418,22 @@ Name="VCCustomBuildTool" /> + + + + + + diff --git a/qpid/cpp/examples/messaging/messaging_drain.vcproj b/qpid/cpp/examples/messaging/messaging_drain.vcproj index b587aae23d..61429ec628 100644 --- a/qpid/cpp/examples/messaging/messaging_drain.vcproj +++ b/qpid/cpp/examples/messaging/messaging_drain.vcproj @@ -32,6 +32,9 @@ + @@ -189,6 +192,161 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj b/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj index d8d2882250..9b40c13661 100644 --- a/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj +++ b/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj @@ -19,7 +19,7 @@ - under the License. - --> - + @@ -207,6 +210,179 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,6 +418,22 @@ Name="VCCustomBuildTool" /> + + + + + + diff --git a/qpid/cpp/examples/messaging/messaging_map_sender.vcproj b/qpid/cpp/examples/messaging/messaging_map_sender.vcproj index a7940ad403..517e791b98 100644 --- a/qpid/cpp/examples/messaging/messaging_map_sender.vcproj +++ b/qpid/cpp/examples/messaging/messaging_map_sender.vcproj @@ -32,6 +32,9 @@ + @@ -207,6 +210,179 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,6 +418,22 @@ Name="VCCustomBuildTool" /> + + + + + + diff --git a/qpid/cpp/examples/messaging/messaging_server.vcproj b/qpid/cpp/examples/messaging/messaging_server.vcproj index 4405fd68c1..93fc41a74a 100644 --- a/qpid/cpp/examples/messaging/messaging_server.vcproj +++ b/qpid/cpp/examples/messaging/messaging_server.vcproj @@ -32,6 +32,9 @@ + @@ -207,6 +210,179 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,6 +418,22 @@ Name="VCCustomBuildTool" /> + + + + + + diff --git a/qpid/cpp/examples/messaging/messaging_spout.vcproj b/qpid/cpp/examples/messaging/messaging_spout.vcproj index 03ce1c50fd..85d991362c 100644 --- a/qpid/cpp/examples/messaging/messaging_spout.vcproj +++ b/qpid/cpp/examples/messaging/messaging_spout.vcproj @@ -32,6 +32,9 @@ + @@ -189,6 +192,161 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.1