Author: jgomes
Date: Thu Oct 30 17:34:32 2008
New Revision: 709310
URL: http://svn.apache.org/viewvc?rev=709310&view=rev
Log:
Fix default target to avoid duplication of compilation targets.
Fixes [AMQNET-121]. (See https://issues.apache.org/activemq/browse/AMQNET-121)
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/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
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=709310&r1=709309&r2=709310&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Thu Oct
30 17:34:32 2008
@@ -359,20 +359,13 @@
<do>
<property name="repo.task.artifact"
value="${path}/${path::get-file-name(install.filename)}"/>
<property name="repo.task.src" value="${install.filename}"/>
- <call target="repo-install"/>
+ <property name="repo.task.dest"
value="${nant.local.repo}/${repo.task.artifact}"/>
+ <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
+ <copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
</do>
</foreach>
</target>
- <target name="repo-install" description="Install a dependency to the local
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.local.repo}/${repo.task.artifact}"/>
- <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
- <copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
- </target>
-
<!--
============================================================================================
-->
<!-- R E P O D O W N L O A D T A R G E T S
-->
<!--
============================================================================================
-->
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=709310&r1=709309&r2=709310&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Thu Oct 30
17:34:32 2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache.NMS.ActiveMQ" default="compile-all"
xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd";>
+<project name="Apache.NMS.ActiveMQ" default="default"
xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd";>
<!--
============================================================================================
-->
<!-- I N I T I A L I Z A T I O N
-->
@@ -112,6 +112,8 @@
</fileset>
</target>
+ <target name="default" depends="download-vendor-all, 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=709310&r1=709309&r2=709310&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Thu Oct 30
17:34:32 2008
@@ -359,20 +359,13 @@
<do>
<property name="repo.task.artifact"
value="${path}/${path::get-file-name(install.filename)}"/>
<property name="repo.task.src" value="${install.filename}"/>
- <call target="repo-install"/>
+ <property name="repo.task.dest"
value="${nant.local.repo}/${repo.task.artifact}"/>
+ <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
+ <copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
</do>
</foreach>
</target>
- <target name="repo-install" description="Install a dependency to the local
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.local.repo}/${repo.task.artifact}"/>
- <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
- <copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
- </target>
-
<!--
============================================================================================
-->
<!-- R E P O D O W N L O A D T A R G E T S
-->
<!--
============================================================================================
-->
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=709310&r1=709309&r2=709310&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build Thu Oct 30
17:34:32 2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache.NMS.EMS" default="compile-all"
xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd";>
+<project name="Apache.NMS.EMS" default="default"
xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd";>
<!--
============================================================================================
-->
<!-- I N I T I A L I Z A T I O N
-->
@@ -116,7 +116,9 @@
</fileset>
</target>
+ <target name="default" depends="download-vendor-all, install-all" />
+
<!-- Load the common target definitions -->
- <include buildfile="${basedir}/nant-common.xml"/>
+ <include buildfile="${basedir}/nant-common.xml"/>
</project>
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=709310&r1=709309&r2=709310&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml Thu Oct 30
17:34:32 2008
@@ -359,20 +359,13 @@
<do>
<property name="repo.task.artifact"
value="${path}/${path::get-file-name(install.filename)}"/>
<property name="repo.task.src" value="${install.filename}"/>
- <call target="repo-install"/>
+ <property name="repo.task.dest"
value="${nant.local.repo}/${repo.task.artifact}"/>
+ <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
+ <copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
</do>
</foreach>
</target>
- <target name="repo-install" description="Install a dependency to the local
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.local.repo}/${repo.task.artifact}"/>
- <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
- <copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
- </target>
-
<!--
============================================================================================
-->
<!-- R E P O D O W N L O A D T A R G E T S
-->
<!--
============================================================================================
-->
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=709310&r1=709309&r2=709310&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build Thu Oct 30
17:34:32 2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache.NMS.MSMQ" default="compile-all"
xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd";>
+<project name="Apache.NMS.MSMQ" default="default"
xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd";>
<!--
============================================================================================
-->
<!-- I N I T I A L I Z A T I O N
-->
@@ -108,6 +108,8 @@
</fileset>
</target>
- <!-- Load the common target definitions -->
- <include buildfile="${basedir}/nant-common.xml"/>
+ <target name="default" depends="download-vendor-all, install-all" />
+
+ <!-- Load the common target definitions -->
+ <include buildfile="${basedir}/nant-common.xml"/>
</project>
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=709310&r1=709309&r2=709310&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Thu Oct 30
17:34:32 2008
@@ -359,20 +359,13 @@
<do>
<property name="repo.task.artifact"
value="${path}/${path::get-file-name(install.filename)}"/>
<property name="repo.task.src" value="${install.filename}"/>
- <call target="repo-install"/>
+ <property name="repo.task.dest"
value="${nant.local.repo}/${repo.task.artifact}"/>
+ <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
+ <copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
</do>
</foreach>
</target>
- <target name="repo-install" description="Install a dependency to the local
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.local.repo}/${repo.task.artifact}"/>
- <mkdir dir="${directory::get-parent-directory(repo.task.dest)}" />
- <copy file="${repo.task.src}" tofile="${repo.task.dest}"/>
- </target>
-
<!--
============================================================================================
-->
<!-- R E P O D O W N L O A D T A R G E T S
-->
<!--
============================================================================================
-->
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=709310&r1=709309&r2=709310&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Thu Oct 30 17:34:32
2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache.NMS" default="compile-all"
xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd";>
+<project name="Apache.NMS" default="default"
xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd";>
<!--
============================================================================================
-->
<!-- I N I T I A L I Z A T I O N
-->
@@ -80,7 +80,9 @@
<include name="${build.bin.dir}/${project.name}.Test.pdb"/>
<include name="${build.bin.dir}/${project.name}.Test.dll.mdb"/>
</fileset>
-</target>
+ </target>
+
+ <target name="default" depends="install-all"/>
<!-- Load the common target definitions -->
<include buildfile="${basedir}/nant-common.xml"/>
