You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by th...@apache.org on 2008/10/05 23:32:17 UTC
svn commit: r701889 - in /labs/droids/branch/LABS-144/tools:
ant/lib/ivy-2.0.0-beta2.jar ivy/ivy-2.0.0-beta2.jar ivy/ivy-build.xml
Author: thorsten
Date: Sun Oct 5 14:32:17 2008
New Revision: 701889
URL: http://svn.apache.org/viewvc?rev=701889&view=rev
Log:
LABS-189
Since we have our own ant now we can move the ivy jar directly into the lib dir of ant and drop the init phase for ivy
Added:
labs/droids/branch/LABS-144/tools/ant/lib/ivy-2.0.0-beta2.jar
- copied unchanged from r701692, labs/droids/branch/LABS-144/tools/ivy/ivy-2.0.0-beta2.jar
Removed:
labs/droids/branch/LABS-144/tools/ivy/ivy-2.0.0-beta2.jar
Modified:
labs/droids/branch/LABS-144/tools/ivy/ivy-build.xml
Modified: labs/droids/branch/LABS-144/tools/ivy/ivy-build.xml
URL: http://svn.apache.org/viewvc/labs/droids/branch/LABS-144/tools/ivy/ivy-build.xml?rev=701889&r1=701888&r2=701889&view=diff
==============================================================================
--- labs/droids/branch/LABS-144/tools/ivy/ivy-build.xml (original)
+++ labs/droids/branch/LABS-144/tools/ivy/ivy-build.xml Sun Oct 5 14:32:17 2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns:ivy="antlib:org.apache.ivy.ant" name="hello-ivy"
+<project xmlns:ivy="antlib:org.apache.ivy.ant"
default="ivy.resolve">
<property file="build.properties"/>
<property name="project.build.dir" location="build"/>
@@ -23,29 +23,22 @@
<!-- =================================
target: resolve
================================= -->
- <target name="ivy.resolve" depends="load-ivy,ivy.configure"
+ <target name="ivy.resolve" depends="ivy.configure"
description="-> retreive dependencies with ivy">
<!-- <ivy:cleancache /> -->
<ivy:retrieve/>
</target>
-
<target name="ivy.configure">
<ivy:configure file="${ivy.repository.dir}/ivysettings.xml"/>
</target>
- <target name="ivy.report" depends="load-ivy,ivy.configure"
+ <target name="ivy.report" depends="ivy.configure"
description="-> generates a report of dependencies">
<ivy:report todir="${build.dir}" conf="core" organisation="apache" module="droids"/>
</target>
- <target name="load-ivy">
- <!-- try to load ivy here from home ivy dir, in case the user has not already dropped
- 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. -->
- <path id="ivy.lib.path">
- <fileset dir="${ivy.repository.dir}" includes="*.jar"/>
- </path>
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
- uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-
- </target>
+ <!-- testing ivy -->
+ <target name="ivy.buildlist">
+ <ivy:buildlist reference="build-path">
+ <fileset dir="depot" includes="**/build.xml"/>
+ </ivy:buildlist>
+ </target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org