Author: jgomes Date: Tue Aug 12 23:01:31 2014 New Revision: 1617620 URL: http://svn.apache.org/r1617620 Log: Refactored to preserve the standard nant-common.xml. The unmanaged content is included along with the other project content. Fixes [AMQNET-454]. (See https://issues.apache.org/jira/browse/AMQNET-454)
Modified: activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant-common.xml activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant.build Modified: activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant-common.xml URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant-common.xml?rev=1617620&r1=1617619&r2=1617620&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant-common.xml (original) +++ activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant-common.xml Tue Aug 12 23:01:31 2014 @@ -384,7 +384,6 @@ <copy todir="${build.bin.dir}" file="${content.filename}" if="${not file::up-to-date(content.filename, '${build.bin.dir}/${content.filename}')}" /> </do> </foreach> - <call target="copy-unmanaged-content" /> </target> <!-- ============================================================================================ --> Modified: activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant.build URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant.build?rev=1617620&r1=1617619&r2=1617620&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant.build (original) +++ activemq/activemq-dotnet/Apache.NMS.AMQP/trunk/nant.build Tue Aug 12 23:01:31 2014 @@ -118,9 +118,29 @@ <include name="${Apache.NMS.pdb}" /> <include name="${Apache.NMS.Test.dll}" /> <include name="${Apache.NMS.Test.pdb}" /> - <include name="${Apache.Qpid.dll}" /> + <include name="${Apache.Qpid.dll}" /> <include name="${nunit.dll}" /> <include name="${NUnit.Projectfile}" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_chrono-vc100-mt-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_chrono-vc100-mt-gd-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_date_time-vc100-mt-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_date_time-vc100-mt-gd-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_program_options-vc100-mt-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_program_options-vc100-mt-gd-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_system-vc100-mt-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_system-vc100-mt-gd-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_thread-vc100-mt-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost_thread-vc100-mt-gd-1_47.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpid-proton.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpid-protond.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidclient.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidclientd.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidcommon.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidcommond.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidmessaging.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidmessagingd.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidtypes.dll" /> + <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpidtypesd.dll" /> </fileset> <fileset id="install.filenames"> @@ -132,19 +152,6 @@ </target> - <target name="copy-unmanaged-content" description="Copies native DLLs from \lib to \build"> - <foreach item="File" property="filename"> - <in> <items> - <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/qpid*" /> - <include name="${basedir}/lib/Apache.Qpid/${current.build.framework}/boost*" /> - </items> </in> - <do> - <echo message="Copying unmanaged: ${filename}" /> - <copy todir="${build.bin.dir}" file="${filename}" if="${not file::up-to-date(filename, '${build.bin.dir}/${filename}')}" /> - </do> - </foreach> - </target> - <target name="default" depends="install-all" /> <zipfileset id="src.package.contents" basedir="${basedir}">