From edb76a898b9660126f197cfc98c50e34b98a7892 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 18 Nov 2015 17:17:45 +0300
Subject: [PATCH] fixed updating from sources: Kotlin JARs should not be added
 download_kotlin.gant classpath because this may lock them and the scripts
 will fail to updated them

---
 build/gant.xml   | 9 +++++----
 build/update.xml | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/gant.xml b/build/gant.xml
index db611c2c56b1..fe8e3bbf0f74 100644
--- a/build/gant.xml
+++ b/build/gant.xml
@@ -1,5 +1,6 @@
-<project name="Test gant invocation from Ant script" default="doGant">
+<project name="Test gant invocation from Ant script" default="doGant" xmlns:if="ant:if">
   <dirname property="build.dir" file="${ant.file}"/>
+  <property name="include.kotlin.jars.to.classpath" value="true"/>
   <property name="project.home" value="${build.dir}/.."/>
   <property name="gant.home" value="${project.home}/build/lib/gant"/>
   <property name="idea.lib" value="${project.home}/lib"/>
@@ -19,13 +20,13 @@
     </fileset>
     <pathelement path="${project.home}/build/groovy"/>
     <fileset file="${project.home}/jps/lib/optimizedFileManager.jar"/>
-    <fileset dir="${project.home}/build/kotlinc/jps" erroronmissingdir="false">
+    <fileset dir="${project.home}/build/kotlinc/jps" erroronmissingdir="false" if:true="${include.kotlin.jars.to.classpath}">
       <include name="*.jar"/>
     </fileset>
-    <fileset dir="${project.home}/build/kotlinc/lib" erroronmissingdir="false">
+    <fileset dir="${project.home}/build/kotlinc/lib" erroronmissingdir="false" if:true="${include.kotlin.jars.to.classpath}">
       <include name="kotlin-runtime.jar"/>
     </fileset>
-    <fileset dir="${project.home}/build/kotlinc/plugin/Kotlin/lib" erroronmissingdir="false">
+    <fileset dir="${project.home}/build/kotlinc/plugin/Kotlin/lib" erroronmissingdir="false" if:true="${include.kotlin.jars.to.classpath}">
       <include name="kotlin-plugin.jar"/>
     </fileset>
     <fileset dir="${idea.lib}">
diff --git a/build/update.xml b/build/update.xml
index 84f918f3fa0a..9de0dff64d9f 100644
--- a/build/update.xml
+++ b/build/update.xml
@@ -28,6 +28,7 @@
       <java classname="org.apache.tools.ant.Main" fork="true" failonerror="true" dir="${project.home}">
         <sysproperty key="workIdeaHome" value="${work.idea.home}"/>
         <sysproperty key="gant.script" value="${project.home}/build/scripts/download_kotlin.gant"/>
+        <sysproperty key="include.kotlin.jars.to.classpath" value="false"/>
         <classpath>
           <fileset dir="${project.home}/lib/ant/lib">
             <include name="*.jar"/>