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

Refactoring: extract macrodef

Browse Source
This commit is contained in:
Nikolay Krasko
2015-01-13 18:22:26 +03:00
parent 23f2e08f0c
commit 25794beb56
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update_dependencies.xml
+27 -26
View File
@@ -21,35 +21,15 @@
<property name="idea.sdk.fetch.needed" value="true"/> <property name="idea.sdk.fetch.needed" value="true"/>
<target name="update" depends="fetch-third-party,fetch-annotations" description="Update dependencies from public server"> <target name="update" depends="fetch-third-party,fetch-annotations" description="Update dependencies from public server">
<loadresource property="public.buildserver.build.id"> <execute_update_with_id_resolve
<url url="https://teamcity.jetbrains.com/guestAuth/app/rest/builds/?locator=buildType:bt410,status:SUCCESS,lookupLimit:1,branch:idea/${ideaVersion}"/> teamcity.server.url="https://teamcity.jetbrains.com"
<filterchain> build.locator.request="buildType:bt410,status:SUCCESS,lookupLimit:1,branch:idea/${ideaVersion}"/>
<tokenfilter>
<filetokenizer/>
<replaceregex pattern="^(.*)\sid=&quot;(\d+)&quot;(.*)$" replace="\2" flags="s"/>
</tokenfilter>
</filterchain>
</loadresource>
<echo message="IDEA build id: ${public.buildserver.build.id}"/>
<execute_update base.url="https://teamcity.jetbrains.com/guestAuth/app/rest/builds/id:${public.buildserver.build.id}"/>
</target> </target>
<target name="jb_update" depends="fetch-third-party,fetch-annotations" description="Update dependencies from internal server"> <target name="jb_update" depends="fetch-third-party,fetch-annotations" description="Update dependencies from internal server">
<loadresource property="jb.buildserver.build.id"> <execute_update_with_id_resolve
<url url="http://buildserver.labs.intellij.net/guestAuth/app/rest/builds/?locator=buildType:bt3498,status:SUCCESS,lookupLimit:1,branch:/idea/${ideaVersion}"/> teamcity.server.url="http://buildserver.labs.intellij.net"
<filterchain> build.locator.request="buildType:bt3498,status:SUCCESS,lookupLimit:1,branch:/idea/${ideaVersion}"/>
<tokenfilter>
<filetokenizer/>
<replaceregex pattern="^(.*)\sid=&quot;(\d+)&quot;(.*)$" replace="\2" flags="s"/>
</tokenfilter>
</filterchain>
</loadresource>
<echo message="IDEA build id: ${jb.buildserver.build.id}"/>
<execute_update base.url="http://buildserver.labs.intellij.net/guestAuth/app/rest/builds/id:${jb.buildserver.build.id}"/>
</target> </target>
<target name="jb_update_continuous_139" depends="fetch-third-party,fetch-annotations"> <target name="jb_update_continuous_139" depends="fetch-third-party,fetch-annotations">
@@ -262,6 +242,27 @@
</sequential> </sequential>
</macrodef> </macrodef>
<macrodef name="execute_update_with_id_resolve">
<attribute name="teamcity.server.url"/>
<attribute name="build.locator.request"/>
<sequential>
<loadresource property="execute.build.id">
<url url="@{teamcity.server.url}/guestAuth/app/rest/builds/?locator=@{build.locator.request}"/>
<filterchain>
<tokenfilter>
<filetokenizer/>
<replaceregex pattern="^(.*)\sid=&quot;(\d+)&quot;(.*)$" replace="\2" flags="s"/>
</tokenfilter>
</filterchain>
</loadresource>
<echo message="IDEA build id: ${execute.build.id}"/>
<execute_update base.url="@{teamcity.server.url}/guestAuth/app/rest/builds/id:${execute.build.id}"/>
</sequential>
</macrodef>
<macrodef name="execute_update"> <macrodef name="execute_update">
<attribute name="base.url"/> <attribute name="base.url"/>