activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r832545 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/trunk/ Apache.NMS.EMS/trunk/ Apache.NMS.MSMQ/trunk/ Apache.NMS.Stomp/trunk/ Apache.NMS.WCF/trunk/ Apache.NMS/trunk/ vendor/NUnit/2.4.8/
Date Tue, 03 Nov 2009 20:38:55 GMT
Author: jgomes
Date: Tue Nov  3 20:38:53 2009
New Revision: 832545

URL: http://svn.apache.org/viewvc?rev=832545&view=rev
Log:
Fix vendor download routine to ensure build configurations match.

Modified:
    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/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
    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/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
    activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml

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=832545&r1=832544&r2=832545&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  3 20:38:53
2009
@@ -44,12 +44,7 @@
 	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" unless="${property::exists('build.framework.strings')}"/>
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
-	<if test="${build.skip.release}">
-		<property name="build.config.strings" value="debug" />
-	</if>
-	<if test="${not(build.skip.release)}">
-		<property name="build.config.strings" value="debug,release" />
-	</if>
+	<property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
 
 	<!-- Figure out the user's HOME directory -->
 	<property name="user.home" value="${environment::get-variable('HOME')}"
@@ -279,7 +274,7 @@
 		<call target="compile" />
 	</target>
 
-	<target name="compile" description="Compile everything">
+	<target name="compile" depends="download-vendor" description="Compile everything">
 		<call target="compile-main" cascade="false" />
 		<call target="compile-test" cascade="false" />
 	</target>
@@ -396,8 +391,8 @@
 
 	<target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
 		<echo message="Downloading vendor files for all runtime configurations." />
-		<property name="vendor.build.config" value="release" />
-		<foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
+		<property name="current.build.config" value="release" />
+		<foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
 			<call target="download-vendor" />
 		</foreach>
 	</target>
@@ -413,9 +408,8 @@
 			<property name="vendor.group" value="${property::get-value(current.vendor + '.group')}"
/>
 			<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="${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}" />
+			<property name="local.repo.vendor.path" value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${current.build.framework}/${current.build.config}"
/>
+			<property name="lib.path" value="lib/${vendor.name}/${current.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
@@ -424,12 +418,8 @@
 			<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="vendor.task.src" value="${vendor.path}/${repo.task.artifact}" />
 				<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(repo.task.src)}">
-					<copy file="${vendor.task.src}" tofile="${lib.task.dest}" if="${file::exists(vendor.task.src)}"
/>
-				</if>
 			</foreach>
 		</foreach>
 	</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=832545&r1=832544&r2=832545&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Tue Nov  3 20:38:53 2009
@@ -107,7 +107,7 @@
 
 	</target>
 
-	<target name="default" depends="download-vendor-all, install-all" />
+	<target name="default" depends="install-all" />
 
 	<!-- Load the common target definitions  -->
 	<include buildfile="${basedir}/nant-common.xml" />

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=832545&r1=832544&r2=832545&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  3 20:38:53 2009
@@ -44,12 +44,7 @@
 	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" unless="${property::exists('build.framework.strings')}"/>
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
-	<if test="${build.skip.release}">
-		<property name="build.config.strings" value="debug" />
-	</if>
-	<if test="${not(build.skip.release)}">
-		<property name="build.config.strings" value="debug,release" />
-	</if>
+	<property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
 
 	<!-- Figure out the user's HOME directory -->
 	<property name="user.home" value="${environment::get-variable('HOME')}"
@@ -279,7 +274,7 @@
 		<call target="compile" />
 	</target>
 
-	<target name="compile" description="Compile everything">
+	<target name="compile" depends="download-vendor" description="Compile everything">
 		<call target="compile-main" cascade="false" />
 		<call target="compile-test" cascade="false" />
 	</target>
@@ -396,8 +391,8 @@
 
 	<target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
 		<echo message="Downloading vendor files for all runtime configurations." />
-		<property name="vendor.build.config" value="release" />
-		<foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
+		<property name="current.build.config" value="release" />
+		<foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
 			<call target="download-vendor" />
 		</foreach>
 	</target>
@@ -413,9 +408,8 @@
 			<property name="vendor.group" value="${property::get-value(current.vendor + '.group')}"
/>
 			<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="${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}" />
+			<property name="local.repo.vendor.path" value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${current.build.framework}/${current.build.config}"
/>
+			<property name="lib.path" value="lib/${vendor.name}/${current.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
@@ -424,12 +418,8 @@
 			<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="vendor.task.src" value="${vendor.path}/${repo.task.artifact}" />
 				<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(repo.task.src)}">
-					<copy file="${vendor.task.src}" tofile="${lib.task.dest}" if="${file::exists(vendor.task.src)}"
/>
-				</if>
 			</foreach>
 		</foreach>
 	</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=832545&r1=832544&r2=832545&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build Tue Nov  3 20:38:53 2009
@@ -120,7 +120,7 @@
 
 	</target>
 
-	<target name="default" depends="download-vendor-all, install-all" />
+	<target name="default" depends="install-all" />
 
 	<!-- Load the common target definitions  -->
 	<include buildfile="${basedir}/nant-common.xml" />

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=832545&r1=832544&r2=832545&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  3 20:38:53 2009
@@ -44,12 +44,7 @@
 	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" unless="${property::exists('build.framework.strings')}"/>
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
-	<if test="${build.skip.release}">
-		<property name="build.config.strings" value="debug" />
-	</if>
-	<if test="${not(build.skip.release)}">
-		<property name="build.config.strings" value="debug,release" />
-	</if>
+	<property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
 
 	<!-- Figure out the user's HOME directory -->
 	<property name="user.home" value="${environment::get-variable('HOME')}"
@@ -279,7 +274,7 @@
 		<call target="compile" />
 	</target>
 
-	<target name="compile" description="Compile everything">
+	<target name="compile" depends="download-vendor" description="Compile everything">
 		<call target="compile-main" cascade="false" />
 		<call target="compile-test" cascade="false" />
 	</target>
@@ -396,8 +391,8 @@
 
 	<target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
 		<echo message="Downloading vendor files for all runtime configurations." />
-		<property name="vendor.build.config" value="release" />
-		<foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
+		<property name="current.build.config" value="release" />
+		<foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
 			<call target="download-vendor" />
 		</foreach>
 	</target>
@@ -413,9 +408,8 @@
 			<property name="vendor.group" value="${property::get-value(current.vendor + '.group')}"
/>
 			<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="${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}" />
+			<property name="local.repo.vendor.path" value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${current.build.framework}/${current.build.config}"
/>
+			<property name="lib.path" value="lib/${vendor.name}/${current.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
@@ -424,12 +418,8 @@
 			<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="vendor.task.src" value="${vendor.path}/${repo.task.artifact}" />
 				<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(repo.task.src)}">
-					<copy file="${vendor.task.src}" tofile="${lib.task.dest}" if="${file::exists(vendor.task.src)}"
/>
-				</if>
 			</foreach>
 		</foreach>
 	</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=832545&r1=832544&r2=832545&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build Tue Nov  3 20:38:53 2009
@@ -109,7 +109,7 @@
 
 	</target>
 
-	<target name="default" depends="download-vendor-all, install-all" />
+	<target name="default" depends="install-all" />
 
 	<!-- Load the common target definitions  -->
 	<include buildfile="${basedir}/nant-common.xml" />

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=832545&r1=832544&r2=832545&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  3 20:38:53 2009
@@ -44,12 +44,7 @@
 	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" unless="${property::exists('build.framework.strings')}"/>
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
-	<if test="${build.skip.release}">
-		<property name="build.config.strings" value="debug" />
-	</if>
-	<if test="${not(build.skip.release)}">
-		<property name="build.config.strings" value="debug,release" />
-	</if>
+	<property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
 
 	<!-- Figure out the user's HOME directory -->
 	<property name="user.home" value="${environment::get-variable('HOME')}"
@@ -279,7 +274,7 @@
 		<call target="compile" />
 	</target>
 
-	<target name="compile" description="Compile everything">
+	<target name="compile" depends="download-vendor" description="Compile everything">
 		<call target="compile-main" cascade="false" />
 		<call target="compile-test" cascade="false" />
 	</target>
@@ -396,8 +391,8 @@
 
 	<target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
 		<echo message="Downloading vendor files for all runtime configurations." />
-		<property name="vendor.build.config" value="release" />
-		<foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
+		<property name="current.build.config" value="release" />
+		<foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
 			<call target="download-vendor" />
 		</foreach>
 	</target>
@@ -413,9 +408,8 @@
 			<property name="vendor.group" value="${property::get-value(current.vendor + '.group')}"
/>
 			<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="${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}" />
+			<property name="local.repo.vendor.path" value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${current.build.framework}/${current.build.config}"
/>
+			<property name="lib.path" value="lib/${vendor.name}/${current.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
@@ -424,12 +418,8 @@
 			<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="vendor.task.src" value="${vendor.path}/${repo.task.artifact}" />
 				<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(repo.task.src)}">
-					<copy file="${vendor.task.src}" tofile="${lib.task.dest}" if="${file::exists(vendor.task.src)}"
/>
-				</if>
 			</foreach>
 		</foreach>
 	</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=832545&r1=832544&r2=832545&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build Tue Nov  3 20:38:53 2009
@@ -104,7 +104,7 @@
 
 	</target>
 
-	<target name="default" depends="download-vendor-all, install-all" />
+	<target name="default" depends="install-all" />
 
 	<!-- Load the common target definitions  -->
 	<include buildfile="${basedir}/nant-common.xml" />

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=832545&r1=832544&r2=832545&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  3 20:38:53 2009
@@ -44,12 +44,7 @@
 	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" unless="${property::exists('build.framework.strings')}"/>
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
-	<if test="${build.skip.release}">
-		<property name="build.config.strings" value="debug" />
-	</if>
-	<if test="${not(build.skip.release)}">
-		<property name="build.config.strings" value="debug,release" />
-	</if>
+	<property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
 
 	<!-- Figure out the user's HOME directory -->
 	<property name="user.home" value="${environment::get-variable('HOME')}"
@@ -279,7 +274,7 @@
 		<call target="compile" />
 	</target>
 
-	<target name="compile" description="Compile everything">
+	<target name="compile" depends="download-vendor" description="Compile everything">
 		<call target="compile-main" cascade="false" />
 		<call target="compile-test" cascade="false" />
 	</target>
@@ -396,8 +391,8 @@
 
 	<target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
 		<echo message="Downloading vendor files for all runtime configurations." />
-		<property name="vendor.build.config" value="release" />
-		<foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
+		<property name="current.build.config" value="release" />
+		<foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
 			<call target="download-vendor" />
 		</foreach>
 	</target>
@@ -413,9 +408,8 @@
 			<property name="vendor.group" value="${property::get-value(current.vendor + '.group')}"
/>
 			<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="${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}" />
+			<property name="local.repo.vendor.path" value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${current.build.framework}/${current.build.config}"
/>
+			<property name="lib.path" value="lib/${vendor.name}/${current.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
@@ -424,12 +418,8 @@
 			<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="vendor.task.src" value="${vendor.path}/${repo.task.artifact}" />
 				<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(repo.task.src)}">
-					<copy file="${vendor.task.src}" tofile="${lib.task.dest}" if="${file::exists(vendor.task.src)}"
/>
-				</if>
 			</foreach>
 		</foreach>
 	</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=832545&r1=832544&r2=832545&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build Tue Nov  3 20:38:53 2009
@@ -114,7 +114,7 @@
 
 	</target>
 
-	<target name="default" depends="download-vendor-all, install-all" />
+	<target name="default" depends="install-all" />
 
 	<!-- Load the common target definitions  -->
 	<include buildfile="${basedir}/nant-common.xml"/>

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=832545&r1=832544&r2=832545&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Tue Nov  3 20:38:53 2009
@@ -44,12 +44,7 @@
 	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" unless="${property::exists('build.framework.strings')}"/>
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
-	<if test="${build.skip.release}">
-		<property name="build.config.strings" value="debug" />
-	</if>
-	<if test="${not(build.skip.release)}">
-		<property name="build.config.strings" value="debug,release" />
-	</if>
+	<property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
 
 	<!-- Figure out the user's HOME directory -->
 	<property name="user.home" value="${environment::get-variable('HOME')}"
@@ -279,7 +274,7 @@
 		<call target="compile" />
 	</target>
 
-	<target name="compile" description="Compile everything">
+	<target name="compile" depends="download-vendor" description="Compile everything">
 		<call target="compile-main" cascade="false" />
 		<call target="compile-test" cascade="false" />
 	</target>
@@ -396,8 +391,8 @@
 
 	<target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
 		<echo message="Downloading vendor files for all runtime configurations." />
-		<property name="vendor.build.config" value="release" />
-		<foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
+		<property name="current.build.config" value="release" />
+		<foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
 			<call target="download-vendor" />
 		</foreach>
 	</target>
@@ -413,9 +408,8 @@
 			<property name="vendor.group" value="${property::get-value(current.vendor + '.group')}"
/>
 			<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="${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}" />
+			<property name="local.repo.vendor.path" value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${current.build.framework}/${current.build.config}"
/>
+			<property name="lib.path" value="lib/${vendor.name}/${current.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
@@ -424,12 +418,8 @@
 			<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="vendor.task.src" value="${vendor.path}/${repo.task.artifact}" />
 				<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(repo.task.src)}">
-					<copy file="${vendor.task.src}" tofile="${lib.task.dest}" if="${file::exists(vendor.task.src)}"
/>
-				</if>
 			</foreach>
 		</foreach>
 	</target>

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=832545&r1=832544&r2=832545&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Tue Nov  3 20:38:53 2009
@@ -80,7 +80,7 @@
 		</fileset>
 	</target>
 
-	<target name="default" depends="download-vendor-all, install-all" />
+	<target name="default" depends="install-all" />
 
 	<!-- Load the common target definitions  -->
 	<include buildfile="${basedir}/nant-common.xml" />

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=832545&r1=832544&r2=832545&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  3 20:38:53 2009
@@ -44,12 +44,7 @@
 	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" unless="${property::exists('build.framework.strings')}"/>
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
-	<if test="${build.skip.release}">
-		<property name="build.config.strings" value="debug" />
-	</if>
-	<if test="${not(build.skip.release)}">
-		<property name="build.config.strings" value="debug,release" />
-	</if>
+	<property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
 
 	<!-- Figure out the user's HOME directory -->
 	<property name="user.home" value="${environment::get-variable('HOME')}"
@@ -279,7 +274,7 @@
 		<call target="compile" />
 	</target>
 
-	<target name="compile" description="Compile everything">
+	<target name="compile" depends="download-vendor" description="Compile everything">
 		<call target="compile-main" cascade="false" />
 		<call target="compile-test" cascade="false" />
 	</target>
@@ -396,8 +391,8 @@
 
 	<target name="download-vendor-all" description="Download vendor files for all runtime
configurations">
 		<echo message="Downloading vendor files for all runtime configurations." />
-		<property name="vendor.build.config" value="release" />
-		<foreach item="String" in="${build.framework.strings}" delim="," property="vendor.build.framework">
+		<property name="current.build.config" value="release" />
+		<foreach item="String" in="${build.framework.strings}" delim="," property="current.build.framework">
 			<call target="download-vendor" />
 		</foreach>
 	</target>
@@ -413,9 +408,8 @@
 			<property name="vendor.group" value="${property::get-value(current.vendor + '.group')}"
/>
 			<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="${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}" />
+			<property name="local.repo.vendor.path" value="${nant.local.repo}/${vendor.group}/${vendor.name}/${vendor.version}/${current.build.framework}/${current.build.config}"
/>
+			<property name="lib.path" value="lib/${vendor.name}/${current.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
@@ -424,12 +418,8 @@
 			<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="vendor.task.src" value="${vendor.path}/${repo.task.artifact}" />
 				<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(repo.task.src)}">
-					<copy file="${vendor.task.src}" tofile="${lib.task.dest}" if="${file::exists(vendor.task.src)}"
/>
-				</if>
 			</foreach>
 		</foreach>
 	</target>



Mime
View raw message