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

Minor: reformat

Browse Source
This commit is contained in:
Nikolay Krasko
2015-06-05 02:12:27 +03:00
parent 9cfbf27602
commit 95e4766b3e
1 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TeamCityBuild.xml
+62 -60
View File
@@ -6,24 +6,24 @@
<property name="jdk16.home" value="${java.home}"/> <property name="jdk16.home" value="${java.home}"/>
<property name="fail.on.plugin.verifier.error" value="true"/> <property name="fail.on.plugin.verifier.error" value="true"/>
<property name="version_substitute_dir" value="${basedir}/versions_temp/" /> <property name="version_substitute_dir" value="${basedir}/versions_temp/"/>
<property name="artifact.output.path" value="${basedir}/out/artifacts"/> <property name="artifact.output.path" value="${basedir}/out/artifacts"/>
<property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/> <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
<property name="plugin.xml.bk" value="${version_substitute_dir}/plugin.xml.bk"/> <property name="plugin.xml.bk" value="${version_substitute_dir}/plugin.xml.bk"/>
<property name="plugin.xml.versioned" value="${plugin.xml}.versioned" /> <property name="plugin.xml.versioned" value="${plugin.xml}.versioned"/>
<property name="android-extensions.plugin.xml" value="plugins/android-idea-plugin/src/META-INF/plugin.xml"/> <property name="android-extensions.plugin.xml" value="plugins/android-idea-plugin/src/META-INF/plugin.xml"/>
<property name="android-extensions.plugin.xml.bk" value="${version_substitute_dir}/kotlin-android-extensions.plugin.xml.bk"/> <property name="android-extensions.plugin.xml.bk" value="${version_substitute_dir}/kotlin-android-extensions.plugin.xml.bk"/>
<property name="android-extensions.plugin.xml.versioned" value="${android-extensions.plugin.xml}.versioned" /> <property name="android-extensions.plugin.xml.versioned" value="${android-extensions.plugin.xml}.versioned"/>
<property name="compiler.version.java" value="compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/KotlinVersion.java"/> <property name="compiler.version.java" value="compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/KotlinVersion.java"/>
<property name="compiler.version.java.bk" value="${version_substitute_dir}/KotlinVersion.java.bk"/> <property name="compiler.version.java.bk" value="${version_substitute_dir}/KotlinVersion.java.bk"/>
<property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned" /> <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned"/>
<property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip" /> <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
<property name="bare.plugin.zip" value="${artifact.output.path}/kotlin-bare-plugin-${build.number}.zip" /> <property name="bare.plugin.zip" value="${artifact.output.path}/kotlin-bare-plugin-${build.number}.zip"/>
<property name="android-extensions.zip" value="${artifact.output.path}/kotlin-android-extensions-plugin-${build.number}.zip" /> <property name="android-extensions.zip" value="${artifact.output.path}/kotlin-android-extensions-plugin-${build.number}.zip"/>
<macrodef name="echoprop"> <macrodef name="echoprop">
<attribute name="prop"/> <attribute name="prop"/>
@@ -47,68 +47,68 @@
</target> </target>
<macrodef name="substituteVersionInFile"> <macrodef name="substituteVersionInFile">
<attribute name="target.file"/> <attribute name="target.file"/>
<attribute name="test.string"/> <attribute name="test.string"/>
<attribute name="target.file.bk" default="@{target.file}.bk"/> <attribute name="target.file.bk" default="@{target.file}.bk"/>
<attribute name="target.file.versioned" default="@{target.file}.versioned"/> <attribute name="target.file.versioned" default="@{target.file}.versioned"/>
<attribute name="token.key" default="snapshot"/> <attribute name="token.key" default="snapshot"/>
<attribute name="version" default="${build.number}"/> <attribute name="version" default="${build.number}"/>
<sequential> <sequential>
<!-- Create backup. Backup will be restored after build end. This will allow to rebuild project without renew <!-- Create backup. Backup will be restored after build end. This will allow to rebuild project without renew
plugin.xml from repository. --> plugin.xml from repository. -->
<copy file="@{target.file}" tofile="@{target.file.bk}"/> <copy file="@{target.file}" tofile="@{target.file.bk}"/>
<!-- Check that version has correct pattern for substitution --> <!-- Check that version has correct pattern for substitution -->
<copy todir=""> <copy todir="">
<fileset file="@{target.file.bk}"> <fileset file="@{target.file.bk}">
<contains text="@{test.string}"/> <contains text="@{test.string}"/>
</fileset> </fileset>
<filterchain> <filterchain>
<replacetokens> <replacetokens>
<token key="@{token.key}" value="@{version}"/> <token key="@{token.key}" value="@{version}"/>
</replacetokens> </replacetokens>
</filterchain> </filterchain>
<mergemapper to="@{target.file.versioned}"/> <mergemapper to="@{target.file.versioned}"/>
</copy> </copy>
<!-- If file doesn't exist - there's a problem with original plugin.xml. Probably there's a bad pattern used for version --> <!-- If file doesn't exist - there's a problem with original plugin.xml. Probably there's a bad pattern used for version -->
<copy file="@{target.file.versioned}" tofile="@{target.file}" overwrite="true"/> <copy file="@{target.file.versioned}" tofile="@{target.file}" overwrite="true"/>
<delete file="@{target.file.versioned}" quiet="true"/> <delete file="@{target.file.versioned}" quiet="true"/>
</sequential> </sequential>
</macrodef> </macrodef>
<target name="writeVersionToTemplateFiles"> <target name="writeVersionToTemplateFiles">
<mkdir dir="${version_substitute_dir}"/> <mkdir dir="${version_substitute_dir}"/>
<substituteVersionInFile <substituteVersionInFile
target.file="${plugin.xml}" target.file="${plugin.xml}"
target.file.bk="${plugin.xml.bk}" target.file.bk="${plugin.xml.bk}"
target.file.versioned="${plugin.xml.versioned}" target.file.versioned="${plugin.xml.versioned}"
test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/> test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
<substituteVersionInFile <substituteVersionInFile
target.file="${android-extensions.plugin.xml}" target.file="${android-extensions.plugin.xml}"
target.file.bk="${android-extensions.plugin.xml.bk}" target.file.bk="${android-extensions.plugin.xml.bk}"
target.file.versioned="${android-extensions.plugin.xml.versioned}" target.file.versioned="${android-extensions.plugin.xml.versioned}"
test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/> test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
<substituteVersionInFile <substituteVersionInFile
target.file="${compiler.version.java}" target.file="${compiler.version.java}"
target.file.bk="${compiler.version.java.bk}" target.file.bk="${compiler.version.java.bk}"
target.file.versioned="${compiler.version.java.versioned}" target.file.versioned="${compiler.version.java.versioned}"
test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/> test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/>
<replicateIdeaVersion target.file="${android-extensions.plugin.xml}" /> <replicateIdeaVersion target.file="${android-extensions.plugin.xml}"/>
</target> </target>
<target name="revertTemplateFiles"> <target name="revertTemplateFiles">
<copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true"/> <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true"/>
<copy file="${android-extensions.plugin.xml.bk}" tofile="${android-extensions.plugin.xml}" overwrite="true"/> <copy file="${android-extensions.plugin.xml.bk}" tofile="${android-extensions.plugin.xml}" overwrite="true"/>
<copy file="${compiler.version.java.bk}" tofile="${compiler.version.java}" overwrite="true"/> <copy file="${compiler.version.java.bk}" tofile="${compiler.version.java}" overwrite="true"/>
<delete dir="${version_substitute_dir}" quiet="true"/> <delete dir="${version_substitute_dir}" quiet="true"/>
</target> </target>
<target name="pre_build" depends="writeVersionToTemplateFiles, cleanupArtifacts"/> <target name="pre_build" depends="writeVersionToTemplateFiles, cleanupArtifacts"/>
@@ -120,8 +120,10 @@
<sequential> <sequential>
<zip destfile="@{filename}"> <zip destfile="@{filename}">
<zipfileset prefix="@{dir}" dir="${artifact.output.path}/@{dir}" excludes="kotlinc/bin/*"/> <zipfileset prefix="@{dir}" dir="${artifact.output.path}/@{dir}" excludes="kotlinc/bin/*"/>
<zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" includes="*.bat" filemode="644"/> <zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" includes="*.bat"
<zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" excludes="*.bat" filemode="755"/> filemode="644"/>
<zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" excludes="*.bat"
filemode="755"/>
</zip> </zip>
<delete dir="${artifact.output.path}/@{dir}" quiet="true"/> <delete dir="${artifact.output.path}/@{dir}" quiet="true"/>
</sequential> </sequential>
@@ -131,7 +133,7 @@
<zipPlugin filename="${bare.plugin.zip}" dir="BareKotlin"/> <zipPlugin filename="${bare.plugin.zip}" dir="BareKotlin"/>
<zip destfile="${android-extensions.zip}"> <zip destfile="${android-extensions.zip}">
<zipfileset prefix="KotlinAndroidExtensions" dir="${artifact.output.path}/KotlinAndroidExtensions" /> <zipfileset prefix="KotlinAndroidExtensions" dir="${artifact.output.path}/KotlinAndroidExtensions"/>
</zip> </zip>
<delete dir="${artifact.output.path}/KotlinAndroidExtensions" quiet="true"/> <delete dir="${artifact.output.path}/KotlinAndroidExtensions" quiet="true"/>
</target> </target>
@@ -150,7 +152,7 @@
<attribute name="file-name"/> <attribute name="file-name"/>
<sequential> <sequential>
<local name="file.size" /> <local name="file.size"/>
<length file="@{path}/@{file-name}" property="file.size"/> <length file="@{path}/@{file-name}" property="file.size"/>
<print-statistic key="@{file-name} size" value="${file.size}"/> <print-statistic key="@{file-name} size" value="${file.size}"/>
</sequential> </sequential>