From 73100134f9d4052df31cb58b4cd4569e5a445624 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Mon, 30 Jan 2012 21:40:36 +0400
Subject: [PATCH] Plugin&Tests: Build kotlinc by calling to build.xml rather
 than depending on Dist

---
 .idea/artifacts/KotlinPlugin.xml |  2 +-
 bootstrap.xml                    | 13 ++++++++-----
 build.xml                        |  1 -
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index b9cb21581e9..8dcb567eda4 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -27,7 +27,7 @@
           </element>
         </element>
         <element id="file-copy" path="$PROJECT_DIR$/out/build.txt" />
-        <element id="dir-copy" path="$PROJECT_DIR$/bootstrap.compiler" />
+        <element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />
       </element>
     </root>
   </artifact>
diff --git a/bootstrap.xml b/bootstrap.xml
index 69566e9a08e..6f8489a54a2 100644
--- a/bootstrap.xml
+++ b/bootstrap.xml
@@ -1,4 +1,6 @@
-<project name="Jet CI Bootstrap" default="unzipDependencies">
+<project name="Jet CI Bootstrap" default="CEBuild">
+    <import file="build.xml" optional="false"/>
+
     <macrodef name="echoprop">
         <attribute name="prop"/>
         <sequential>
@@ -20,11 +22,12 @@
         <unzip dest="ideaSDK">
             <fileset dir="ideaSDK" includes="ideaIC*.zip"/>
         </unzip>
-        <unzip dest="bootstrap.compiler">
-            <fileset dir="bootstrap.compiler" includes="kotlin*.zip"/>
-        </unzip>
 
         <delete dir="ideaSDK" includes="ideaIC*.zip"/>
-        <delete dir="bootstrap.compiler" includes="kotlin*.zip"/>
     </target>
+
+    <target name="CEBuild" depends="unzipDependencies, dist">
+
+    </target>
+
 </project>
diff --git a/build.xml b/build.xml
index 5ebced33370..2b31fc8534e 100644
--- a/build.xml
+++ b/build.xml
@@ -107,7 +107,6 @@
 
     <target name="clean">
         <delete dir="${output}"/>
-        <delete dir="${basedir}/bootstrap.compiler"/>
     </target>
 
     <target name="dist" depends="init,jarRT,jarJDKHeaders,jar,buildToolsJar">