Fix runtime copying for IDEA run configuration

- 'overwrite' is false by default, so now it's set to true explicitly
- copy the runtime to all other plugins as well because runtimes from those
  plugins sometimes appear before the Kotlin one
This commit is contained in:
Alexander Udalov
2015-10-15 18:44:38 +03:00
parent f62128bdcd
commit 74cd449d86
2 changed files with 9 additions and 4 deletions
+6 -2
View File
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<component name="ArtifactManager">
<artifact name="KotlinAndroidExtensions">
<output-path>$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions</output-path>
<properties id="ant-postprocessing">
<options enabled="true">
<file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
<target>copy-runtime-for-idea-plugin</target>
</options>
</properties>
<root id="root">
<element id="directory" name="lib">
<element id="archive" name="kotlin-android-extensions.jar">
@@ -15,7 +20,6 @@
<element id="archive" name="android-compiler-plugin.jar">
<element id="module-output" name="android-compiler-plugin" />
</element>
<element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-runtime.jar" />
</element>
</root>
</artifact>
+3 -2
View File
@@ -48,8 +48,9 @@
</condition>
<!--suppress AntResolveInspection -->
<copy file="${runtime.to.copy}" tofile="${artifact.output.path}/lib/kotlin-runtime.jar"/>
<copy file="${reflect.to.copy}" tofile="${artifact.output.path}/lib/kotlin-reflect.jar"/>
<copy file="${runtime.to.copy}" tofile="${artifact.output.path}/lib/kotlin-runtime.jar" overwrite="true"/>
<!--suppress AntResolveInspection -->
<copy file="${reflect.to.copy}" tofile="${artifact.output.path}/lib/kotlin-reflect.jar" overwrite="true"/>
</target>
<target name="copy-runtime-for-jps-plugin" if="bootstrap.or.local.build">