You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2014/06/05 12:45:36 UTC

git commit: add 'empty' paths if no ivy.xml is specified

Repository: ant-antlibs-common
Updated Branches:
  refs/heads/master 7f3df8da8 -> abc34f5a5


add 'empty' paths if no ivy.xml is specified


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/commit/abc34f5a
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/tree/abc34f5a
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/diff/abc34f5a

Branch: refs/heads/master
Commit: abc34f5a50da37491352609ecd711f998f14eeaf
Parents: 7f3df8d
Author: Jan Mat�rne <jh...@apache.org>
Authored: Thu Jun 5 12:45:14 2014 +0200
Committer: Jan Mat�rne <jh...@apache.org>
Committed: Thu Jun 5 12:45:14 2014 +0200

----------------------------------------------------------------------
 ivy.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-antlibs-common/blob/abc34f5a/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index f3ab47a..51d540b 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -147,13 +147,18 @@
   <!-- Standard Ivy targets   -->
   <!-- ========================================================== -->
 
-  <target name="resolve" depends="install-ivy" if="with.ivy" unless="no.resolve">
+  <target name="resolve" depends="install-ivy,-no-resolve" if="with.ivy" unless="no.resolve">
     <ivy:resolve file="ivy.xml"/>    
     <ivy:retrieve conf="default" pattern="${lib.dir.compile}/[artifact].[ext]" sync="yes"/>
     <ivy:retrieve conf="test" pattern="${lib.dir.test}/[artifact].[ext]" sync="yes"/>
     <ivy:cachepath pathid="classpath.compile" conf="default"/>
     <ivy:cachepath pathid="classpath.test" conf="default,test"/>
   </target>
+  
+  <target name="-no-resolve" unless="with.ivy">
+    <path id="classpath.compile"/>
+    <path id="classpath.test"/>
+  </target>