From f08c9d9815a31b6795698e9751d1923a7a61e8b3 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 10 Dec 2014 15:12:11 +0300
Subject: [PATCH] Rename module build-tools -> ant

---
 .idea/modules.xml                                   |  2 +-
 build-tools/build-tools.iml => ant/ant.iml          |  6 ++----
 .../jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt   |  0
 .../jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt  |  0
 .../jet/buildtools/ant/KotlinCompilerAdapter.java   |  0
 .../jet/buildtools/ant/KotlinCompilerBaseTask.kt    |  0
 .../src/org/jetbrains/jet/buildtools/ant/antlib.xml |  0
 build.xml                                           | 13 ++++++-------
 .../Kotlin/0_Welcome.confluence                     |  2 +-
 9 files changed, 10 insertions(+), 13 deletions(-)
 rename build-tools/build-tools.iml => ant/ant.iml (80%)
 rename {build-tools/ant => ant}/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt (100%)
 rename {build-tools/ant => ant}/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt (100%)
 rename {build-tools/ant => ant}/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java (100%)
 rename {build-tools/ant => ant}/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt (100%)
 rename {build-tools/ant => ant}/src/org/jetbrains/jet/buildtools/ant/antlib.xml (100%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 5d47b3d4413..71d1bb10964 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,10 +5,10 @@
       <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
       <module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
+      <module fileurl="file://$PROJECT_DIR$/ant/ant.iml" filepath="$PROJECT_DIR$/ant/ant.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/build-tools/build-tools.iml" filepath="$PROJECT_DIR$/build-tools/build-tools.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/builtins/builtins.iml" filepath="$PROJECT_DIR$/core/builtins/builtins.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" filepath="$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" group="compiler/cli" />
diff --git a/build-tools/build-tools.iml b/ant/ant.iml
similarity index 80%
rename from build-tools/build-tools.iml
rename to ant/ant.iml
index f0295ced90b..50e8f687d41 100644
--- a/build-tools/build-tools.iml
+++ b/ant/ant.iml
@@ -3,8 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/core/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/ant/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -15,5 +14,4 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="ant-1.7" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/build-tools/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt b/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt
similarity index 100%
rename from build-tools/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt
rename to ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt
diff --git a/build-tools/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt b/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt
similarity index 100%
rename from build-tools/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt
rename to ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt
diff --git a/build-tools/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java b/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java
similarity index 100%
rename from build-tools/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java
rename to ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java
diff --git a/build-tools/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt b/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt
similarity index 100%
rename from build-tools/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt
rename to ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt
diff --git a/build-tools/ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml b/ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml
similarity index 100%
rename from build-tools/ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml
rename to ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml
diff --git a/build.xml b/build.xml
index 0d9d07cf0d2..a3bde7b1a49 100644
--- a/build.xml
+++ b/build.xml
@@ -560,14 +560,13 @@
     </target>
 
     <target name="ant-tools">
-        <cleandir dir="${output}/classes/buildTools"/>
-        <javac2 destdir="${output}/classes/buildTools" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
+        <cleandir dir="${output}/classes/ant"/>
+        <javac2 destdir="${output}/classes/ant" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
             <withKotlin externalannotations="${external.annotations.path}"/>
             <src>
-                <dirset dir="${basedir}/build-tools">
-                    <include name="core/src"/>
-                    <include name="ant/src"/>
+                <dirset dir="${basedir}/ant">
+                    <include name="src"/>
                 </dirset>
             </src>
             <compilerarg value="-Xlint:all"/>
@@ -579,8 +578,8 @@
         </javac2>
 
         <jar destfile="${kotlin-home}/lib/kotlin-ant.jar">
-            <fileset dir="${output}/classes/buildTools"/>
-            <fileset dir="${basedir}/build-tools/ant/src" includes="**/*.xml"/>
+            <fileset dir="${output}/classes/ant"/>
+            <fileset dir="${basedir}/ant/src" includes="**/*.xml"/>
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
 
             <manifest>
diff --git a/docs/confluence.jetbrains.com/Kotlin/0_Welcome.confluence b/docs/confluence.jetbrains.com/Kotlin/0_Welcome.confluence
index 0fa6961771d..c9839e2cbab 100644
--- a/docs/confluence.jetbrains.com/Kotlin/0_Welcome.confluence
+++ b/docs/confluence.jetbrains.com/Kotlin/0_Welcome.confluence
@@ -34,7 +34,7 @@ The IDE plugin requires the latest EAP build of [IntelliJ IDEA 11.1|http://eap.j
 
 h3. Kontributions
 * [stdlib|https://github.com/JetBrains/kotlin/tree/master/stdlib] by James Strachan
-* [Ant, Maven etc integration|https://github.com/JetBrains/kotlin/tree/master/build-tools] by Evgeny Goldin
+* [Ant, Maven etc integration|https://github.com/JetBrains/kotlin/tree/master/ant] by Evgeny Goldin
 * [Aztec|https://github.com/kondratovich/aztec] by Andrew Kondratovich
 * [Be the next Kontributor!|http://blog.jetbrains.com/kotlin/2012/03/contributing-to-kotlin/]
 {column}