svn commit: r738850 - in /ant/ivy/ivyde/trunk: build.properties build.xml

[hi...@apache.org]

Author: hibou
Date: Thu Jan 29 13:09:04 2009
New Revision: 738850

URL: http://svn.apache.org/viewvc?rev=738850&view=rev
Log:
- make IvyDE on hudson use the last release of Ivy
- make hudson always trying to update the Ivy installed in the Eclipse install, but now keep the downloaded files

Modified:
    ant/ivy/ivyde/trunk/build.properties
    ant/ivy/ivyde/trunk/build.xml

Modified: ant/ivy/ivyde/trunk/build.properties
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.properties?rev=738850&r1=738849&r2=738850&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.properties (original)
+++ ant/ivy/ivyde/trunk/build.properties Thu Jan 29 13:09:04 2009
@@ -33,4 +33,4 @@
 hudson.eclipse.mirror.id=514
 hudson.eclipse.url=${hudson.eclipse.download.url}?file=/eclipse/downloads/drops/${hudson.eclipse.dropFile}&url=${hudson.eclipse.mirror.url}/${hudson.eclipse.dropFile}&mirror_id=${hudson.eclipse.mirror.id}
 
-hudson.ivy.version=2.0.0-rc2
+hudson.ivy.version=2.0.0

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=738850&r1=738849&r2=738850&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Thu Jan 29 13:09:04 2009
@@ -239,8 +239,8 @@
         </fail>
         <mkdir dir="${ivy.work.dir}/distrib" />
         <property name="ivy.zip.url" value="${mirror.url}/ant/ivy/${ivy.version}/apache-ivy-${ivy.version}-bin.zip" />
-        <get src="${ivy.zip.url}" usetimestamp="true" dest="${ivy.work.dir}/ivy-bin.zip" />
-        <unzip overwrite="true" src="${ivy.work.dir}/ivy-bin.zip" dest="${ivy.work.dir}/distrib" />
+        <get src="${ivy.zip.url}" usetimestamp="true" dest="${basedir}/apache-ivy-${ivy.version}-bin.zip" verbose="true" />
+        <unzip overwrite="true" src="${basedir}/apache-ivy-${ivy.version}-bin.zip" dest="${ivy.work.dir}/distrib" />
         <path id="ivy.jar.path">
             <first count="1">
                 <fileset dir="${ivy.work.dir}" includes="distrib/apache-ivy-*/ivy-*.jar" />
@@ -378,7 +378,7 @@
 </echo>
     </target>
 
-    <target name="hudson-install-ivy" depends="list-installed-ivy" unless="ivy.installed">
+    <target name="hudson-install-ivy">
         <ant antfile="build.xml" target="install-ivy">
             <property name="ivy.version" value="${hudson.ivy.version}" />
             <property name="baseLocation" location="${basedir}/${hudson.eclipse.name}" />