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

Adapt targets in build.xml to Ant naming conventions

Browse Source 
Also reformat the section related to Upsource
This commit is contained in:
Alexander Udalov
2014-12-03 16:39:18 +03:00
parent 7d32358bf8
commit 54b94e9e00
2 changed files with 67 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/runConfigurations/Incremental_Compilation_Tests.xml
Generated
+1 -1
View File
@@ -32,7 +32,7 @@
<ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" /> <ConfigurationWrapper RunnerId="Run" />
<method> <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> </method>
</configuration> </configuration>
</component> </component>
build.xml
+66 -68
View File
@@ -132,7 +132,7 @@
<mkdir dir="${kotlin-home}/lib"/> <mkdir dir="${kotlin-home}/lib"/>
</target> </target>
<target name="prepareDist"> <target name="prepare-dist">
<copy todir="${kotlin-home}/bin"> <copy todir="${kotlin-home}/bin">
<fileset dir="${basedir}/compiler/cli/bin"/> <fileset dir="${basedir}/compiler/cli/bin"/>
</copy> </copy>
@@ -147,7 +147,7 @@
<chmod dir="${kotlin-home}/bin" excludes="**/*.bat" perm="755"/> <chmod dir="${kotlin-home}/bin" excludes="**/*.bat" perm="755"/>
</target> </target>
<target name="compilerSources"> <target name="compiler-sources">
<jar jarfile="${output}/kotlin-compiler-sources.jar"> <jar jarfile="${output}/kotlin-compiler-sources.jar">
<!-- TODO How to convert it from pathset or dirset ? --> <!-- TODO How to convert it from pathset or dirset ? -->
<fileset dir="compiler/frontend/src"/> <fileset dir="compiler/frontend/src"/>
@@ -327,7 +327,7 @@
</java> </java>
</target> </target>
<macrodef name="pack_compiler"> <macrodef name="pack-compiler">
<attribute name="jarfile"/> <attribute name="jarfile"/>
<attribute name="compress" default="true"/> <attribute name="compress" default="true"/>
@@ -394,7 +394,7 @@
</sequential> </sequential>
</macrodef> </macrodef>
<target name="compiler_quick"> <target name="compiler-quick">
<delete dir="${output}/classes/compiler"/> <delete dir="${output}/classes/compiler"/>
<copy todir="${output}/classes/compiler"> <copy todir="${output}/classes/compiler">
<fileset dir="${idea.out}/"> <fileset dir="${idea.out}/">
@@ -404,7 +404,7 @@
<cutdirsmapper dirs="1"/> <cutdirsmapper dirs="1"/>
</copy> </copy>
<delete file="${kotlin-home}/lib/kotlin-compiler.jar"/> <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>
<target name="compiler"> <target name="compiler">
@@ -419,7 +419,7 @@
<classpath refid="classpath"/> <classpath refid="classpath"/>
</javac2> </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"/> <delete file="${kotlin-home}/lib/kotlin-compiler.jar" failonerror="false"/>
@@ -562,7 +562,7 @@
</jar> </jar>
</target> </target>
<target name="antTools"> <target name="ant-tools">
<cleandir dir="${output}/classes/buildTools"/> <cleandir dir="${output}/classes/buildTools"/>
<javac2 destdir="${output}/classes/buildTools" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" <javac2 destdir="${output}/classes/buildTools" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
source="${java.target}" target="${java.target}"> source="${java.target}" target="${java.target}">
@@ -598,16 +598,16 @@
</jar> </jar>
</target> </target>
<target name="jdkAnnotations"> <target name="jdk-annotations">
<copy file="dependencies/annotations/kotlin-jdk-annotations.jar" todir="${kotlin-home}/lib"/> <copy file="dependencies/annotations/kotlin-jdk-annotations.jar" todir="${kotlin-home}/lib"/>
</target> </target>
<target name="androidSdkAnnotations"> <target name="android-sdk-annotations">
<copy file="dependencies/annotations/kotlin-android-sdk-annotations.jar" todir="${kotlin-home}/lib"/> <copy file="dependencies/annotations/kotlin-android-sdk-annotations.jar" todir="${kotlin-home}/lib"/>
</target> </target>
<target name="runtime"> <target name="runtime">
<macrodef name="new_kotlinc"> <macrodef name="new-kotlinc">
<attribute name="src"/> <attribute name="src"/>
<attribute name="output"/> <attribute name="output"/>
<attribute name="classpath"/> <attribute name="classpath"/>
@@ -633,7 +633,7 @@
</sequential> </sequential>
</macrodef> </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" output="${output}/classes/runtime"
classpath="${basedir}/core/runtime.jvm/src${path.separator}${basedir}/core/reflection.jvm/src"/> classpath="${basedir}/core/runtime.jvm/src${path.separator}${basedir}/core/reflection.jvm/src"/>
@@ -644,7 +644,7 @@
<classpath location="${output}/classes/runtime"/> <classpath location="${output}/classes/runtime"/>
</javac2> </javac2>
<new_kotlinc src="${basedir}/libraries/stdlib/src" <new-kotlinc src="${basedir}/libraries/stdlib/src"
output="${output}/classes/stdlib" output="${output}/classes/stdlib"
classpath="${output}/classes/runtime"/> classpath="${output}/classes/runtime"/>
@@ -663,7 +663,7 @@
</jar> </jar>
</target> </target>
<target name="runtime_sources"> <target name="runtime-sources">
<jar destfile="${kotlin-home}/lib/kotlin-runtime-sources.jar"> <jar destfile="${kotlin-home}/lib/kotlin-runtime-sources.jar">
<fileset dir="${basedir}/core/builtins/native" includes="**/*"/> <fileset dir="${basedir}/core/builtins/native" includes="**/*"/>
<fileset dir="${basedir}/core/builtins/src" includes="**/*"/> <fileset dir="${basedir}/core/builtins/src" includes="**/*"/>
@@ -683,18 +683,16 @@
</jar> </jar>
</target> </target>
<!-- See description -->
<target name="dist" <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"/> description="Builds redistributables from sources"/>
<!-- builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc --> <!-- builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc -->
<target name="dist_quick" <target name="dist-quick"
depends="clean,init,prepareDist,preloader,builtins,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib"/> 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"
<target name="dist_quick_compiler_only" depends="init,prepare-dist,preloader,builtins,compiler-quick"
depends="init,prepareDist,preloader,builtins,compiler_quick"
description="Builds compiler jar from project out dir"/> description="Builds compiler jar from project out dir"/>
<target name="zip-compiler" depends="dist"> <target name="zip-compiler" depends="dist">
@@ -734,12 +732,12 @@
<pathelement location="${output}/classes/stdlib"/> <pathelement location="${output}/classes/stdlib"/>
</classpath> </classpath>
</javac2> </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/idea-analysis"/>
<fileset dir="${output}/classes/compiler"/> <fileset dir="${output}/classes/compiler"/>
<fileset dir="${output}/classes/runtime"/> <fileset dir="${output}/classes/runtime"/>
@@ -750,53 +748,53 @@
<fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/> <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
<fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/> <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
<zipgroupfileset dir="${basedir}/lib" includes="*.jar"/> <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
<zipgroupfileset dir="${kotlin-home}/lib" includes="kotlin-runtime-sources.jar"/> <!--Library.kt--> <zipgroupfileset dir="${kotlin-home}/lib" includes="kotlin-runtime-sources.jar"/>
<fileset dir="${output}/classes/stdlib"/> <fileset dir="${output}/classes/stdlib"/>
<!-- icons, etc. --> <!-- icons, etc. -->
<fileset dir="idea/resources"/> <fileset dir="idea/resources"/>
<!-- plugin.xml and friends --> <!-- plugin.xml and friends -->
<fileset dir="idea/src" includes="META-INF/**"/> <fileset dir="idea/src" includes="META-INF/**"/>
</jar> </jar>
<sleep seconds="1"/> <sleep seconds="1"/>
<jar jarfile="${output}/kotlin-for-upsource.jar"> <jar jarfile="${output}/kotlin-for-upsource.jar">
<zipfileset src="${output}/kotlin-for-upsource0.jar"> <zipfileset src="${output}/kotlin-for-upsource0.jar">
<exclude name="javax/**/*.java"/> <exclude name="javax/**/*.java"/>
</zipfileset> </zipfileset>
</jar> </jar>
<delete file="${output}/kotlin-for-upsource0.jar"/> <delete file="${output}/kotlin-for-upsource0.jar"/>
<!--sources--> <!-- sources -->
<jar jarfile="${output}/kotlin-for-upsource-sources.jar"> <jar jarfile="${output}/kotlin-for-upsource-sources.jar">
<fileset dir="compiler/frontend/src"/> <fileset dir="compiler/frontend/src"/>
<fileset dir="core/descriptors/src"/> <fileset dir="core/descriptors/src"/>
<fileset dir="core/descriptor.loader.java/src"/> <fileset dir="core/descriptor.loader.java/src"/>
<fileset dir="core/serialization/src"/> <fileset dir="core/serialization/src"/>
<fileset dir="core/serialization.java/src"/> <fileset dir="core/serialization.java/src"/>
<fileset dir="compiler/frontend.java/src"/> <fileset dir="compiler/frontend.java/src"/>
<fileset dir="compiler/backend-common/src"/> <fileset dir="compiler/backend-common/src"/>
<fileset dir="compiler/backend/src"/> <fileset dir="compiler/backend/src"/>
<fileset dir="compiler/cli/src"/> <fileset dir="compiler/cli/src"/>
<fileset dir="j2k/src"/> <fileset dir="j2k/src"/>
<fileset dir="compiler/util/src"/> <fileset dir="compiler/util/src"/>
<fileset dir="core/util.runtime/src"/> <fileset dir="core/util.runtime/src"/>
<fileset dir="compiler/jet.as.java.psi/src"/> <fileset dir="compiler/jet.as.java.psi/src"/>
<fileset dir="compiler/builtins-serializer"/> <fileset dir="compiler/builtins-serializer"/>
<fileset dir="js/js.dart-ast/src"/> <fileset dir="js/js.dart-ast/src"/>
<fileset dir="js/js.translator/src"/> <fileset dir="js/js.translator/src"/>
<fileset dir="js/js.frontend/src"/> <fileset dir="js/js.frontend/src"/>
<fileset dir="js/js.inliner/src"/> <fileset dir="js/js.inliner/src"/>
<fileset dir="idea/idea-analysis/src"/> <fileset dir="idea/idea-analysis/src"/>
<fileset dir="idea/ide-common/src"/> <fileset dir="idea/ide-common/src"/>
<manifest> <manifest>
<attribute name="Built-By" value="${manifest.impl.vendor}"/> <attribute name="Built-By" value="${manifest.impl.vendor}"/>
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/> <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
<attribute name="Implementation-Version" value="${build.number}"/> <attribute name="Implementation-Version" value="${build.number}"/>
</manifest> </manifest>
</jar> </jar>
</target> </target>