Plugin&Tests: Build kotlinc by calling to build.xml rather than depending on Dist

2012-01-30 21:40:36 +04:00
parent d14e38c7d6
commit 73100134f9
3 changed files with 9 additions and 7 deletions
@@ -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>
@@ -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>
@@ -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">