activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r834645 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/tags/1.1.0/ Apache.NMS.ActiveMQ/trunk/ Apache.NMS.EMS/tags/1.1.0/ Apache.NMS.EMS/trunk/ Apache.NMS.MSMQ/tags/1.1.0/ Apache.NMS.MSMQ/trunk/ Apache.NMS.Stomp/trunk/ Apache.NMS.WCF/ta...
Date Tue, 10 Nov 2009 20:12:44 GMT
Author: jgomes
Date: Tue Nov 10 20:12:43 2009
New Revision: 834645

URL: http://svn.apache.org/viewvc?rev=834645&view=rev
Log:
Update project file dependencies.

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.1.0/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.1.0/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.WCF/tags/1.1.0/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS/tags/1.1.0/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
    activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0/nant-common.xml Tue Nov 10 20:12:43
2009
@@ -471,7 +471,6 @@
     </if>
     <delete dir="build" if="${directory::exists('build')}" />
     <delete dir="obj" if="${directory::exists('obj')}" />
-    <delete dir="lib" if="${directory::exists('lib')}" />
     <delete dir="package" if="${directory::exists('package')}" />
   </target>
 

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=834645&r1=834644&r2=834645&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 10 20:12:43
2009
@@ -414,16 +414,15 @@
 			Update the LIB folder with the latest version of the file.  If there is a newer version
 			installed in the local repository, then that version will be copied into the LIB folder.
 			-->
-			<if test="${not directory::exists(local.repo.vendor.path)}">
-				<echo message="Required dependent assemblies from ${vendor.name} for ${current.build.framework.name}
are not available. Build skipped." />
-				<property name="build.skip" value="true" />
-			</if>
-
 			<foreach item="String" in="${vendor.filenames}" delim="," property="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="repo.task.src" value="${local.repo.vendor.path}/${repo.task.artifact}"
/>
 				<copy file="${repo.task.src}" tofile="${lib.task.dest}" if="${file::exists(repo.task.src)}"
/>
+				<if test="${not file::exists(lib.task.dest)}">
+					<echo message="Required dependent assembly ${repo.task.artifact} from ${vendor.name}
for ${current.build.framework.name} is not available. Build skipped." />
+					<property name="build.skip" value="true" />
+				</if>
 			</foreach>
 		</foreach>
 	</target>
@@ -473,7 +472,6 @@
 		</if>
 		<delete dir="build" if="${directory::exists('build')}" />
 		<delete dir="obj" if="${directory::exists('obj')}" />
-		<delete dir="lib" if="${directory::exists('lib')}" />
 		<delete dir="package" if="${directory::exists('package')}" />
 	</target>
 

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=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Tue Nov 10 20:12:43 2009
@@ -51,7 +51,12 @@
 		<property name="vendor.apache.org.name" value="Apache.NMS" />
 		<property name="vendor.apache.org.group" value="org.apache.activemq" />
 		<property name="vendor.apache.org.version" value="1.2.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"
/>
+		<if test="${current.build.framework == 'mono-2.0'}">
+			<property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.dll.mdb"
/>
+		</if>
+		<if test="${not (current.build.framework == 'mono-2.0')}">
+			<property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb"
/>
+		</if>
 
 		<!-- Property grouping for 'vendor.nunit.org' -->
 		<property name="vendor.nunit.org.name" value="NUnit" />

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.1.0/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.1.0/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.1.0/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.1.0/nant-common.xml Tue Nov 10 20:12:43
2009
@@ -471,7 +471,6 @@
     </if>
     <delete dir="build" if="${directory::exists('build')}" />
     <delete dir="obj" if="${directory::exists('obj')}" />
-    <delete dir="lib" if="${directory::exists('lib')}" />
     <delete dir="package" if="${directory::exists('package')}" />
   </target>
 

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Tue Nov 10 20:12:43 2009
@@ -414,16 +414,15 @@
 			Update the LIB folder with the latest version of the file.  If there is a newer version
 			installed in the local repository, then that version will be copied into the LIB folder.
 			-->
-			<if test="${not directory::exists(local.repo.vendor.path)}">
-				<echo message="Required dependent assemblies from ${vendor.name} for ${current.build.framework.name}
are not available. Build skipped." />
-				<property name="build.skip" value="true" />
-			</if>
-
 			<foreach item="String" in="${vendor.filenames}" delim="," property="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="repo.task.src" value="${local.repo.vendor.path}/${repo.task.artifact}"
/>
 				<copy file="${repo.task.src}" tofile="${lib.task.dest}" if="${file::exists(repo.task.src)}"
/>
+				<if test="${not file::exists(lib.task.dest)}">
+					<echo message="Required dependent assembly ${repo.task.artifact} from ${vendor.name}
for ${current.build.framework.name} is not available. Build skipped." />
+					<property name="build.skip" value="true" />
+				</if>
 			</foreach>
 		</foreach>
 	</target>
@@ -473,7 +472,6 @@
 		</if>
 		<delete dir="build" if="${directory::exists('build')}" />
 		<delete dir="obj" if="${directory::exists('obj')}" />
-		<delete dir="lib" if="${directory::exists('lib')}" />
 		<delete dir="package" if="${directory::exists('package')}" />
 	</target>
 

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=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build Tue Nov 10 20:12:43 2009
@@ -56,7 +56,7 @@
 		<property name="vendor.apache.org.name" value="Apache.NMS" />
 		<property name="vendor.apache.org.group" value="org.apache.activemq" />
 		<property name="vendor.apache.org.version" value="1.2.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 name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb"
/>
 
 		<!-- Property grouping for 'vendor.nunit.org' -->
 		<property name="vendor.nunit.org.name" value="NUnit" />

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.1.0/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.1.0/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.1.0/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.1.0/nant-common.xml Tue Nov 10 20:12:43
2009
@@ -471,7 +471,6 @@
     </if>
     <delete dir="build" if="${directory::exists('build')}" />
     <delete dir="obj" if="${directory::exists('obj')}" />
-    <delete dir="lib" if="${directory::exists('lib')}" />
     <delete dir="package" if="${directory::exists('package')}" />
   </target>
 

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml Tue Nov 10 20:12:43 2009
@@ -414,16 +414,15 @@
 			Update the LIB folder with the latest version of the file.  If there is a newer version
 			installed in the local repository, then that version will be copied into the LIB folder.
 			-->
-			<if test="${not directory::exists(local.repo.vendor.path)}">
-				<echo message="Required dependent assemblies from ${vendor.name} for ${current.build.framework.name}
are not available. Build skipped." />
-				<property name="build.skip" value="true" />
-			</if>
-
 			<foreach item="String" in="${vendor.filenames}" delim="," property="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="repo.task.src" value="${local.repo.vendor.path}/${repo.task.artifact}"
/>
 				<copy file="${repo.task.src}" tofile="${lib.task.dest}" if="${file::exists(repo.task.src)}"
/>
+				<if test="${not file::exists(lib.task.dest)}">
+					<echo message="Required dependent assembly ${repo.task.artifact} from ${vendor.name}
for ${current.build.framework.name} is not available. Build skipped." />
+					<property name="build.skip" value="true" />
+				</if>
 			</foreach>
 		</foreach>
 	</target>
@@ -473,7 +472,6 @@
 		</if>
 		<delete dir="build" if="${directory::exists('build')}" />
 		<delete dir="obj" if="${directory::exists('obj')}" />
-		<delete dir="lib" if="${directory::exists('lib')}" />
 		<delete dir="package" if="${directory::exists('package')}" />
 	</target>
 

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=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build Tue Nov 10 20:12:43 2009
@@ -52,7 +52,7 @@
 		<property name="vendor.apache.org.name" value="Apache.NMS" />
 		<property name="vendor.apache.org.group" value="org.apache.activemq" />
 		<property name="vendor.apache.org.version" value="1.2.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 name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb"
/>
 
 		<!-- Property grouping for 'vendor.nunit.org' -->
 		<property name="vendor.nunit.org.name" value="NUnit" />

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml Tue Nov 10 20:12:43 2009
@@ -414,16 +414,15 @@
 			Update the LIB folder with the latest version of the file.  If there is a newer version
 			installed in the local repository, then that version will be copied into the LIB folder.
 			-->
-			<if test="${not directory::exists(local.repo.vendor.path)}">
-				<echo message="Required dependent assemblies from ${vendor.name} for ${current.build.framework.name}
are not available. Build skipped." />
-				<property name="build.skip" value="true" />
-			</if>
-
 			<foreach item="String" in="${vendor.filenames}" delim="," property="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="repo.task.src" value="${local.repo.vendor.path}/${repo.task.artifact}"
/>
 				<copy file="${repo.task.src}" tofile="${lib.task.dest}" if="${file::exists(repo.task.src)}"
/>
+				<if test="${not file::exists(lib.task.dest)}">
+					<echo message="Required dependent assembly ${repo.task.artifact} from ${vendor.name}
for ${current.build.framework.name} is not available. Build skipped." />
+					<property name="build.skip" value="true" />
+				</if>
 			</foreach>
 		</foreach>
 	</target>
@@ -473,7 +472,6 @@
 		</if>
 		<delete dir="build" if="${directory::exists('build')}" />
 		<delete dir="obj" if="${directory::exists('obj')}" />
-		<delete dir="lib" if="${directory::exists('lib')}" />
 		<delete dir="package" if="${directory::exists('package')}" />
 	</target>
 

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build Tue Nov 10 20:12:43 2009
@@ -48,7 +48,12 @@
 		<property name="vendor.apache.org.name" value="Apache.NMS" />
 		<property name="vendor.apache.org.group" value="org.apache.activemq" />
 		<property name="vendor.apache.org.version" value="1.2.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"
/>
+		<if test="${current.build.framework == 'mono-2.0'}">
+			<property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.dll.mdb"
/>
+		</if>
+		<if test="${not (current.build.framework == 'mono-2.0')}">
+			<property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb"
/>
+		</if>
 
 		<!-- Property grouping for 'vendor.nunit.org' -->
 		<property name="vendor.nunit.org.name" value="NUnit" />

Modified: activemq/activemq-dotnet/Apache.NMS.WCF/tags/1.1.0/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/tags/1.1.0/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/tags/1.1.0/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/tags/1.1.0/nant-common.xml Tue Nov 10 20:12:43
2009
@@ -471,7 +471,6 @@
     </if>
     <delete dir="build" if="${directory::exists('build')}" />
     <delete dir="obj" if="${directory::exists('obj')}" />
-    <delete dir="lib" if="${directory::exists('lib')}" />
     <delete dir="package" if="${directory::exists('package')}" />
   </target>
 

Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml Tue Nov 10 20:12:43 2009
@@ -414,16 +414,15 @@
 			Update the LIB folder with the latest version of the file.  If there is a newer version
 			installed in the local repository, then that version will be copied into the LIB folder.
 			-->
-			<if test="${not directory::exists(local.repo.vendor.path)}">
-				<echo message="Required dependent assemblies from ${vendor.name} for ${current.build.framework.name}
are not available. Build skipped." />
-				<property name="build.skip" value="true" />
-			</if>
-
 			<foreach item="String" in="${vendor.filenames}" delim="," property="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="repo.task.src" value="${local.repo.vendor.path}/${repo.task.artifact}"
/>
 				<copy file="${repo.task.src}" tofile="${lib.task.dest}" if="${file::exists(repo.task.src)}"
/>
+				<if test="${not file::exists(lib.task.dest)}">
+					<echo message="Required dependent assembly ${repo.task.artifact} from ${vendor.name}
for ${current.build.framework.name} is not available. Build skipped." />
+					<property name="build.skip" value="true" />
+				</if>
 			</foreach>
 		</foreach>
 	</target>
@@ -473,7 +472,6 @@
 		</if>
 		<delete dir="build" if="${directory::exists('build')}" />
 		<delete dir="obj" if="${directory::exists('obj')}" />
-		<delete dir="lib" if="${directory::exists('lib')}" />
 		<delete dir="package" if="${directory::exists('package')}" />
 	</target>
 

Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build Tue Nov 10 20:12:43 2009
@@ -51,8 +51,7 @@
 		<property name="vendor.apache.org.name" value="Apache.NMS"/>
 		<property name="vendor.apache.org.group" value="org.apache.activemq"/>
 		<property name="vendor.apache.org.version" value="1.2.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 name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb"
/>
 
 		<!-- Property grouping for 'vendor.nunit.org' -->
 		<property name="vendor.nunit.org.name" value="NUnit"/>

Modified: activemq/activemq-dotnet/Apache.NMS/tags/1.1.0/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/tags/1.1.0/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/tags/1.1.0/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/tags/1.1.0/nant-common.xml Tue Nov 10 20:12:43 2009
@@ -471,7 +471,6 @@
     </if>
     <delete dir="build" if="${directory::exists('build')}" />
     <delete dir="obj" if="${directory::exists('obj')}" />
-    <delete dir="lib" if="${directory::exists('lib')}" />
     <delete dir="package" if="${directory::exists('package')}" />
   </target>
 

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=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Tue Nov 10 20:12:43 2009
@@ -414,16 +414,15 @@
 			Update the LIB folder with the latest version of the file.  If there is a newer version
 			installed in the local repository, then that version will be copied into the LIB folder.
 			-->
-			<if test="${not directory::exists(local.repo.vendor.path)}">
-				<echo message="Required dependent assemblies from ${vendor.name} for ${current.build.framework.name}
are not available. Build skipped." />
-				<property name="build.skip" value="true" />
-			</if>
-
 			<foreach item="String" in="${vendor.filenames}" delim="," property="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="repo.task.src" value="${local.repo.vendor.path}/${repo.task.artifact}"
/>
 				<copy file="${repo.task.src}" tofile="${lib.task.dest}" if="${file::exists(repo.task.src)}"
/>
+				<if test="${not file::exists(lib.task.dest)}">
+					<echo message="Required dependent assembly ${repo.task.artifact} from ${vendor.name}
for ${current.build.framework.name} is not available. Build skipped." />
+					<property name="build.skip" value="true" />
+				</if>
 			</foreach>
 		</foreach>
 	</target>
@@ -473,7 +472,6 @@
 		</if>
 		<delete dir="build" if="${directory::exists('build')}" />
 		<delete dir="obj" if="${directory::exists('obj')}" />
-		<delete dir="lib" if="${directory::exists('lib')}" />
 		<delete dir="package" if="${directory::exists('package')}" />
 	</target>
 

Modified: activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml?rev=834645&r1=834644&r2=834645&view=diff
==============================================================================
--- activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml (original)
+++ activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml Tue Nov 10 20:12:43 2009
@@ -414,16 +414,15 @@
 			Update the LIB folder with the latest version of the file.  If there is a newer version
 			installed in the local repository, then that version will be copied into the LIB folder.
 			-->
-			<if test="${not directory::exists(local.repo.vendor.path)}">
-				<echo message="Required dependent assemblies from ${vendor.name} for ${current.build.framework.name}
are not available. Build skipped." />
-				<property name="build.skip" value="true" />
-			</if>
-
 			<foreach item="String" in="${vendor.filenames}" delim="," property="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="repo.task.src" value="${local.repo.vendor.path}/${repo.task.artifact}"
/>
 				<copy file="${repo.task.src}" tofile="${lib.task.dest}" if="${file::exists(repo.task.src)}"
/>
+				<if test="${not file::exists(lib.task.dest)}">
+					<echo message="Required dependent assembly ${repo.task.artifact} from ${vendor.name}
for ${current.build.framework.name} is not available. Build skipped." />
+					<property name="build.skip" value="true" />
+				</if>
 			</foreach>
 		</foreach>
 	</target>
@@ -473,7 +472,6 @@
 		</if>
 		<delete dir="build" if="${directory::exists('build')}" />
 		<delete dir="obj" if="${directory::exists('obj')}" />
-		<delete dir="lib" if="${directory::exists('lib')}" />
 		<delete dir="package" if="${directory::exists('package')}" />
 	</target>
 



Mime
View raw message