Author: xavier
Date: Fri Aug 22 08:57:54 2008
New Revision: 688107
URL: http://svn.apache.org/viewvc?rev=688107&view=rev
Log:
FIX: Inconsistency with "multi-project" tutorial (IVY-667)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/example/multi-project/common/common.xml
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=688107&r1=688106&r2=688107&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Aug 22 08:57:54 2008
@@ -108,6 +108,7 @@
- IMPROVEMENT: Add a memory cache for the module descriptor that are parsed
from the cache (IVY-883)
- IMPROVEMENT: Improve performance (IVY-872)
+- FIX: Inconsistency with "multi-project" tutorial (IVY-667)
- FIX: URLRepository does not allow some valid file scheme uri's (IVY-884)
- FIX: Incorrect parsing artifactPattern attribute in a sftp resolver
(IVY-661) (thanks to Alexey Kiselev)
- FIX: Maven2 "ejb" packaging is not supported (IVY-873)
Modified: ant/ivy/core/trunk/src/example/multi-project/common/common.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/example/multi-project/common/common.xml?rev=688107&r1=688106&r2=688107&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/example/multi-project/common/common.xml (original)
+++ ant/ivy/core/trunk/src/example/multi-project/common/common.xml Fri Aug 22
08:57:54 2008
@@ -50,6 +50,7 @@
it into ant's lib dir (note that the latter copy will always take
precedence).
We will not fail as long as ivy home lib dir exists (it may be
empty) and
ivy is in at least one of ant's lib dir or the ivy home lib dir.
-->
+ <mkdir dir="${ivy.jar.dir}" />
<path id="ivy.lib.path">
<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
</path>
@@ -177,8 +178,10 @@
<!-- =================================
target: clean-local
================================= -->
- <target name="clean-local" description="--> cleans the local repository
for the current module">
- <delete dir="${ivy.local.default.root}/${ant.project.name}"/>
+ <target name="clean-local" depends="load-ivy"
+ description="--> cleans the local repository for the current
module">
+ <ivy:info file="${ivy.file}" />
+ <delete
dir="${ivy.local.default.root}/${ivy.organisation}/${ivy.module}"/>
</target>
<!-- =================================
