From 8ccb44200968ed48cd42bda26e6f8567abdd3a65 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 7 Apr 2016 12:06:16 +0300
Subject: [PATCH] Do not guard downloading artifacts for compiler tests with
 dependencies.properties

---
 compiler/tests-common/tests-common.iml |  4 ++--
 compiler/tests/compiler-tests.iml      |  4 ++--
 update_dependencies.xml                | 22 +++++++++++++---------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/compiler/tests-common/tests-common.iml b/compiler/tests-common/tests-common.iml
index 005d4f94777..6f5581d5ec0 100644
--- a/compiler/tests-common/tests-common.iml
+++ b/compiler/tests-common/tests-common.iml
@@ -41,7 +41,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dependencies/idea/idea-for-compiler-test/idea_rt.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/idea_rt.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -50,7 +50,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dependencies/idea/idea-for-compiler-test/openapi.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/openapi.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index b6326e543be..334d5a99231 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -42,7 +42,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dependencies/idea/idea-for-compiler-test/idea_rt.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/idea_rt.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -51,7 +51,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dependencies/idea/idea-for-compiler-test/openapi.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/openapi.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 5df26071b53..e9d927a5ee2 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -178,7 +178,7 @@
 
     </target>
 
-    <target name="fetch-third-party" depends="make-native-platform-uberjar">
+    <target name="fetch-third-party" depends="make-native-platform-uberjar,fetch-idea-artifacts-for-compiler-tests">
         <mkdir dir="dependencies"/>
         <mkdir dir="dependencies/download"/>
 
@@ -692,14 +692,6 @@
             <delete dir="@{download.dir}"/>
             <mkdir dir="@{download.dir}"/>
 
-            <!-- For running compiler tests with Java 1.6 -->
-            <mkdir dir="@{download.dir}/idea-for-compiler-test"/>
-            <local name="idea.for.compiler.testing.base.url"/>
-            <property name="idea.for.compiler.testing.base.url"
-                      value="https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJIdeaCe_OpenapiJar/idea-15.0.5"/>
-            <get src="${idea.for.compiler.testing.base.url}/idea_rt.jar" dest="@{download.dir}/idea-for-compiler-test/idea_rt.jar" usetimestamp="true"/>
-            <get src="${idea.for.compiler.testing.base.url}/openapi.jar" dest="@{download.dir}/idea-for-compiler-test/openapi.jar" usetimestamp="true"/>
-
             <property name="idea.id" value="idea${sdk.version.prefix}"/>
 
             <get src="@{base.repository.url}/ideaIC/@{idea.maven.version}/ideaIC-@{idea.maven.version}-sources.jar"
@@ -828,6 +820,18 @@
     -->
     <target name="fetch-annotations"/>
 
+    <target name="fetch-idea-artifacts-for-compiler-tests">
+        <!-- For running compiler tests with Java 1.6 -->
+        <local name="idea.for.compiler.testing.dir"/>
+        <property name="idea.for.compiler.testing.dir" value="dependencies/download/idea-for-compiler-test"/>
+        <mkdir dir="${idea.for.compiler.testing.dir}"/>
+        <local name="idea.for.compiler.testing.base.url"/>
+        <property name="idea.for.compiler.testing.base.url"
+                  value="https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJIdeaCe_OpenapiJar/idea-15.0.5"/>
+        <get src="${idea.for.compiler.testing.base.url}/idea_rt.jar" dest="${idea.for.compiler.testing.dir}/idea_rt.jar" usetimestamp="true"/>
+        <get src="${idea.for.compiler.testing.base.url}/openapi.jar" dest="${idea.for.compiler.testing.dir}/openapi.jar" usetimestamp="true"/>
+    </target>
+
     <target name="get_android_studio">
         <condition property="android.os.tag" value="windows">
             <os family="windows"/>