Author: jgomes
Date: Tue Nov 11 14:26:00 2008
New Revision: 713198
URL: http://svn.apache.org/viewvc?rev=713198&view=rev
Log:
Refactor vendor assemblies to stage into the lib directory rather than staging
directly on top of the vendor directory.
Removed:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/lib/
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vendor/ (props changed)
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 11 14:26:00 2008
@@ -1,4 +1,4 @@
build
obj
*.suo
-vendor
+lib
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml?rev=713198&r1=713197&r2=713198&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Tue Nov
11 14:26:00 2008
@@ -391,16 +391,25 @@
<property name="vendor.version"
value="${property::get-value(current.vendor + '.version')}"/>
<property name="vendor.filenames"
value="${property::get-value(current.vendor + '.filenames')}"/>
- <property name="local.repo.vendor.path"
value="${vendor.group}/${vendor.name}/${vendor.version}/${vendor.build.framework}/${vendor.build.config}"/>
- <property name="vendor.repo"
value="vendor/${vendor.name}/${vendor.build.framework}" />
-
+ <property name="local.repo.vendor.path"
value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${vendor.build.framework}/${vendor.build.config}"/>
+ <property name="vendor.path"
value="vendor/${vendor.name}/${vendor.build.framework}" />
+ <property name="lib.path"
value="lib/${vendor.name}/${vendor.build.framework}" />
+
+ <!--
+ Update the LIB folder with the latest version of the file. By
default, the file from the
+ VENDOR folder will be used. However, if there is a newer version
installed in the local
+ repository, then that version will be copied into the LIB folder.
+ -->
<foreach item="String" in="${vendor.filenames}" delim=","
property="repo.task.artifact">
- <property name="repo.task.src"
value="${nant.local.repo}/${local.repo.vendor.path}/${repo.task.artifact}"/>
- <property name="repo.task.dest"
value="${vendor.repo}/${repo.task.artifact}"/>
+ <property name="lib.task.dest"
value="${lib.path}/${repo.task.artifact}"/>
+ <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" />
+
+ <property name="vendor.task.src"
value="${vendor.path}/${repo.task.artifact}"/>
+ <property name="repo.task.src"
value="${local.repo.vendor.path}/${repo.task.artifact}"/>
- <if test="${file::exists(repo.task.src) and not
file::up-to-date(repo.task.src, repo.task.dest)}">
- <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
- <get src="${repo.task.src}" dest="${repo.task.dest}" />
+ <copy file="${repo.task.src}" tofile="${lib.task.dest}"
if="${file::exists(repo.task.src)}"/>
+ <if test="${not file::exists(repo.task.src)}">
+ <copy file="${vendor.task.src}" tofile="${lib.task.dest}"
if="${file::exists(vendor.task.src)}"/>
</if>
</foreach>
</foreach>
@@ -444,7 +453,7 @@
</in>
<do>
<property name="repo.task.dest"
value="${path::get-file-name(deploy.filename)}"/>
- <copy file="${deploy.filename}" todir="${repo.dir}" if="${not
file::up-to-date(deploy.filename, '${repo.dir}/${repo.task.dest}')}" />
+ <copy file="${deploy.filename}" todir="${repo.dir}"
unless="${file::up-to-date(deploy.filename, '${repo.dir}/${repo.task.dest}')}"
/>
</do>
</foreach>
@@ -460,6 +469,7 @@
</if>
<delete dir="build" if="${directory::exists('build')}" />
<delete dir="obj" if="${directory::exists('obj')}" />
+ <delete dir="lib" if="${directory::exists('lib')}" />
</target>
<target name="doc" depends="compile">
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build?rev=713198&r1=713197&r2=713198&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Tue Nov 11
14:26:00 2008
@@ -27,13 +27,13 @@
<property name="project.short_description" value="Apache NMS for ActiveMQ
Class Library"/>
<property name="project.description" value="Apache NMS for ActiveMQ Class
Library (.Net Messaging Library Implementation): An implementation of the NMS
API for ActiveMQ"/>
- <!-- Repository organized as: organization/module/version/plaform/artifact,
platform might be something like 'all' or 'net-2.0/release' -->
- <property name="nunit.dll"
value="${basedir}/lib/${current.build.framework}/nunit.framework.dll"
dynamic="true"/>
- <property name="nunit.extensions.dll"
value="${basedir}/lib/${current.build.framework}/nunit.framework.extensions.dll"
dynamic="true"/>
- <property name="Apache.NMS.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.dll"
dynamic="true"/>
- <property name="Apache.NMS.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.pdb"
dynamic="true"/>
- <property name="Apache.NMS.Test.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll"
dynamic="true"/>
- <property name="Apache.NMS.Test.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
+ <!-- Lib organized as: module/plaform/artifact, platform might be something
like 'all' or 'net-2.0/release' -->
+ <property name="nunit.dll"
value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll"
dynamic="true"/>
+ <property name="nunit.extensions.dll"
value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll"
dynamic="true"/>
+ <property name="Apache.NMS.dll"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll"
dynamic="true"/>
+ <property name="Apache.NMS.pdb"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb"
dynamic="true"/>
+ <property name="Apache.NMS.Test.dll"
value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll"
dynamic="true"/>
+ <property name="Apache.NMS.Test.pdb"
value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
<!-- Skip certain frameworks, since ActiveMQ.NET Client is not supported on
those platforms. -->
<property name="build.net-1.1.skip" value="true"/>
@@ -42,7 +42,7 @@
<!-- Vendor specific info. The prefix of 'vendor.apache.org' is taken
from the property
'vendor.fileset.names'. This comma-delimited list is iterated, and
properties with
well-known suffixes are used to access and copy down vendor file
dependencies. -->
- <property name="vendor.fileset.names" value="vendor.apache.org"/>
+ <property name="vendor.fileset.names"
value="vendor.apache.org,vendor.nunit.org"/>
<!-- Property grouping for 'vendor.apache.org' -->
<property name="vendor.apache.org.name" value="Apache.NMS"/>
@@ -50,6 +50,13 @@
<property name="vendor.apache.org.version" value="1.1.0"/>
<property name="vendor.apache.org.filenames"
value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb"
/>
+
+ <!-- Property grouping for 'vendor.nunit.org' -->
+ <property name="vendor.nunit.org.name" value="NUnit"/>
+ <property name="vendor.nunit.org.group" value="org.nunit"/>
+ <property name="vendor.nunit.org.version" value="2.4.8"/>
+ <property name="vendor.nunit.org.filenames"
+ value="nunit.framework.dll,nunit.framework.extensions.dll" />
</target>
<target name="dependency-init" description="Initializes build dependencies">
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vendor/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Nov 11 14:26:00 2008
@@ -1 +1,2 @@
-Apache.NMS
https://svn.apache.org/repos/asf/activemq/activemq-dotnet/Apache.NMS/trunk/deploy
+^/activemq/activemq-dotnet/Apache.NMS/trunk/deploy Apache.NMS
+^/activemq/activemq-dotnet/vendor/NUnit/2.4.8 NUnit
