Merge pull request ome#3921 from dominikl/fix_eclipseproject_classpath

Allow to retrieve bundle in Ivy (eclipse project classpath)
melissalinkert · Jul 2, 2015 · bbf1be9 · bbf1be9
2 parents c8d9723 + 1eea61b
commit bbf1be9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/build.xml b/build.xml
@@ -395,7 +395,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>
 

diff --git 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" 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}"/>
+                        <ivyeclipse conf="test" filter="@{filter}" settingsRef="@{settingsRef}"/>
                     </try>
                     <catch>
                         <echo>
@@ -512,9 +512,9 @@
                         ***************************************************************************
 
                         </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}"/>
+                        <ivyeclipse conf="build" filter="@{filter}" settingsRef="@{settingsRef}"/>
                     </catch>
                 </trycatch>
             </sequential>

diff --git 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>