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

[hi...@apache.org]

Author: hibou
Date: Wed Jan 21 11:43:06 2009
New Revision: 736389

URL: http://svn.apache.org/viewvc?rev=736389&view=rev
Log:
Add some targets dedicated to the preparation of the environment of Hudson

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=736389&r1=736388&r2=736389&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.properties (original)
+++ ant/ivy/ivyde/trunk/build.properties Wed Jan 21 11:43:06 2009
@@ -24,3 +24,13 @@
 
 # URL of the mirror to use when trying to install Ivy from an official release
 mirror.url=http://apache.multidist.com
+
+# properties for hudson build environment
+hudson.eclipse.name=eclipse-SDK-3.4.1-solaris-gtk
+hudson.eclipse.dropFile=R-3.4.1-200809111700/${hudson.eclipse.name}.zip
+hudson.eclipse.download.url=http://www.eclipse.org/downloads/download.php
+hudson.eclipse.mirror.url=http://eclipse.ialto.org/eclipse/downloads/drops
+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

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=736389&r1=736388&r2=736389&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Wed Jan 21 11:43:06 2009
@@ -30,8 +30,6 @@
 -->
 <project name="ivyde" basedir="." default="build" xmlns:xooki="antlib:xooki">
 
-    <taskdef uri="antlib:xooki" file="${basedir}/doc/xooki/antlib.xml" />
-
     <property file="local.build.properties" />
     <property file="build.properties" />
 
@@ -243,15 +241,14 @@
         <path id="ivy.eclipse.paths">
             <fileset dir="${baseLocation}/plugins" includes="org.apache.ivy_*.jar"/>
         </path>
+        <condition property="ivy.installed">
+            <resourcecount refid="ivy.eclipse.paths" when="greater" count="0" />
+        </condition>
         <echo message="The Ivy installed in ${baseLocation}: ${toString:ivy.eclipse.paths}" />
     </target>
 
     <target name="check-ivy-installed" depends="list-installed-ivy">
-        <fail message="No Ivy is installed. Please run 'ant install-ivy first'.">
-            <condition>
-                <resourcecount refid="ivy.eclipse.paths" when="equal" count="0" />
-            </condition>
-        </fail>
+        <fail message="No Ivy is installed. Please run 'ant install-ivy first'." unless="ivy.installed" />
     </target>
 
     <!-- 
@@ -327,6 +324,51 @@
     </target>
 
     <!--
+            ======================================================================================
+            Targets related to prepare the build environment of IvyDE on hudson.
+            ======================================================================================
+         -->
+
+    <target name="hudson-prepare" depends="hudson-prepare-eclipse,hudson-prepare-properties,hudson-install-ivy" />
+
+    <target name="hudson-prepare-eclipse" depends="hudson-get-eclipse,hudson-unzip-eclipse" />
+
+    <target name="hudson-check-download-eclipse">
+        <condition property="hudson.eclipse.downloaded">
+            <available file="${hudson.eclipse.name}.zip" />
+        </condition>
+    </target>
+
+    <target name="hudson-get-eclipse" depends="hudson-check-download-eclipse" unless="hudson.eclipse.downloaded">
+        <get src="${hudson.eclipse.url}" dest="${hudson.eclipse.name}.zip" verbose="yes" />
+    </target>
+
+    <target name="hudson-check-unzip-eclipse">
+        <condition property="hudson.eclipse.unzipped">
+            <available file="${hudson.eclipse.name}" />
+        </condition>
+    </target>
+
+    <target name="hudson-unzip-eclipse" depends="hudson-check-unzip-eclipse" unless="hudson.eclipse.unzipped">
+        <unzip src="${hudson.eclipse.name}.zip" dest="${basedir}" />
+        <move file="eclipse" tofile="${hudson.eclipse.name}" />
+    </target>
+
+    <target name="hudson-prepare-properties">
+        <property name="baseLocation" value="${basedir}/${hudson.eclipse.name}" />
+        <echo file="local.build.properties">
+baseLocation=${basedir}/${hudson.eclipse.name}
+</echo>
+    </target>
+
+    <target name="hudson-install-ivy" depends="list-installed-ivy" unless="ivy.installed">
+        <ant antfile="build.xml" target="install-ivy">
+            <property name="ivy.version" value="${hudson.ivy.version}" />
+            <property name="baseLocation" location="${basedir}/${hudson.eclipse.name}" />
+        </ant>
+    </target>
+
+    <!--
         ======================================================================================
         Targets related to the generation of the documentation included in the eclipse plugin
         ======================================================================================
@@ -341,6 +383,7 @@
     </target>
 
     <target name="generate-eclipse-doc-html">
+        <taskdef uri="antlib:xooki" file="${basedir}/doc/xooki/antlib.xml" />
         <copy todir="${doc.work.dir}">
             <fileset dir="${src.doc.dir}" />
         </copy>