Skip to content

Commit

Permalink
Move get-protobuf later in update_dependencies
Browse files Browse the repository at this point in the history
It invokes kotlinc, so should happen after the bootstrap compiler is downloaded
  • Loading branch information
udalov committed Jun 17, 2016
1 parent 5ccbf47 commit 3fa87fe
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions update_dependencies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,6 @@
<get src="http://jarjar.googlecode.com/files/jarjar-1.4.jar" dest="${dependencies}/download/jarjar-1.4.jar" usetimestamp="true"/>
<copy file="${dependencies}/download/jarjar-1.4.jar" tofile="${dependencies}/jarjar.jar" overwrite="true"/>

<!-- Protocol Buffers -->
<get-protobuf-and-rename-packages/>

<!-- ant 1.8.2 -->
<get-ant-library version="1.8.2" folderName="ant-1.8"/>

Expand Down Expand Up @@ -307,7 +304,6 @@
<available file="${dependencies}/bootstrap-compiler/Kotlin" property="have.bootstrap.compiler"/>
<fail message="Bootstrap compiler is expected to be downloaded to '${dependencies}/bootstrap-compiler' by TeamCity" unless:set="have.bootstrap.compiler"/>
<echo message="Bootstrap compiler found in '${dependencies}/bootstrap-compiler'" if:set="have.bootstrap.compiler"/>

</sequential>

<local name="bootstrap.need.chmod"/>
Expand All @@ -324,6 +320,8 @@
<arg line="-name 'kotlin*' ! -name '*.bat' -exec chmod a+x '{}' ;"/>
</exec>

<get-protobuf-and-rename-packages/>

<download-or-build-markdown-parser/>
</target>

Expand Down

0 comments on commit 3fa87fe

Please sign in to comment.