From 7ccd0d0213a6a13922fd2fee83248b71ab8e78c8 Mon Sep 17 00:00:00 2001
From: Dominik Lindner <d.lindner@dundee.ac.uk>
Date: Wed, 1 Jul 2015 10:48:04 +0100
Subject: [PATCH 1/4] Allow to retrieve bundle in Ivy (eclipse project
 classpath)

---
 components/antlib/resources/global.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml
index 1723b13b265..f0cd93dd625 100644
--- a/components/antlib/resources/global.xml
+++ b/components/antlib/resources/global.xml
@@ -500,7 +500,7 @@
             <sequential>
                 <trycatch>
                     <try>
-                        <ivy:resolve file="test.xml" type="jar" conf="test" settingsRef="@{settingsRef}" log="quiet"/>
+                        <ivy:resolve file="test.xml" type="jar,bundle" conf="test" settingsRef="@{settingsRef}" log="quiet"/>
                         <taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
                         <ivyeclipse conf="test" filter="@{filter}"/>
                     </try>
@@ -512,7 +512,7 @@
                         ***************************************************************************
 
                         </echo>
-                        <ivy:resolve file="ivy.xml" type="jar" conf="build" settingsRef="@{settingsRef}" log="quiet"/>
+                        <ivy:resolve file="ivy.xml" type="jar,bundle" conf="build" settingsRef="@{settingsRef}" log="quiet"/>
                         <taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
                         <ivyeclipse conf="build" filter="@{filter}"/>
                     </catch>

From 523beb31b1afdd09d0178304d820f11c60697346 Mon Sep 17 00:00:00 2001
From: Sebastien Besson <seb.besson@gmail.com>
Date: Wed, 1 Jul 2015 11:55:31 +0100
Subject: [PATCH 2/4] Fix deprecated warnings

---
 components/antlib/resources/global.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/antlib/resources/global.xml b/components/antlib/resources/global.xml
index f0cd93dd625..ae31c108654 100644
--- a/components/antlib/resources/global.xml
+++ b/components/antlib/resources/global.xml
@@ -495,14 +495,14 @@
         </macrodef>
 
         <macrodef name="tryEclipse">
-            <attribute name="settingsRef"/>
+            <attribute name="settingsRef" default="ivy.${ant.project.name}"/>
             <attribute name="filter" default="false"/>
             <sequential>
                 <trycatch>
                     <try>
                         <ivy:resolve file="test.xml" type="jar,bundle" conf="test" settingsRef="@{settingsRef}" log="quiet"/>
                         <taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
-                        <ivyeclipse conf="test" filter="@{filter}"/>
+                        <ivyeclipse conf="test" filter="@{filter}" settingsRef="@{settingsRef}"/>
                     </try>
                     <catch>
                         <echo>
@@ -514,7 +514,7 @@
                         </echo>
                         <ivy:resolve file="ivy.xml" type="jar,bundle" conf="build" settingsRef="@{settingsRef}" log="quiet"/>
                         <taskdef name="ivyeclipse" classname="IVY1016.EclipseClasspath" loaderref="ivy.loader"/>
-                        <ivyeclipse conf="build" filter="@{filter}"/>
+                        <ivyeclipse conf="build" filter="@{filter}" settingsRef="@{settingsRef}"/>
                     </catch>
                 </trycatch>
             </sequential>

From a2ee350996b68525329262b30ec8c4257d51424f Mon Sep 17 00:00:00 2001
From: Sebastien Besson <seb.besson@gmail.com>
Date: Wed, 1 Jul 2015 14:10:43 +0100
Subject: [PATCH 3/4] Include bundles in test-dist target

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 5c7660bc33b..8cd2f590061 100644
--- a/build.xml
+++ b/build.xml
@@ -398,7 +398,7 @@ To get started using Eclipse, execute "./build.py build-dev" and import the top-
     </target>
 
     <target name="test-dist" description="Copy test files into dist for further testing" depends="test-compile">
-        <ivy:resolve file="test.xml" type="jar" conf="test" settingsRef="ivy.toplevel" log="quiet"/>
+        <ivy:resolve file="test.xml" type="jar,bundle" conf="test" settingsRef="ivy.toplevel" log="quiet"/>
         <ivy:retrieve conf="test" pattern="${dist.dir}/lib/client/[artifact].[ext]" sync="false" log="quiet" settingsRef="ivy.toplevel"/>
     </target>
 

From 24c51f74ad4e0ab5446e1647d47c52815fa840bf Mon Sep 17 00:00:00 2001
From: Sebastien Besson <seb.besson@gmail.com>
Date: Wed, 1 Jul 2015 14:10:49 +0100
Subject: [PATCH 4/4] Cleanup comment

---
 components/tools/python.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/components/tools/python.xml b/components/tools/python.xml
index 606991fc83d..093513cb2d2 100644
--- a/components/tools/python.xml
+++ b/components/tools/python.xml
@@ -117,12 +117,6 @@ build_year = "${python_build_year}"
     </macrodef>
 
     <target name="python-install" unless="env.NOPYTHON">
-        <!-- The renaming which takes place here doesn't seem to work with eggs.
-        Rolling back to using the expanded directory
-        <installIvy/>
-        <ivy:resolve settingsRef="ivy.${ant.project.name}" file="${basedir}/ivy.xml" type="jar" log="quiet"/>
-        <publishArtifact pattern="dist/*.egg"/>
-        -->
         <copy todir="../target/lib/python">
             <fileset dir="${basedir}/build/lib" includes="**/*"/>
         </copy>