azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not guard downloading artifacts for compiler tests with dependencies.properties

Browse Source
This commit is contained in:
Nikolay Krasko
2016-04-07 12:06:16 +03:00
parent 47c7181f2a
commit 8ccb442009
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests-common.iml
+2 -2
View File
@@ -41,7 +41,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <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> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@@ -50,7 +50,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <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> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
compiler/tests/compiler-tests.iml
+2 -2
View File
@@ -42,7 +42,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <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> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@@ -51,7 +51,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <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> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
update_dependencies.xml
+13 -9
View File
@@ -178,7 +178,7 @@
</target> </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"/>
<mkdir dir="dependencies/download"/> <mkdir dir="dependencies/download"/>
@@ -692,14 +692,6 @@
<delete dir="@{download.dir}"/> <delete dir="@{download.dir}"/>
<mkdir 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}"/> <property name="idea.id" value="idea${sdk.version.prefix}"/>
<get src="@{base.repository.url}/ideaIC/@{idea.maven.version}/ideaIC-@{idea.maven.version}-sources.jar" <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-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"> <target name="get_android_studio">
<condition property="android.os.tag" value="windows"> <condition property="android.os.tag" value="windows">
<os family="windows"/> <os family="windows"/>