Return-Path: 
 <notifications-return-4893-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@locus.apache.org
Received: (qmail 10305 invoked from network); 25 Sep 2008 09:22:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 25 Sep 2008 09:22:44 -0000
Received: (qmail 36545 invoked by uid 500); 25 Sep 2008 09:22:42 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 36527 invoked by uid 500); 25 Sep 2008 09:22:41 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 36518 invoked by uid 99); 25 Sep 2008 09:22:41 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Sep 2008 02:22:41 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Sep 2008 09:21:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1554F23888A0; Thu, 25 Sep 2008 02:21:20 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r698882 - in /ant/ivy/ivyde/trunk: build.properties
 build.xml
Date: Thu, 25 Sep 2008 09:21:19 -0000
To: notifications@ant.apache.org
From: hibou@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080925092120.1554F23888A0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hibou
Date: Thu Sep 25 02:21:18 2008
New Revision: 698882

URL: http://svn.apache.org/viewvc?rev=698882&view=rev
Log:
IVYDE-122: add tasks to install an ivy jar into an Eclipse install

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=698882&r1=698881&r2=698882&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.properties (original)
+++ ant/ivy/ivyde/trunk/build.properties Thu Sep 25 02:21:18 2008
@@ -19,4 +19,3 @@
 
 version.qualifier=beta1
 outputUpdateJars=true
-ivy.version=2.0.0-beta2

Modified: ant/ivy/ivyde/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.xml?rev=698882&r1=698881&r2=698882&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.xml (original)
+++ ant/ivy/ivyde/trunk/build.xml Thu Sep 25 02:21:18 2008
@@ -48,9 +48,11 @@
         <delete dir="${dist.dir}" />
     </target>
 
-    <target name="eclipse-startup-check">
-        <fail message="An Eclipse install is needed to run the build. Set your Eclipse install dir into the baseLocation property." unless="baseLocation" />
+    <target name="check-baseLocation">
+        <fail message="An Eclipse install is needed to run the build. Set your Eclipse install dir in the 'baseLocation' property." unless="baseLocation" />
+    </target>
 
+    <target name="eclipse-startup-check" depends="check-baseLocation">
         <condition property="eclipse.startup">
             <available file="${baseLocation}/startup.jar" />
         </condition>
@@ -159,13 +161,64 @@
         </zip>
     </target>
 
-    <!-- due to a bug in the packaging of Ivy, some repackaging is needed (IVY-828,IVY-802) -->
-    <target name="install-ivy">
-        <get src="http://apache.org/dist/ant/ivy/${ivy.version}/apache-ivy-${ivy.version}-bin.zip" usetimestamp="true" dest="apache-ivy-${ivy.version}-bin.zip" />
-        <mkdir dir="work-ivy" />
-        <unzip overwrite="true" src="apache-ivy-${ivy.version}-bin.zip" dest="ivy-work" />
-        <copy file="ivy-work/apache-ivy-${ivy.version}/ivy-${ivy.version}.jar" tofile="${baseLocation}/plugins/org.apache.ivy_${ivy.version}.jar" />
-        <delete dir="work-ivy" />
+    <!-- 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" />
+        <get src="${ivy.jar.url}" dest="work-ivy/ivy.jar" />
+        <unzip overwrite="true" src="work-ivy/ivy.jar" dest="work-ivy/jar" />
+        <loadfile property="ivy.bundle.version" srcFile="work-ivy/jar/META-INF/MANIFEST.MF">
+            <filterchain>
+                <linecontains>
+                    <contains value="Bundle-Version:"/>
+                </linecontains>
+                <tokenfilter>
+                    <replaceregex pattern="Bundle-Version: (.*)" replace="\1" flags="gi"/>
+                </tokenfilter>
+                <striplinebreaks/>
+            </filterchain>
+        </loadfile>
+    </target>
+
+    <!-- clean up every installed ivy and install the specified one -->
+    <target name="install-ivy-jar" depends="compute-ivy-bundle-version">
+        <delete>
+            <fileset dir="${baseLocation}/plugins/" includes="org.apache.ivy_*.jar"/>
+        </delete>
+        <get src="${ivy.jar.url}" dest="${baseLocation}/plugins/org.apache.ivy_${ivy.bundle.version}.jar" />
+        <echo message="Ivy ${ivy.bundle.version} has been installed in ${baseLocation}" />
+    </target>
+
+    <!-- Get the Ivy jar from a zip distribution -->
+    <target name="get-ivy-jar" unless="ivy.jar.url">
+        <fail>
+You have to specify the Ivy to install with one of the following property:
+ - 'ivy.version': the version to download from Apache (ex: -Divy.version=2.0.0-beta2)
+ - 'ivy.zip.url': the url of the zip distribution (ex: -Divy.zip.url=http://people.apache.org/~xavier/ivy/staging/2.0.0-rc1/apache-ivy-2.0.0-rc1-bin.zip)
+ - 'ivy.jar.url': the url of the Ivy jar (ex: -Divy.jar.url=file:///home/me/ivy-trunk/build/artifact/jars/ivy.jar)
+            <condition>
+                <not>
+                    <or>
+                        <isset property="ivy.version" />
+                        <isset property="ivy.zip.url" />
+                    </or>
+                </not>
+            </condition>
+        </fail>
+        <mkdir dir="ivy-work/distrib" />
+        <property name="ivy.zip.url" value="http://apache.multidist.com/ant/ivy/${ivy.version}/apache-ivy-${ivy.version}-bin.zip" />
+        <get src="${ivy.zip.url}" usetimestamp="true" dest="ivy-work/ivy-bin.zip" />
+        <unzip overwrite="true" src="ivy-work/ivy-bin.zip" dest="ivy-work/distrib" />
+        <path id="ivy.jar.path">
+            <first count="1">
+                <fileset dir="ivy-work" includes="distrib/apache-ivy-*/ivy-*.jar"/>
+            </first>
+        </path>
+        <property name="ivy.jar.url" value="file://${toString:ivy.jar.path}" />
+        <echo message="${ivy.jar.url}" />
+    </target>
+
+    <target name="install-ivy" depends="check-baseLocation,get-ivy-jar,install-ivy-jar" description="Install an Ivy bundle into the eclipse install">
+        <delete dir="ivy-work" />
     </target>
 
     <target name="checksum" description="Compute the checksum for every artifact to distribute">