activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r707506 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/tags/1.0.0/ Apache.NMS.ActiveMQ/trunk/ Apache.NMS.ActiveMQ/trunk/src/main/csharp/ Apache.NMS.ActiveMQ/trunk/src/test/csharp/ Apache.NMS.EMS/tags/1.0.0/ Apache.NMS.EMS/trunk/ Apache...
Date Thu, 23 Oct 2008 23:37:59 GMT
Author: jgomes
Date: Thu Oct 23 16:37:58 2008
New Revision: 707506

URL: http://svn.apache.org/viewvc?rev=707506&view=rev
Log:
Added checks to nant.build to skip a build if the Apache.NMS assembly for the current build
framework is not available.  Fixed references to NUnit assemblies.

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build?rev=707506&r1=707505&r2=707506&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build Thu Oct 23 16:37:58
2008
@@ -29,12 +29,18 @@
 
   <!-- 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"/>
 
   <target name="dependency-init" description="Initializes build dependencies">
+    <if test="${not file::exists(Apache.NMS.dll)}">
+	 <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available.
Build skipped." />
+	 <property name="build.skip" value="true"/>
+    </if>
+
     <assemblyfileset failonempty="true" id="dependencies">
       <include name="mscorlib.dll" asis="true"/>
       <include name="System.dll" asis="true"/>
@@ -50,6 +56,7 @@
       <include name="${Apache.NMS.Test.dll}"/>
       <include name="${build.bin.dir}/${project.name}.dll"/>
       <include name="${nunit.dll}"/>
+      <include name="${nunit.extensions.dll}"/>
     </assemblyfileset>
 
     <fileset id="content.filenames">
@@ -61,6 +68,7 @@
       <include name="${Apache.NMS.Test.dll}"/>
       <include name="${Apache.NMS.Test.pdb}"/>
       <include name="${nunit.dll}"/>
+      <include name="${nunit.extensions.dll}"/>
     </fileset>
 
     <fileset id="install.filenames">

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=707506&r1=707505&r2=707506&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Thu Oct 23 16:37:58 2008
@@ -29,12 +29,18 @@
 
   <!-- 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"/>
 
   <target name="dependency-init" description="Initializes build dependencies">
+    <if test="${not file::exists(Apache.NMS.dll)}">
+	 <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available.
Build skipped." />
+	 <property name="build.skip" value="true"/>
+    </if>
+
     <assemblyfileset failonempty="true" id="dependencies">
       <include name="mscorlib.dll" asis="true"/>
       <include name="System.dll" asis="true"/>
@@ -50,6 +56,7 @@
       <include name="${Apache.NMS.Test.dll}"/>
       <include name="${build.bin.dir}/${project.name}.dll"/>
       <include name="${nunit.dll}"/>
+      <include name="${nunit.extensions.dll}"/>
     </assemblyfileset>
 
     <fileset id="content.filenames">
@@ -61,6 +68,7 @@
       <include name="${Apache.NMS.Test.dll}"/>
       <include name="${Apache.NMS.Test.pdb}"/>
       <include name="${nunit.dll}"/>
+      <include name="${nunit.extensions.dll}"/>
     </fileset>
 
     <fileset id="install.filenames">

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs?rev=707506&r1=707505&r2=707506&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs
Thu Oct 23 16:37:58 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.1.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.0")]
 

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs?rev=707506&r1=707505&r2=707506&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs
Thu Oct 23 16:37:58 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.1.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.0")]
 

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build?rev=707506&r1=707505&r2=707506&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build Thu Oct 23 16:37:58 2008
@@ -45,6 +45,11 @@
   <property name="build.mono-2.0.skip" value="true"/>
 
   <target name="dependency-init" description="Initializes build dependencies">
+    <if test="${not file::exists(Apache.NMS.dll)}">
+	 <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available.
Build skipped." />
+	 <property name="build.skip" value="true"/>
+    </if>
+
   	<assemblyfileset failonempty="true" id="dependencies">
       <include name="mscorlib.dll" asis="true"/>
       <include name="System.dll" asis="true"/>
@@ -72,17 +77,14 @@
       <include name="${lib.dir}/TIBCO.EMS.dll"/>
       <include name="${Apache.NMS.dll}"/>
       <include name="${Apache.NMS.pdb}"/>
-      <include name="${Apache.NMS.xml}"/>
       <include name="${Apache.NMS.Test.dll}"/>
       <include name="${Apache.NMS.Test.pdb}"/>
-      <include name="${Apache.NMS.Test.xml}"/>
+      <include name="${nunit.dll}"/>
+      <include name="${nunit.extensions.dll}"/>
     </fileset>
 
     <fileset id="install.filenames">
       <include name="${project.name}.dll"/>
-      <include name="${project.name}.xml"/>
-      <include name="${project.name}.Test.dll"/>
-      <include name="${project.name}.Test.xml"/>
       <include name="nmsprovider-*.config"/>
     </fileset>
 

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build?rev=707506&r1=707505&r2=707506&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build Thu Oct 23 16:37:58 2008
@@ -23,7 +23,7 @@
   <property name="basedir" value="${project::get-base-directory()}"/>
   <property name="project.name" value="Apache.NMS.EMS"/>
   <property name="project.group" value="org.apache.activemq"/>
-  <property name="project.version" value="1.0.0" unless="${property::exists('project.version')}"/>
+  <property name="project.version" value="1.1.0" unless="${property::exists('project.version')}"/>
   <property name="project.short_description" value="Apache NMS for EMS Class Library"/>
   <property name="project.description" value="Apache NMS for EMS Class Library (.Net Messaging
Library Implementation): An implementation of the NMS API for EMS"/>
   <!-- The EMS module is not CLS compliant yet -->
@@ -45,6 +45,11 @@
   <property name="build.mono-2.0.skip" value="true"/>
 
   <target name="dependency-init" description="Initializes build dependencies">
+    <if test="${not file::exists(Apache.NMS.dll)}">
+	 <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available.
Build skipped." />
+	 <property name="build.skip" value="true"/>
+    </if>
+
   	<assemblyfileset failonempty="true" id="dependencies">
       <include name="mscorlib.dll" asis="true"/>
       <include name="System.dll" asis="true"/>
@@ -72,17 +77,14 @@
       <include name="${lib.dir}/TIBCO.EMS.dll"/>
       <include name="${Apache.NMS.dll}"/>
       <include name="${Apache.NMS.pdb}"/>
-      <include name="${Apache.NMS.xml}"/>
       <include name="${Apache.NMS.Test.dll}"/>
       <include name="${Apache.NMS.Test.pdb}"/>
-      <include name="${Apache.NMS.Test.xml}"/>
+      <include name="${nunit.dll}"/>
+      <include name="${nunit.extensions.dll}"/>
     </fileset>
 
     <fileset id="install.filenames">
       <include name="${project.name}.dll"/>
-      <include name="${project.name}.xml"/>
-      <include name="${project.name}.Test.dll"/>
-      <include name="${project.name}.Test.xml"/>
       <include name="nmsprovider-*.config"/>
     </fileset>
 

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build?rev=707506&r1=707505&r2=707506&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build Thu Oct 23 16:37:58 2008
@@ -41,6 +41,11 @@
   <property name="build.mono-2.0.skip" value="true"/>
 
   <target name="dependency-init" description="Initializes build dependencies">
+    <if test="${not file::exists(Apache.NMS.dll)}">
+	 <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available.
Build skipped." />
+	 <property name="build.skip" value="true"/>
+    </if>
+
   	<assemblyfileset failonempty="true" id="dependencies">
       <include name="mscorlib.dll" asis="true"/>
       <include name="System.dll" asis="true"/>
@@ -66,17 +71,12 @@
       <include name="nmsprovider-*.config"/>
       <include name="${Apache.NMS.dll}"/>
       <include name="${Apache.NMS.pdb}"/>
-      <include name="${Apache.NMS.xml}"/>
       <include name="${Apache.NMS.Test.dll}"/>
       <include name="${Apache.NMS.Test.pdb}"/>
-      <include name="${Apache.NMS.Test.xml}"/>
     </fileset>
 
     <fileset id="install.filenames">
       <include name="${project.name}.dll"/>
-      <include name="${project.name}.xml"/>
-      <include name="${project.name}.Test.dll"/>
-      <include name="${project.name}.Test.xml"/>
       <include name="nmsprovider-*.config"/>
     </fileset>
 

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build?rev=707506&r1=707505&r2=707506&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build Thu Oct 23 16:37:58 2008
@@ -41,6 +41,11 @@
   <property name="build.mono-2.0.skip" value="true"/>
 
   <target name="dependency-init" description="Initializes build dependencies">
+    <if test="${not file::exists(Apache.NMS.dll)}">
+	 <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available.
Build skipped." />
+	 <property name="build.skip" value="true"/>
+    </if>
+
   	<assemblyfileset failonempty="true" id="dependencies">
       <include name="mscorlib.dll" asis="true"/>
       <include name="System.dll" asis="true"/>
@@ -66,17 +71,12 @@
       <include name="nmsprovider-*.config"/>
       <include name="${Apache.NMS.dll}"/>
       <include name="${Apache.NMS.pdb}"/>
-      <include name="${Apache.NMS.xml}"/>
       <include name="${Apache.NMS.Test.dll}"/>
       <include name="${Apache.NMS.Test.pdb}"/>
-      <include name="${Apache.NMS.Test.xml}"/>
     </fileset>
 
     <fileset id="install.filenames">
       <include name="${project.name}.dll"/>
-      <include name="${project.name}.xml"/>
-      <include name="${project.name}.Test.dll"/>
-      <include name="${project.name}.Test.xml"/>
       <include name="nmsprovider-*.config"/>
     </fileset>
 



Mime
View raw message