From e1c7ad50d6e7fac6b3dc62e11169a466bd0ca0bb Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 30 Sep 2014 12:59:37 +0400
Subject: [PATCH] More changes after replacing config directory

 - Plugin auto-enable script updated
 - Don't drop configured folder in update-dependencies
 - Drop test config and system folders in update-dependencies
---
 idea_runner/runner.xml  | 2 +-
 update_dependencies.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/idea_runner/runner.xml b/idea_runner/runner.xml
index fb229f7dbac..33e4096befa 100644
--- a/idea_runner/runner.xml
+++ b/idea_runner/runner.xml
@@ -3,7 +3,7 @@
     <property name="dependencies.dir" value="${basedir}/../dependencies" />
     <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${dependencies.dir}/ant-contrib.jar"/>
 
-    <property name="disable_plugins.file.path" value="${basedir}/../ideaSDK/config/disabled_plugins.txt"/>
+    <property name="disable_plugins.file.path" value="${basedir}/../ideaSDK/config-idea/disabled_plugins.txt"/>
     <available property="disable_plugins.found" file="${disable_plugins.file.path}"/>
 
     <if>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 46f2f2f35cc..bd890453f4d 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -257,8 +257,7 @@
 
                 <then>
                     <delete dir="ideaSDK" failonerror="false">
-                        <exclude name="config/**"/>
-                        <exclude name="system/**"/>
+                        <exclude name="config-idea/**"/>
                         <exclude name="system-idea/**"/>
                     </delete>