svn commit: r639900 - /ant/core/trunk/fetch.xml

[pe...@apache.org]

Author: peterreilly
Date: Fri Mar 21 15:44:54 2008
New Revision: 639900

URL: http://svn.apache.org/viewvc?rev=639900&view=rev
Log:
Do not make system be the default location
- it is too dangerous - noone reads manuals!


Modified:
    ant/core/trunk/fetch.xml

Modified: ant/core/trunk/fetch.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/fetch.xml?rev=639900&r1=639899&r2=639900&view=diff
==============================================================================
--- ant/core/trunk/fetch.xml (original)
+++ ant/core/trunk/fetch.xml Fri Mar 21 15:44:54 2008
@@ -29,8 +29,8 @@
 
   You can choose three locations, by going -Ddest=LOCATION on the command line
   -Ddest=user     user lib dir  ${user.home}/.ant/lib
-  -Ddest=system   ant lib dir   ${ant.home}/lib --Default--
-  -Ddest=optional optional dir  ${ant.home}/lib/optional  (for Ant developers)
+  -Ddest=system   ant lib dir   ${ant.home}/lib
+  -Ddest=optional optional dir  $${basedir}/lib/optional  (for Ant developers)
 
   You may also need to set proxy settings. On Java1.5, Ant tries to get
   this from the OS, unless you use the -noproxy option.
@@ -63,7 +63,18 @@
   <import file="get-m2.xml" />
 
   <target name="pick-dest">
-    <property name="dest" value="system" />
+    <fail>
+      <condition>
+        <not>
+          <isset property="dest"/>
+        </not>
+      </condition>ERROR
+Set -Ddest=LOCATION on the command line
+  -Ddest=user     user lib dir  ${user.home}/.ant/lib
+  -Ddest=system   ant lib dir   ${ant.home}/lib
+  -Ddest=optional optional dir  $${basedir}/lib/optional  (for Ant developers)
+    </fail>
+
     <condition property="dest.dir"
       value="${lib.dir}">
       <equals arg1="${dest}" arg2="system" />