Author: xavier
Date: Fri Jan 18 07:41:09 2008
New Revision: 613192
URL: http://svn.apache.org/viewvc?rev=613192&view=rev
Log:
FIX: Update install ivy build file example (IVY-705) (thanks to Benjamin
Francisoud)
Modified:
ant/ivy/core/branches/2.0.0-beta1/doc/install.html
ant/ivy/core/trunk/doc/install.html
Modified: ant/ivy/core/branches/2.0.0-beta1/doc/install.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.0-beta1/doc/install.html?rev=613192&r1=613191&r2=613192&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.0-beta1/doc/install.html (original)
+++ ant/ivy/core/branches/2.0.0-beta1/doc/install.html Fri Jan 18 07:41:09 2008
@@ -59,29 +59,30 @@
<h1>Automatically</h1>
If you want to use Ivy only in your ant build scripts, and have an internet
connection when you build, you can download Ivy from this site and use the
downloaded version automatically, using this simple build snippet:
<code type="xml">
- <property name="ivy.install.version" value="1.4-RC1" />
-
+ <property name="ivy.install.version" value="2.0.0-beta1" />
<condition property="ivy.home" value="${env.IVY_HOME}">
- <isset property="env.IVY_HOME" />
+ <isset property="env.IVY_HOME" />
</condition>
- <property name="ivy.home" value="${user.home}/.ivy" />
- <property name="ivy.jar.dir" value="${ivy.home}/jars" />
+ <property name="ivy.home" value="${user.home}/.ant" />
+ <property name="ivy.jar.dir" value="${ivy.home}/lib" />
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-
+
<target name="download-ivy" unless="offline">
+
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without
any special installation -->
- <get
src="http://www.jayasoft.org/downloads/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar";
+ <get
src="http://www.apache.org/dist/ant/ivy/${ivy.install.version}/ivy.jar";
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
-
+
<target name="init-ivy" depends="download-ivy">
- <!-- try to load ivy here from ivy home, in case the user has not
already dropped
+ <!-- try to load ivy here from ivy home, 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 local lib dir exists (it may be
empty) and
ivy is in at least one of ant's lib dir or the local lib dir. -->
<path id="ivy.lib.path">
<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+
</path>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
Modified: ant/ivy/core/trunk/doc/install.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/install.html?rev=613192&r1=613191&r2=613192&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/install.html (original)
+++ ant/ivy/core/trunk/doc/install.html Fri Jan 18 07:41:09 2008
@@ -47,41 +47,35 @@
<h2>Ivy dependendencies</h2>
-The latest binary version of Ivy, 2.0.0-alpha-1, doesn't include the optional
dependencies. To download them using Ivy, all you need is to have Ant installed
and follow these instructions:
-1. open a shell or command line in the directory where you unzipped your
binary distribution, where you can find the ivy-2.0.0-alpha-1-incubating.jar
-2. copy <a href="samples/build-install.xml">this build</a> script to the
directory
-3. run the following command:
-<code>
-ant -f build-install.xml
-</code>
-4. That's all, you should now see the Ivy optional dependencies in the lib
directory, organized per configuration (see the ivy.xml for details about the
configurations and their use)
+One of the two binary versions of Ivy doesn't include the optional
dependencies. To download them using Ivy, all you need is to run the Ant build
file provided in the distribution. This will use Ivy itself to download the
dependencies. Then you should see the Ivy optional dependencies in the lib
directory, organized per configuration (see the ivy.xml for details about the
configurations and their use).
<h1>Automatically</h1>
If you want to use Ivy only in your ant build scripts, and have an internet
connection when you build, you can download Ivy from this site and use the
downloaded version automatically, using this simple build snippet:
<code type="xml">
- <property name="ivy.install.version" value="1.4-RC1" />
-
+ <property name="ivy.install.version" value="2.0.0-beta1" />
<condition property="ivy.home" value="${env.IVY_HOME}">
- <isset property="env.IVY_HOME" />
+ <isset property="env.IVY_HOME" />
</condition>
- <property name="ivy.home" value="${user.home}/.ivy" />
- <property name="ivy.jar.dir" value="${ivy.home}/jars" />
+ <property name="ivy.home" value="${user.home}/.ant" />
+ <property name="ivy.jar.dir" value="${ivy.home}/lib" />
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-
+
<target name="download-ivy" unless="offline">
+
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without
any special installation -->
- <get
src="http://www.jayasoft.org/downloads/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar";
+ <get
src="http://www.apache.org/dist/ant/ivy/${ivy.install.version}/ivy.jar";
dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
-
+
<target name="init-ivy" depends="download-ivy">
- <!-- try to load ivy here from ivy home, in case the user has not
already dropped
+ <!-- try to load ivy here from ivy home, 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 local lib dir exists (it may be
empty) and
ivy is in at least one of ant's lib dir or the local lib dir. -->
<path id="ivy.lib.path">
<fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+
</path>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
