Always download bootstrap compiler to "dependencies\bootstrap-compiler"

This commit is contained in:
Nikolay Krasko
2015-04-14 21:38:30 +03:00
parent 1c4335ec25
commit e9fcdec3b0
+23 -1
View File
@@ -214,12 +214,19 @@
<mapper type="flatten"/> <mapper type="flatten"/>
</unzip> </unzip>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
<!-- Bootstrap compiler --> <!-- Bootstrap compiler -->
<if>
<not>
<isset property="teamcity.version"/>
</not>
<then>
<!-- Download bootstrap compiler for local build -->
<get src="https://teamcity.jetbrains.com/guestAuth/repository/download/bt345/bootstrap.tcbuildtag/kotlin-plugin-{build.number}.zip" <get src="https://teamcity.jetbrains.com/guestAuth/repository/download/bt345/bootstrap.tcbuildtag/kotlin-plugin-{build.number}.zip"
dest="dependencies/download/bootstrap-compiler.zip" usetimestamp="true"/> dest="dependencies/download/bootstrap-compiler.zip" usetimestamp="true"/>
<delete dir="dependencies/bootstrap-compiler" failonerror="false"/> <delete dir="dependencies/bootstrap-compiler" failonerror="false"/>
<unzip src="dependencies/download/bootstrap-compiler.zip" dest="dependencies/bootstrap-compiler"/> <unzip src="dependencies/download/bootstrap-compiler.zip" dest="dependencies/bootstrap-compiler"/>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
<if> <if>
<matches pattern="mac\.zip|tar\.gz" string="${os.tag}"/> <matches pattern="mac\.zip|tar\.gz" string="${os.tag}"/>
<then> <then>
@@ -230,6 +237,21 @@
</exec> </exec>
</then> </then>
</if> </if>
</then>
<else>
<!-- Teamcity should provide bootstrap compiler with dependency feature -->
<if>
<not>
<and>
<available file="dependencies/bootstrap-compiler/Kotlin"/>
</and>
</not>
<then>
<fail message="Bootstrap compiler is expected to be downloaded to 'dependencies/bootstrap-compiler' by TeamCity"/>
</then>
</if>
</else>
</if>
<!-- Markdown parser --> <!-- Markdown parser -->
<get src="https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/.lastFinished/markdown_jar/markdown.jar" <get src="https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/.lastFinished/markdown_jar/markdown.jar"