jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-04 15:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

download Android Studio 2.3

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-06-15 18:42:45 +02:00
committed by Dmitry Jemerov
parent c6000f6ab2
commit a064a570c7
1 changed files with 124 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
update_dependencies.xml
View File

@@ -5,6 +5,9 @@
<property name="ideaVersion" value="162-SNAPSHOT"/>
<property name="idea.kotlin.branch" value="rc"/>
<property name="android.studio.version" value="2.3.0."/>
<property name="android.studio.build.number" value="162.3454121"/>
<property name="android.studio.intellij-core.build.number" value="162.2228.14"/>
<property name="kotlin.bootstrap.branch" value="1.0.4"/>
<property name="kotlin.bootstrap.branch.locator" value=",branch:1.0.4"/>
@@ -50,6 +53,9 @@
idea.maven.version="${ideaVersion}"/>
</target>
<target name="update_android_studio" depends="fetch-third-party,fetch-annotations,get_android_studio"
description="Update dependencies and Android Studio"/>
<!--<target name="update_teamcity" depends="fetch-third-party,fetch-annotations">-->
<!--<execute_update_with_idea_teamcity_artifacts-->
<!--teamcity.server.url="https://teamcity.jetbrains.com"-->
@@ -647,45 +653,9 @@
tofile="@{core-analysis}/intellij-core-analysis.jar"
verbose="true"/>
<mkdir dir="@{core}"/>
<copy todir="@{core}" flatten="true" verbose="true">
<resources>
<file file="@{download.dir.intellij-core}/intellij-core.jar"/>
<file file="@{download.dir.intellij-core}/annotations.jar"/>
<file file="@{download.dir.intellij-core}/guava-17.0.jar"/>
<file file="@{download.dir.intellij-core}/picocontainer.jar"/>
<file file="@{download.dir.intellij-core}/trove4j.jar"/>
<copy_intellij_core_files core="@{core}" download.dir.intellij-core="@{download.dir.intellij-core}" idea.dir="@{idea.dir}" />
<file file="@{idea.dir}/lib/jdom.jar"/>
<file file="@{idea.dir}/lib/jna.jar"/>
<file file="@{idea.dir}/lib/log4j.jar"/>
<file file="@{idea.dir}/lib/xstream-1.4.8.jar"/>
<file file="@{idea.dir}/lib/xpp3-1.1.4-min.jar"/>
<file file="@{idea.dir}/lib/asm-all.jar"/>
<file file="@{idea.dir}/lib/snappy-in-java-0.5.1.jar"/>
<!-- TODO temporary workaround since util-rt is not packaged into intellij-core.jar -->
<file file="@{idea.dir}/lib/util.jar"/>
</resources>
</copy>
<mkdir dir="@{jps}"/>
<copy todir="@{jps}" flatten="true" verbose="true">
<resources>
<file file="@{download.dir.jps-standalone}/groovy-jps-plugin.jar"/>
<file file="@{download.dir.jps-standalone}/groovy_rt.jar"/>
<file file="@{download.dir.jps-standalone}/jdom.jar"/>
<file file="@{download.dir.jps-standalone}/jgoodies-forms.jar"/>
<file file="@{download.dir.jps-standalone}/jna.jar"/>
<file file="@{download.dir.jps-standalone}/jps-builders.jar"/>
<file file="@{download.dir.jps-standalone}/jps-model.jar"/>
<file file="@{download.dir.jps-standalone}/log4j.jar"/>
<file file="@{download.dir.jps-standalone}/nanoxml-2.2.3.jar"/>
<file file="@{download.dir.jps-standalone}/trove4j.jar"/>
<file file="@{download.dir.jps-standalone}/ui-designer-jps-plugin.jar"/>
<file file="@{download.dir.jps-standalone}/util.jar"/>
</resources>
</copy>
<copy_intellij_jps_files download.dir.jps-standalone="@{download.dir.jps-standalone}" jps="@{jps}" />
<mkdir dir="@{jps-test}"/>
<copy file="@{download.file.archive.jps-build-test}" tofile="@{jps-test}/jps-build-test.jar"/>
@@ -696,6 +666,63 @@
</sequential>
</macrodef>
<macrodef name="copy_intellij_core_files">
<attribute name="core" />
<attribute name="download.dir.intellij-core" />
<attribute name="idea.dir" />
<attribute name="xstream.version" default="1.4.3" />
<sequential>
<mkdir dir="@{core}"/>
<copy todir="@{core}" flatten="true" verbose="true">
<resources>
<file file="@{download.dir.intellij-core}/intellij-core.jar"/>
<file file="@{download.dir.intellij-core}/annotations.jar"/>
<file file="@{download.dir.intellij-core}/guava-17.0.jar"/>
<file file="@{download.dir.intellij-core}/picocontainer.jar"/>
<file file="@{download.dir.intellij-core}/trove4j.jar"/>
<file file="@{idea.dir}/lib/jdom.jar"/>
<file file="@{idea.dir}/lib/jna.jar"/>
<file file="@{idea.dir}/lib/log4j.jar"/>
<file file="@{idea.dir}/lib/xstream-1.4.8.jar"/>
<file file="@{idea.dir}/lib/xpp3-1.1.4-min.jar"/>
<file file="@{idea.dir}/lib/jsr166e.jar"/>
<file file="@{idea.dir}/lib/asm-all.jar"/>
<file file="@{idea.dir}/lib/snappy-in-java-0.3.1.jar"/>
<!-- TODO temporary workaround since util-rt is not packaged into intellij-core.jar -->
<file file="@{idea.dir}/lib/util.jar"/>
</resources>
</copy>
</sequential>
</macrodef>
<macrodef name="copy_intellij_jps_files">
<attribute name="jps" />
<attribute name="download.dir.jps-standalone" />
<sequential>
<mkdir dir="@{jps}"/>
<copy todir="@{jps}" flatten="true" verbose="true">
<resources>
<file file="@{download.dir.jps-standalone}/groovy-jps-plugin.jar"/>
<file file="@{download.dir.jps-standalone}/groovy_rt.jar"/>
<file file="@{download.dir.jps-standalone}/jdom.jar"/>
<file file="@{download.dir.jps-standalone}/jgoodies-forms.jar"/>
<file file="@{download.dir.jps-standalone}/jna.jar"/>
<file file="@{download.dir.jps-standalone}/jps-builders.jar"/>
<file file="@{download.dir.jps-standalone}/jps-model.jar"/>
<file file="@{download.dir.jps-standalone}/log4j.jar"/>
<file file="@{download.dir.jps-standalone}/nanoxml-2.2.3.jar"/>
<file file="@{download.dir.jps-standalone}/trove4j.jar"/>
<file file="@{download.dir.jps-standalone}/ui-designer-jps-plugin.jar"/>
<file file="@{download.dir.jps-standalone}/util.jar"/>
</resources>
</copy>
</sequential>
</macrodef>
<macrodef name="download_and_update_idea">
<attribute name="idea.maven.version"/>
<attribute name="base.repository.url"/>
@@ -855,6 +882,16 @@
<os family="mac"/>
</condition>
<condition property="strip.dirs.count" value="2">
<os family="mac"/>
</condition>
<condition property="strip.dirs.count" value="1">
<not>
<os family="mac"/>
</not>
</condition>
<condition property="android.os.tag" value="linux">
<and>
<os family="unix"/>
@@ -902,19 +939,20 @@
<property name="android.file.name" value="android-studio-ide-${android.build.version}-${android.os.tag}.zip"/>
<property name="android.studio.url"
value="http://dl.google.com/dl/android/studio/ide-zips/${android.version}/${android.file.name}"/>
<property name="android.destination.dir" value="android-studio/sdk"/>
<property name="android.download.dir" value="${dependencies}/android-studio"/>
<property name="android.destination.dir" value="ideaSDK"/>
<mkdir dir="${dependencies}/download"/>
<mkdir dir="${android.download.dir}"/>
<get src="${android.studio.url}" dest="${dependencies}/download" usetimestamp="true"/>
<get src="${android.studio.url}" dest="${android.download.dir}" usetimestamp="true"/>
<delete dir="${android.destination.dir}" failonerror="false" includeemptydirs="true">
<exclude name="config/**"/>
<exclude name="system/**"/>
</delete>
<unzip src="${dependencies}/download/${android.file.name}" dest="${android.destination.dir}">
<cutdirsmapper dirs="1"/>
<unzip src="${android.download.dir}/${android.file.name}" dest="${android.destination.dir}">
<cutdirsmapper dirs="${strip.dirs.count}"/>
</unzip>
<local name="android.studio.mac"/>
@@ -932,7 +970,7 @@
<arg path="${android.destination.dir}/bin/fsnotifier"/>
<arg path="${android.destination.dir}/bin/inspect.sh"/>
<arg path="${android.destination.dir}/bin/printenv.py"/>
<arg path="${android.destination.dir}/bin/update_studio.sh"/>
<arg path="${android.destination.dir}/bin/restarter"/>
</exec>
<exec executable="chmod" if:set="android.studio.linux">
@@ -941,8 +979,49 @@
<arg path="${android.destination.dir}/bin/fsnotifier64"/>
<arg path="${android.destination.dir}/bin/inspect.sh"/>
<arg path="${android.destination.dir}/bin/studio.sh"/>
<arg path="${android.destination.dir}/bin/update_studio.sh"/>
</exec>
<!--
This one needs to be deleted because otherwise it gets onto the classpath
together with junit-4.10.jar and the classloading goes crazy that breaks
many nice features of IDEA including diffs in the test console.
-->
<delete file="${android.destination.dir}/lib/junit.jar"/>
<!--
Plugin depends on newer runtime and reflect jar from our bootstrap compiler.
Avoid depending on old runtime during build phase but attach original runtime when idea starts.
-->
<mkdir dir="${android.destination.dir}/idea-kotlin-runtime"/>
<move file="${android.destination.dir}/lib/kotlin-runtime.jar" todir="${android.destination.dir}/idea-kotlin-runtime"/>
<move file="${android.destination.dir}/lib/kotlin-reflect.jar" todir="${android.destination.dir}/idea-kotlin-runtime"/>
<property name="as.core.dir" value="${android.destination.dir}/core"/>
<property name="as.lib.dir" value="${android.destination.dir}/lib"/>
<property name="base.repository.url" value="https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea"/>
<get
src="${base.repository.url}/intellij-core/${android.studio.intellij-core.build.number}/intellij-core-${android.studio.intellij-core.build.number}.zip"
dest="${android.download.dir}/intellij-core-${android.studio.intellij-core.build.number}.zip"
usetimestamp="true"/>
<unzip src="${android.download.dir}/intellij-core-${android.studio.intellij-core.build.number}.zip" dest="${android.download.dir}/intellij-core" />
<download_and_unzip
dir="${android.download.dir}/jps-standalone"
url="${base.repository.url}/jps-standalone/${android.studio.intellij-core.build.number}/jps-standalone-${android.studio.intellij-core.build.number}.zip"
usetimestamp="true"/>
<copy_intellij_core_files idea.dir="${android.destination.dir}"
download.dir.intellij-core="${android.download.dir}/intellij-core"
core="${android.destination.dir}/core"
xstream.version="1.4.8" />
<copy_intellij_jps_files jps="${android.destination.dir}/jps" download.dir.jps-standalone="${android.download.dir}/jps-standalone" />
<mkdir dir="${android.destination.dir}/core-analysis"/>
<copy file="${android.download.dir}/intellij-core/intellij-core-analysis.jar"
tofile="${android.destination.dir}/core-analysis/intellij-core-analysis.jar"/>
</target>
<target name="override-version">