ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r897525 - /ant/ivy/updatesite/trunk/build.xml
Date Sat, 09 Jan 2010 19:46:04 GMT
Author: hibou
Date: Sat Jan  9 19:46:04 2010
New Revision: 897525

URL: http://svn.apache.org/viewvc?rev=897525&view=rev
Log:
don't rely on the file system to get the Ivy jar and the IvyDE zip, get them via http as the
build may happen on an hudson slave

Modified:
    ant/ivy/updatesite/trunk/build.xml

Modified: ant/ivy/updatesite/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=897525&r1=897524&r2=897525&view=diff
==============================================================================
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Sat Jan  9 19:46:04 2010
@@ -423,16 +423,17 @@
     </target>
 
     <target name="hudson-find-ivy-jar">
-        <property name="ivy.jar" value="${basedir}/../../../Ivy/lastSuccessful/archive/trunk/build/artifact/jars/ivy.jar"
/>
+        <get src="${hudson.baseUrl}/view/Ant/job/Ivy/lastSuccessfulBuild/artifact/trunk/build/artifact/jars/ivy.jar"
dest="${basedir}/ivy-hudson.jar" verbose="yes" />
+        <property name="ivy.jar" value="${basedir}/ivy-hudson.jar" />
     </target>
 
     <target name="hudson-find-ivyde-zip">
-        <path id="ivyde.zip.id">
-            <first count="1">
-                <fileset dir="${basedir}/../../../IvyDE/lastSuccessful/archive/trunk/dist/"
includes="apache-ivyde-2*.zip" />
-            </first>
-        </path>
-        <property name="ivyde.zip" refid="ivyde.zip.id" />
+        <!-- get the last sucessful version -->
+        <get src="${hudson.baseUrl}/view/Ant/job/IvyDE/lastSuccessfulBuild/artifact/trunk/dist/version.properties"
dest="${basedir}/ivyde-hudson-version.properties" verbose="yes" />
+        <property file="${basedir}/ivyde-hudson-version.properties" />
+        <!-- get the actual zip -->
+        <get src="${hudson.baseUrl}/view/Ant/job/IvyDE/lastSuccessfulBuild/artifact/trunk/dist/apache-ivyde-${ivyde.build.version}.zip"
dest="${basedir}/apache-ivyde-hudson.zip" verbose="yes" />
+        <property name="ivyde.zip" value="${basedir}/apache-ivyde-hudson.zip" />
     </target>
 
     <target name="hudson-build" depends="clean,hudson-find-ivy-jar,hudson-find-ivyde-zip,install-ivy-and-ivyde,optimize,checksum"
/>



Mime
View raw message