Plugin&Tests: Build kotlinc by calling to build.xml rather than depending on Dist
This commit is contained in:
Generated
+1
-1
@@ -27,7 +27,7 @@
|
|||||||
</element>
|
</element>
|
||||||
</element>
|
</element>
|
||||||
<element id="file-copy" path="$PROJECT_DIR$/out/build.txt" />
|
<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>
|
</element>
|
||||||
</root>
|
</root>
|
||||||
</artifact>
|
</artifact>
|
||||||
|
|||||||
+8
-5
@@ -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">
|
<macrodef name="echoprop">
|
||||||
<attribute name="prop"/>
|
<attribute name="prop"/>
|
||||||
<sequential>
|
<sequential>
|
||||||
@@ -20,11 +22,12 @@
|
|||||||
<unzip dest="ideaSDK">
|
<unzip dest="ideaSDK">
|
||||||
<fileset dir="ideaSDK" includes="ideaIC*.zip"/>
|
<fileset dir="ideaSDK" includes="ideaIC*.zip"/>
|
||||||
</unzip>
|
</unzip>
|
||||||
<unzip dest="bootstrap.compiler">
|
|
||||||
<fileset dir="bootstrap.compiler" includes="kotlin*.zip"/>
|
|
||||||
</unzip>
|
|
||||||
|
|
||||||
<delete dir="ideaSDK" includes="ideaIC*.zip"/>
|
<delete dir="ideaSDK" includes="ideaIC*.zip"/>
|
||||||
<delete dir="bootstrap.compiler" includes="kotlin*.zip"/>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
<target name="CEBuild" depends="unzipDependencies, dist">
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -107,7 +107,6 @@
|
|||||||
|
|
||||||
<target name="clean">
|
<target name="clean">
|
||||||
<delete dir="${output}"/>
|
<delete dir="${output}"/>
|
||||||
<delete dir="${basedir}/bootstrap.compiler"/>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="dist" depends="init,jarRT,jarJDKHeaders,jar,buildToolsJar">
|
<target name="dist" depends="init,jarRT,jarJDKHeaders,jar,buildToolsJar">
|
||||||
|
|||||||
Reference in New Issue
Block a user