Author: chug
Date: Mon Nov 4 16:52:58 2013
New Revision: 1538674
URL: http://svn.apache.org/r1538674
Log:
QPID-5287: .NET binding does not set AssemblyVersion to build version.
The fix is
1. rename the AssemblyInfo.cpp to indicate that it is a template.
2. put replacement strings into the template (see sessionreceiver for correct
pattern).
3. configure the template during cmake run.
4. Refer to generated file in projects that need it.
Added:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
- copied, changed from r1538617,
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp
Removed:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
qpid/trunk/qpid/cpp/src/CMakeLists.txt
Copied: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
(from r1538617, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp?p2=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp&p1=qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp&r1=1538617&r2=1538674&rev=1538674&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp Mon
Nov 4 16:52:58 2013
@@ -47,8 +47,9 @@ using namespace System::Security::Permis
//
// You can specify all the value or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-
-[assembly:AssemblyVersionAttribute("1.0.*")];
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly:
AssemblyVersion("${winver_PRODUCT_VERSION_N1}.${winver_PRODUCT_VERSION_N2}.${winver_PRODUCT_VERSION_N3}.${winver_PRODUCT_VERSION_N4}")]
+[assembly:
AssemblyFileVersion("${winver_FILE_VERSION_N1}.${winver_FILE_VERSION_N2}.${winver_FILE_VERSION_N3}.${winver_FILE_VERSION_N4}")]
[assembly:ComVisible(false)];
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj?rev=1538674&r1=1538673&r2=1538674&view=diff
==============================================================================
---
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
(original)
+++
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
Mon Nov 4 16:52:58 2013
@@ -279,7 +279,7 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Address.cpp" />
- <ClCompile Include="..\AssemblyInfo.cpp" />
+ <ClCompile
Include="$(QPID_BUILD_ROOT)\src\windows\generated_src\AssemblyInfo.cpp" />
<ClCompile Include="..\Connection.cpp" />
<ClCompile Include="..\FailoverUpdates.cpp" />
<ClCompile Include="..\Message.cpp" />
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj?rev=1538674&r1=1538673&r2=1538674&view=diff
==============================================================================
---
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
(original)
+++
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
Mon Nov 4 16:52:58 2013
@@ -530,7 +530,7 @@
>
</File>
<File
- RelativePath="..\AssemblyInfo.cpp"
+
RelativePath="$(QPID_BUILD_ROOT)\src\windows\generated_src\AssemblyInfo.cpp"
>
</File>
<File
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1538674&r1=1538673&r2=1538674&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Mon Nov 4 16:52:58 2013
@@ -230,6 +230,8 @@ if (MSVC)
# Set the windows version for the .NET Binding cpp project
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
${CMAKE_CURRENT_BINARY_DIR}/windows/resources/org.apache.qpid.messaging.rc)
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
+
${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/AssemblyInfo.cpp)
# Set the windows version for the .NET Binding sessionreceiver project
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/sessionreceiver/properties/sessionreceiver-AssemblyInfo-template.cs
${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/sessionreceiver-AssemblyInfo.cs)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
