You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2008/11/12 00:00:19 UTC
svn commit: r713215 - in /activemq/activemq-dotnet/Apache.NMS/trunk: ./ lib/
nant-common.xml nant.build vendor/ vs2008-nms-test.csproj vs2008-nms.csproj
Author: jgomes
Date: Tue Nov 11 15:00:18 2008
New Revision: 713215
URL: http://svn.apache.org/viewvc?rev=713215&view=rev
Log:
Refactor vendor assemblies to stage into the lib directory rather than staging directly on top of the vendor directory.
Added:
activemq/activemq-dotnet/Apache.NMS/trunk/vendor/ (with props)
Removed:
activemq/activemq-dotnet/Apache.NMS/trunk/lib/
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj
activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj
Propchange: activemq/activemq-dotnet/Apache.NMS/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 11 15:00:18 2008
@@ -1,3 +1,4 @@
build
obj
*.suo
+lib
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml?rev=713215&r1=713214&r2=713215&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Tue Nov 11 15:00:18 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/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=713215&r1=713214&r2=713215&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Tue Nov 11 15:00:18 2008
@@ -28,13 +28,20 @@
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers"/>
<property name="project.cls.compliant" value="true"/>
- <property name="nunit.dll" value="${basedir}/lib/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+ <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
<target name="vendor-init" description="Initializes Vendor library from local repository.">
<!-- 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=""/>
+ <property name="vendor.fileset.names" value="vendor.nunit.org"/>
+
+ <!-- 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">
@@ -82,7 +89,7 @@
</fileset>
</target>
- <target name="default" depends="install-all"/>
+ <target name="default" depends="download-vendor-all, install-all" />
<!-- Load the common target definitions -->
<include buildfile="${basedir}/nant-common.xml"/>
Propchange: activemq/activemq-dotnet/Apache.NMS/trunk/vendor/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Nov 11 15:00:18 2008
@@ -0,0 +1 @@
+^/activemq/activemq-dotnet/vendor/NUnit/2.4.8 NUnit
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj?rev=713215&r1=713214&r2=713215&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj Tue Nov 11 15:00:18 2008
@@ -59,11 +59,11 @@
<ItemGroup>
<Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>lib\net-3.5\nunit.framework.dll</HintPath>
+ <HintPath>lib\NUnit\net-3.5\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework.extensions, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>lib\net-3.5\nunit.framework.extensions.dll</HintPath>
+ <HintPath>lib\NUnit\net-3.5\nunit.framework.extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj?rev=713215&r1=713214&r2=713215&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj Tue Nov 11 15:00:18 2008
@@ -97,7 +97,7 @@
<PropertyGroup>
<PostBuildEvent>cd $(ProjectDir)
nant -nologo -q install-all -D:compile.skip=true</PostBuildEvent>
- <PreBuildEvent>
- </PreBuildEvent>
+ <PreBuildEvent>cd $(ProjectDir)
+nant -nologo download-vendor -D:vendor.build.config=$(ConfigurationName) -D:vendor.build.framework=net-2.0</PreBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file