Author: jgomes
Date: Fri Oct 17 12:01:23 2008
New Revision: 705711
URL: http://svn.apache.org/viewvc?rev=705711&view=rev
Log:
Refactor to use NMS assemblies instead of direct project compilation.
Added:
activemq/activemq-dotnet/Apache.NMS/trunk/deploy/ (props changed)
- copied from r705419,
activemq/activemq-dotnet/Apache.NMS/tags/1.0.0/deploy/
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/CommonAssemblyInfo.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/CommonAssemblyInfo.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs
Propchange: activemq/activemq-dotnet/Apache.NMS/trunk/deploy/
------------------------------------------------------------------------------
svn:mergeinfo =
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=705711&r1=705710&r2=705711&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Fri Oct 17
12:01:23 2008
@@ -99,16 +99,6 @@
<copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
</target>
- <target name="repo-deploy" description="Deploy a dependency to the
deployment repo">
- <fail message="Then nant.deploy.repo variable has not been set. Please
set it before you call this task."
unless="${property::exists('nant.deploy.repo')}"/>
- <fail message="The repo.task.artifact variable has not been set. Please
set it before you call this task."
unless="${property::exists('repo.task.artifact')}"/>
- <fail message="The repo.task.src variable has not been set. Please set it
before you call this task." unless="${property::exists('repo.task.src')}"/>
-
- <property name="repo.task.dest"
value="${nant.deploy.repo}/${repo.task.artifact}"/>
- <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
- <copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
- </target>
-
<target name="release-init" description="Initializes release build
properties">
<property name="snk.file"
value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
@@ -445,24 +435,22 @@
<!--
============================================================================================
-->
<target name="deploy-all" depends="release-init" description="Deploy all
build configurations for all runtime configurations">
- <echo message="Deploying all build configurations for all runtime
configurations." />
+ <echo message="Deploying release configurations for all runtime
configurations." />
- <call target="set-debug-configuration" />
+ <call target="set-release-configuration" />
<call target="set-net-1.1-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-3.5-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-netcf-2.0-framework-configuration"/><call
target="conditional-deploy" />
- <!-- we can only do a release skip if the Key file is available -->
- <if test="${not build.skip.release}">
- <call target="set-release-configuration" />
- <call target="set-net-1.1-framework-configuration" /><call
target="conditional-deploy" />
- <call target="set-net-2.0-framework-configuration" /><call
target="conditional-deploy" />
- <call target="set-net-3.5-framework-configuration" /><call
target="conditional-deploy" />
- <call target="set-mono-2.0-framework-configuration" /><call
target="conditional-deploy" />
- <call target="set-netcf-2.0-framework-configuration"/><call
target="conditional-deploy" />
- </if>
+ <!-- Commit the deployed files to repository. This completes the
deployment. -->
+ <exec program="svn" failonerror="false">
+ <arg value="commit"/>
+ <arg value="deploy"/>
+ <arg value="-m"/>
+ <arg value="Deploy ${project.name} ${project.version}"/>
+ </exec>
</target>
<target name="conditional-deploy" depends="init" unless="${build.skip}"
@@ -471,21 +459,19 @@
</target>
<target name="init-deploy">
- <fail message="Then nant.deploy.repo variable has not been set. Please
set it before you call this task."
unless="${property::exists('nant.deploy.repo')}"/>
</target>
- <!-- Deploy the modules to the local repo -->
- <target name="deploy" depends="init-deploy, install" description="Deploy the
artifacts into the nant repo">
- <property name="path"
value="${project.group}/${project.name}/${project.version.full}/${current.build.framework}/${current.build.config}"/>
+ <!-- Deploy the modules to the global repo -->
+ <target name="deploy" depends="init-deploy" description="Deploy the
artifacts into the nant repo">
+ <property name="repo.dir" value="deploy/${current.build.framework}"/>
<foreach item="File" property="deploy.filename">
<in>
<items refid="deploy.filenames" />
</in>
<do>
- <property name="repo.task.artifact"
value="${path}/${deploy.filename}"/>
- <property name="repo.task.src"
value="${build.bin.dir}/${deploy.filename}"/>
- <call target="repo-deploy"/>
+ <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}')}" />
</do>
</foreach>
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=705711&r1=705710&r2=705711&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Fri Oct 17 12:01:23
2008
@@ -20,22 +20,15 @@
<!--
============================================================================================
-->
<!-- I N I T I A L I Z A T I O N
-->
<!--
============================================================================================
-->
- <property name="basedir"
- value="${project::get-base-directory()}"/>
- <property name="project.name"
- value="Apache.NMS"/>
- <property name="project.group"
- value="org.apache.activemq"/>
- <property name="project.version"
- value="1.0" unless="${property::exists('project.version')}"/>
- <property name="project.short_description"
- value="Apache NMS Class Library"/>
- <property name="project.description"
- value="Apache NMS (.Net Messaging Library): An abstract interface
to Message Oriented Middleware (MOM) providers"/>
+ <property name="basedir" value="${project::get-base-directory()}"/>
+ <property name="project.name" value="Apache.NMS"/>
+ <property name="project.group" value="org.apache.activemq"/>
+ <property name="project.version" value="1.0.0"
unless="${property::exists('project.version')}"/>
+ <property name="project.short_description" value="Apache NMS Class Library"/>
+ <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.extensions.dll"
value="${basedir}/lib/${current.build.framework}/nunit.framework.extensions.dll"
dynamic="true" />
<target name="dependency-init" description="Initializes build dependencies">
@@ -51,14 +44,24 @@
<include name="System.Xml.dll" asis="true"/>
<include name="${build.bin.dir}/${project.name}.dll"/>
<include name="${nunit.dll}"/>
- <include name="${nunit.extensions.dll}"/>
</assemblyfileset>
<fileset id="content.filenames">
<include name="LICENSE.txt"/>
<include name="NOTICE.txt"/>
</fileset>
- </target>
+
+ <fileset id="deploy.filenames">
+ <include name="${build.bin.dir}/${project.name}.dll"/>
+ <include name="${build.bin.dir}/${project.name}.?db"/>
+ <include name="${build.bin.dir}/${project.name}.xml"/>
+ <include name="${build.bin.dir}/${project.name}.Test.dll"/>
+ <include name="${build.bin.dir}/${project.name}.Test.?db"/>
+ <include name="${build.bin.dir}/${project.name}.Test.xml"/>
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </fileset>
+</target>
<!-- Load the common target definitions -->
<include buildfile="${basedir}/nant-common.xml"/>
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/CommonAssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/CommonAssemblyInfo.cs?rev=705711&r1=705710&r2=705711&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/CommonAssemblyInfo.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/CommonAssemblyInfo.cs
Fri Oct 17 12:01:23 2008
@@ -23,6 +23,6 @@
[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2008 Apache Software
Foundation")]
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("1.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0")]
+[assembly: AssemblyVersionAttribute("1.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0")]
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/CommonAssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/CommonAssemblyInfo.cs?rev=705711&r1=705710&r2=705711&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/CommonAssemblyInfo.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/CommonAssemblyInfo.cs
Fri Oct 17 12:01:23 2008
@@ -23,6 +23,6 @@
[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2008 Apache Software
Foundation")]
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("1.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0")]
+[assembly: AssemblyVersionAttribute("1.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0")]
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs?rev=705711&r1=705710&r2=705711&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs
Fri Oct 17 12:01:23 2008
@@ -193,7 +193,6 @@
/// <summary>
/// Create a new connection to the broker.
/// </summary>
- /// <param name="newClientId">Client ID of the new
connection.</param>
/// <returns></returns>
public virtual IConnection CreateConnection()
{
