svn commit: r698902 - /ant/ivy/ivyde/trunk/build.xml

[hi...@apache.org]

Author: hibou
Date: Thu Sep 25 02:37:47 2008
New Revision: 698902

URL: http://svn.apache.org/viewvc?rev=698902&view=rev
Log:
IVYDE-122:
- add a task to list the installed Ivy
- add a check if Ivy exists in the Eclipse install before starting to build

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

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=698902&r1=698901&r2=698902&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Thu Sep 25 02:37:47 2008
@@ -104,7 +104,13 @@
         <echo message="Building version ${build.version}" />
     </target>
 
-    <target name="build" depends="eclipse-classpath,compute-version" description="Build the plugin distribution binaries">
+    <!-- 
+        ======================================================================================
+        Build targets
+        ======================================================================================
+     -->
+
+    <target name="build" depends="check-ivy-installed,eclipse-classpath,compute-version" description="Build the plugin distribution binaries">
         <property name="outputUpdateJars" value="false" />
         <java classpath="${eclipse.classpath}" classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true">
             <arg value="-clean" />
@@ -161,6 +167,12 @@
         </zip>
     </target>
 
+    <!-- 
+        ======================================================================================
+        Targets related to the installation of Ivy in the Eclipse install
+        ======================================================================================
+     -->
+
     <!-- Get the OSGi version of Ivy in the manifest in the jar -->
     <target name="compute-ivy-bundle-version" unless="ivy.bundle.version">
         <mkdir dir="work-ivy/jar" />
@@ -221,6 +233,23 @@
         <delete dir="ivy-work" />
     </target>
 
+    <target name="list-installed-ivy" depends="check-baseLocation" description="List the Ivy bundle(s) in your Eclipse install">
+        <path id="ivy.eclipse.paths">
+            <fileset dir="${baseLocation}/plugins" includes="org.apache.ivy_*.jar"/>
+        </path>
+        <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'." />
+    </target>
+
+    <!-- 
+        ======================================================================================
+        Targets related to the checksums of the distribution
+        ======================================================================================
+     -->
+
     <target name="checksum" description="Compute the checksum for every artifact to distribute">
         <checksum algorithm="MD5" fileext=".md5" format="MD5SUM">
             <fileset dir="${dist.dir}">