Adapt targets in build.xml to Ant naming conventions

Also reformat the section related to Upsource

.idea/runConfigurations/Incremental_Compilation_Tests.xml

@@ -32,7 +32,7 @@
     <ConfigurationWrapper RunnerId="Debug" />
     <ConfigurationWrapper RunnerId="Run" />
     <method>
-      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/build.xml" target="dist_quick_compiler_only" />
+      <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/build.xml" target="dist-quick-compiler-only" />
     </method>
   </configuration>
 </component>

build.xml

@@ -132,7 +132,7 @@
         <mkdir dir="${kotlin-home}/lib"/>
     </target>
 
-    <target name="prepareDist">
+    <target name="prepare-dist">
         <copy todir="${kotlin-home}/bin">
             <fileset dir="${basedir}/compiler/cli/bin"/>
         </copy>
@@ -147,7 +147,7 @@
         <chmod dir="${kotlin-home}/bin" excludes="**/*.bat" perm="755"/>
     </target>
 
-    <target name="compilerSources">
+    <target name="compiler-sources">
         <jar jarfile="${output}/kotlin-compiler-sources.jar">
             <!-- TODO How to convert it from pathset or dirset ? -->
             <fileset dir="compiler/frontend/src"/>
@@ -327,7 +327,7 @@
         </java>
     </target>
 
-    <macrodef name="pack_compiler">
+    <macrodef name="pack-compiler">
         <attribute name="jarfile"/>
         <attribute name="compress" default="true"/>
 
@@ -394,7 +394,7 @@
         </sequential>
     </macrodef>
 
-    <target name="compiler_quick">
+    <target name="compiler-quick">
         <delete dir="${output}/classes/compiler"/>
         <copy todir="${output}/classes/compiler">
             <fileset dir="${idea.out}/">
@@ -404,7 +404,7 @@
             <cutdirsmapper dirs="1"/>
         </copy>
         <delete file="${kotlin-home}/lib/kotlin-compiler.jar"/>
-        <pack_compiler jarfile="${kotlin-home}/lib/kotlin-compiler.jar" compress="false"/>
+        <pack-compiler jarfile="${kotlin-home}/lib/kotlin-compiler.jar" compress="false"/>
     </target>
 
     <target name="compiler">
@@ -419,7 +419,7 @@
             <classpath refid="classpath"/>
         </javac2>
 
-        <pack_compiler jarfile="${output}/kotlin-compiler-before-shrink.jar"/>
+        <pack-compiler jarfile="${output}/kotlin-compiler-before-shrink.jar"/>
 
         <delete file="${kotlin-home}/lib/kotlin-compiler.jar" failonerror="false"/>
 
@@ -562,7 +562,7 @@
         </jar>
     </target>
 
-    <target name="antTools">
+    <target name="ant-tools">
         <cleandir dir="${output}/classes/buildTools"/>
         <javac2 destdir="${output}/classes/buildTools" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
@@ -598,16 +598,16 @@
         </jar>
     </target>
 
-    <target name="jdkAnnotations">
+    <target name="jdk-annotations">
         <copy file="dependencies/annotations/kotlin-jdk-annotations.jar" todir="${kotlin-home}/lib"/>
     </target>
 
-    <target name="androidSdkAnnotations">
+    <target name="android-sdk-annotations">
         <copy file="dependencies/annotations/kotlin-android-sdk-annotations.jar" todir="${kotlin-home}/lib"/>
     </target>
 
     <target name="runtime">
-        <macrodef name="new_kotlinc">
+        <macrodef name="new-kotlinc">
             <attribute name="src"/>
             <attribute name="output"/>
             <attribute name="classpath"/>
@@ -633,7 +633,7 @@
             </sequential>
         </macrodef>
 
-        <new_kotlinc src="${basedir}/core/builtins/src ${basedir}/core/runtime.jvm/src ${basedir}/core/reflection/src ${basedir}/core/reflection.jvm/src"
+        <new-kotlinc src="${basedir}/core/builtins/src ${basedir}/core/runtime.jvm/src ${basedir}/core/reflection/src ${basedir}/core/reflection.jvm/src"
                      output="${output}/classes/runtime"
                      classpath="${basedir}/core/runtime.jvm/src${path.separator}${basedir}/core/reflection.jvm/src"/>
 
@@ -644,7 +644,7 @@
             <classpath location="${output}/classes/runtime"/>
         </javac2>
 
-        <new_kotlinc src="${basedir}/libraries/stdlib/src"
+        <new-kotlinc src="${basedir}/libraries/stdlib/src"
                      output="${output}/classes/stdlib"
                      classpath="${output}/classes/runtime"/>
 
@@ -663,7 +663,7 @@
         </jar>
     </target>
 
-    <target name="runtime_sources">
+    <target name="runtime-sources">
         <jar destfile="${kotlin-home}/lib/kotlin-runtime-sources.jar">
             <fileset dir="${basedir}/core/builtins/native" includes="**/*"/>
             <fileset dir="${basedir}/core/builtins/src" includes="**/*"/>
@@ -683,18 +683,16 @@
         </jar>
     </target>
 
-    <!-- See description -->
     <target name="dist"
-            depends="clean,init,prepareDist,preloader,builtins,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib"
+            depends="clean,init,prepare-dist,preloader,builtins,compiler,compiler-sources,ant-tools,jdk-annotations,android-sdk-annotations,runtime,runtime-sources,jslib"
             description="Builds redistributables from sources"/>
 
     <!-- builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc -->
-    <target name="dist_quick"
-            depends="clean,init,prepareDist,preloader,builtins,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib"/>
+    <target name="dist-quick"
+            depends="clean,init,prepare-dist,preloader,builtins,compiler-quick,ant-tools,jdk-annotations,android-sdk-annotations,runtime,runtime-sources,jslib"/>
 
-    <!-- See description -->
-    <target name="dist_quick_compiler_only"
-            depends="init,prepareDist,preloader,builtins,compiler_quick"
+    <target name="dist-quick-compiler-only"
+            depends="init,prepare-dist,preloader,builtins,compiler-quick"
             description="Builds compiler jar from project out dir"/>
 
     <target name="zip-compiler" depends="dist">
@@ -734,12 +732,12 @@
                 <pathelement location="${output}/classes/stdlib"/>
             </classpath>
         </javac2>
-      <!--copy resources-->
-      <copy todir="${output}/classes/idea-analysis">
-        <fileset dir="${basedir}/idea/idea-analysis/src" excludes="**/*.java, **/*.kt"/>
-      </copy>
 
-      <jar jarfile="${output}/kotlin-for-upsource0.jar">
+        <copy todir="${output}/classes/idea-analysis">
+            <fileset dir="${basedir}/idea/idea-analysis/src" excludes="**/*.java, **/*.kt"/>
+        </copy>
+
+        <jar jarfile="${output}/kotlin-for-upsource0.jar">
             <fileset dir="${output}/classes/idea-analysis"/>
             <fileset dir="${output}/classes/compiler"/>
             <fileset dir="${output}/classes/runtime"/>
@@ -750,53 +748,53 @@
             <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
             <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
 
-        <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
-        <zipgroupfileset dir="${kotlin-home}/lib" includes="kotlin-runtime-sources.jar"/>   <!--Library.kt-->
-        <fileset dir="${output}/classes/stdlib"/>
+            <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
+            <zipgroupfileset dir="${kotlin-home}/lib" includes="kotlin-runtime-sources.jar"/>
+            <fileset dir="${output}/classes/stdlib"/>
 
-        <!-- icons, etc. -->
-        <fileset dir="idea/resources"/>
-        <!-- plugin.xml and friends -->
-        <fileset dir="idea/src" includes="META-INF/**"/>
-      </jar>
-      <sleep seconds="1"/>
-      <jar jarfile="${output}/kotlin-for-upsource.jar">
-        <zipfileset src="${output}/kotlin-for-upsource0.jar">
-          <exclude name="javax/**/*.java"/>
-        </zipfileset>
-      </jar>
-      <delete file="${output}/kotlin-for-upsource0.jar"/>
+            <!-- icons, etc. -->
+            <fileset dir="idea/resources"/>
+            <!-- plugin.xml and friends -->
+            <fileset dir="idea/src" includes="META-INF/**"/>
+        </jar>
+        <sleep seconds="1"/>
+        <jar jarfile="${output}/kotlin-for-upsource.jar">
+            <zipfileset src="${output}/kotlin-for-upsource0.jar">
+                <exclude name="javax/**/*.java"/>
+            </zipfileset>
+        </jar>
+        <delete file="${output}/kotlin-for-upsource0.jar"/>
 
-       <!--sources-->
-      <jar jarfile="${output}/kotlin-for-upsource-sources.jar">
-        <fileset dir="compiler/frontend/src"/>
-        <fileset dir="core/descriptors/src"/>
-        <fileset dir="core/descriptor.loader.java/src"/>
-        <fileset dir="core/serialization/src"/>
-        <fileset dir="core/serialization.java/src"/>
-        <fileset dir="compiler/frontend.java/src"/>
-        <fileset dir="compiler/backend-common/src"/>
-        <fileset dir="compiler/backend/src"/>
-        <fileset dir="compiler/cli/src"/>
-        <fileset dir="j2k/src"/>
-        <fileset dir="compiler/util/src"/>
-        <fileset dir="core/util.runtime/src"/>
-        <fileset dir="compiler/jet.as.java.psi/src"/>
-        <fileset dir="compiler/builtins-serializer"/>
-        <fileset dir="js/js.dart-ast/src"/>
-        <fileset dir="js/js.translator/src"/>
-        <fileset dir="js/js.frontend/src"/>
-        <fileset dir="js/js.inliner/src"/>
-        <fileset dir="idea/idea-analysis/src"/>
-        <fileset dir="idea/ide-common/src"/>
+        <!-- sources -->
+        <jar jarfile="${output}/kotlin-for-upsource-sources.jar">
+            <fileset dir="compiler/frontend/src"/>
+            <fileset dir="core/descriptors/src"/>
+            <fileset dir="core/descriptor.loader.java/src"/>
+            <fileset dir="core/serialization/src"/>
+            <fileset dir="core/serialization.java/src"/>
+            <fileset dir="compiler/frontend.java/src"/>
+            <fileset dir="compiler/backend-common/src"/>
+            <fileset dir="compiler/backend/src"/>
+            <fileset dir="compiler/cli/src"/>
+            <fileset dir="j2k/src"/>
+            <fileset dir="compiler/util/src"/>
+            <fileset dir="core/util.runtime/src"/>
+            <fileset dir="compiler/jet.as.java.psi/src"/>
+            <fileset dir="compiler/builtins-serializer"/>
+            <fileset dir="js/js.dart-ast/src"/>
+            <fileset dir="js/js.translator/src"/>
+            <fileset dir="js/js.frontend/src"/>
+            <fileset dir="js/js.inliner/src"/>
+            <fileset dir="idea/idea-analysis/src"/>
+            <fileset dir="idea/ide-common/src"/>
 
-        <manifest>
-          <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+            <manifest>
+                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
 
-          <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-          <attribute name="Implementation-Version" value="${build.number}"/>
-        </manifest>
-      </jar>
+                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
 
     </target>