From 35bc3cd587eb31b9ecfee2602d512cba09897acf Mon Sep 17 00:00:00 2001
From: Erokhin Stanislav <Stanislav.Erokhin@jetbrains.com>
Date: Fri, 25 Oct 2013 19:45:22 +0400
Subject: [PATCH] Move ant from dependencies/ant -> dependencies/ant-1.7

---
 .idea/libraries/{ant.xml => ant_1_7.xml}             |  4 ++--
 build-tools/build-tools.iml                          |  2 +-
 build.xml                                            |  2 +-
 .../src/org/jetbrains/kotlin/AntTaskTest.java        |  2 +-
 update_dependencies.xml                              | 12 ++----------
 5 files changed, 7 insertions(+), 15 deletions(-)
 rename .idea/libraries/{ant.xml => ant_1_7.xml} (91%)

diff --git a/.idea/libraries/ant.xml b/.idea/libraries/ant_1_7.xml
similarity index 91%
rename from .idea/libraries/ant.xml
rename to .idea/libraries/ant_1_7.xml
index d27507728f0..c2543e21bb4 100644
--- a/.idea/libraries/ant.xml
+++ b/.idea/libraries/ant_1_7.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
-  <library name="ant">
+  <library name="ant-1.7">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/ant.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/ant-1.7/lib/ant.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/build-tools/build-tools.iml b/build-tools/build-tools.iml
index ef529099fb1..f0295ced90b 100644
--- a/build-tools/build-tools.iml
+++ b/build-tools/build-tools.iml
@@ -13,7 +13,7 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="ant" level="project" />
+    <orderEntry type="library" name="ant-1.7" level="project" />
   </component>
 </module>
 
diff --git a/build.xml b/build.xml
index 8ab9f20f35a..61d43065f9d 100644
--- a/build.xml
+++ b/build.xml
@@ -443,7 +443,7 @@
             <classpath>
                 <fileset dir="${kotlin-home}/lib" includes="kotlin-compiler.jar"/>
                 <file file="${bootstrap.runtime}"/>
-                <fileset dir="${basedir}/dependencies" includes="ant.jar"/>
+                <fileset dir="${basedir}/dependencies/ant-1.7/lib" includes="ant.jar"/>
             </classpath>
         </javac2>
 
diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java
index 8425c0bfd2b..0c6f66f2faa 100644
--- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java
+++ b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java
@@ -70,6 +70,6 @@ public class AntTaskTest extends KotlinIntegrationTestBase {
     }
 
     private static String getAntHome() {
-        return getKotlinProjectHome().getAbsolutePath() + File.separator + "dependencies" + File.separator + "ant";
+        return getKotlinProjectHome().getAbsolutePath() + File.separator + "dependencies" + File.separator + "ant-1.7";
     }
 }
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 32ee51e15ec..a781425c2c9 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -128,17 +128,9 @@
         <get src="http://archive.apache.org/dist/ant/source/apache-ant-1.7.0-src.zip"
              dest="dependencies/apache-ant-1.7.0-src.zip" usetimestamp="true"/>
 
-        <delete file="dependencies/ant.jar" failonerror="false"/>
-        <untar src="dependencies/download/apache-ant-1.7.0-bin.tar.gz" dest="dependencies" compression="gzip">
-            <patternset>
-                <include name="apache-ant-1.7.0/lib/ant.jar"/>
-            </patternset>
-            <mapper type="flatten"/>
-        </untar>
-
-        <delete dir="dependencies/ant" failonerror="false"/>
+        <delete dir="dependencies/ant-1.7" failonerror="false"/>
         <untar src="dependencies/download/apache-ant-1.7.0-bin.tar.gz" dest="dependencies" compression="gzip"/>
-        <move file="dependencies/apache-ant-1.7.0" tofile="dependencies/ant"/>
+        <move file="dependencies/apache-ant-1.7.0" tofile="dependencies/ant-1.7"/>
 
         <!-- dx.jar -->
         <get-maven-library prefix="com/google/android/tools" lib="dx" version="1.7" target.jar.name.base="dx"/>