--- a/buildframework/helium/builder/python/macros.ant.xml	Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/builder/python/macros.ant.xml	Fri Aug 13 14:59:05 2010 +0300
@@ -30,11 +30,17 @@
 
     <target name="resolve">
         <mkdir dir="${lib.dir}" />
+        <mkdir dir="${lib.dir}/zipsafe" />
+        <mkdir dir="${lib.dir}/zipnotsafe" />
+        <delete dir="${lib.dir}/zipnotsafe" includes="**/*" />
+        
         <ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
         
         <!-- the call to resolve is not mandatory, retrieve makes an implicit call if we don't -->
         <ivy:resolve file="${ivy.file}" log="download-only"/>
-        <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" log="download-only"/>
+        <ivy:retrieve pattern="${lib.dir}/zipsafe/[artifact].[ext]" type="egg" log="download-only"/>
+        <ivy:retrieve pattern="${lib.dir}/zipsafe/[artifact].[ext]" type="py" log="download-only"/>
+        <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar" log="download-only"/>
     </target>
 
     <target name="checkstyle"/>