svn commit: r416830 - in /ant/core/trunk: fetch.xml get-m2.xml

[mb...@apache.org]

Author: mbenson
Date: Fri Jun 23 15:30:47 2006
New Revision: 416830

URL: http://svn.apache.org/viewvc?rev=416830&view=rev
Log:
rename get-m2 dest.dir to m2.dest.dir for better portability;
<fail unless=""> is more compact than a nested <not><isset /></not> in fetch/pickDest

Modified:
    ant/core/trunk/fetch.xml
    ant/core/trunk/get-m2.xml

Modified: ant/core/trunk/fetch.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/fetch.xml?rev=416830&r1=416829&r2=416830&view=diff
==============================================================================
--- ant/core/trunk/fetch.xml (original)
+++ ant/core/trunk/fetch.xml Fri Jun 23 15:30:47 2006
@@ -66,13 +66,9 @@
       value="${userlib.dir}">
       <equals arg1="${dest}" arg2="user" />
     </condition>
-    <fail>
-      Unknown destination : ${dest}
-      <condition>
-        <not><isset property="dest.dir" /></not>
-      </condition>
-    </fail>
+    <fail unless="dest.dir">Unknown destination : ${dest}</fail>
     <echo>Downloading to ${dest.dir}</echo>
+    <property name="m2.dest.dir" value="${dest.dir}" />
   </target>
 
 

Modified: ant/core/trunk/get-m2.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/get-m2.xml?rev=416830&r1=416829&r2=416830&view=diff
==============================================================================
--- ant/core/trunk/get-m2.xml (original)
+++ ant/core/trunk/get-m2.xml Fri Jun 23 15:30:47 2006
@@ -13,7 +13,7 @@
 
 <description>
   This build file downloads the Maven2 Ant tasks,
-  and installs them in the location specified by the dest.dir property.
+  and installs them in the location specified by the m2.dest.dir property.
 
   You may need to set proxy settings. On Java1.5, Ant tries to get
   this from the OS, unless you use the -noproxy option.
@@ -49,11 +49,11 @@
   </macrodef>
 
   <target name="probe-m2">
-    <require property="dest.dir" />
+    <require property="m2.dest.dir" />
     <require property="m2.jar.name" />
 
     <!-- Look for M2 ant tasks in our classpath-->
-    <property name="m2.artifact" location="${dest.dir}/${m2.jar.name}" />
+    <property name="m2.artifact" location="${m2.dest.dir}/${m2.jar.name}" />
     <available property="m2.antlib.found" resource="${m2.antlib.resource}" />
     <condition property="m2.antlib.typefound">
       <typefound name="${m2.antlib.uri}:artifact" />
@@ -62,9 +62,9 @@
 
   <target name="download-m2" depends="probe-m2" unless="m2.antlib.found">
     <require property="m2.antlib.url" />
-    <echo>Downloading to ${dest.dir}</echo>
+    <echo>Downloading to ${m2.dest.dir}</echo>
 
-    <mkdir dir="${dest.dir}" />
+    <mkdir dir="${m2.dest.dir}" />
     <!-- fetch M2 ant tasks into our repository, if it is not there-->
     <get src="${m2.antlib.url}"
       dest="${m2.artifact}"



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org