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

Module annotations-ext removed. Annotations are moved to runtime

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-20 14:03:16 +04:00
parent c7d5819ef2
commit 4ac7afbb9f
12 changed files with 3 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+2 -26
View File
@@ -12,7 +12,6 @@
<property name="bootstrap.home" value="dependencies/bootstrap-compiler"/>
<property name="bootstrap.compiler.home" value="${bootstrap.home}/Kotlin/kotlinc"/>
<property name="bootstrap.runtime" value="${bootstrap.compiler.home}/lib/kotlin-runtime.jar"/>
<property name="bootstrap.annotations.ext" value="${bootstrap.compiler.home}/lib/kotlin-annotations-ext.jar"/>
<property name="output.relative" value="dist"/>
<property name="output" value="${basedir}/${output.relative}"/>
@@ -29,7 +28,6 @@
<path id="classpath">
<file file="${bootstrap.runtime}"/>
<file file="${bootstrap.annotations.ext}"/>
<fileset dir="${idea.sdk}" includes="core/*.jar"/>
<fileset dir="${idea.sdk}" includes="lib/protobuf-2.5.0.jar"/>
@@ -377,7 +375,6 @@
-libraryjars '${rtjar}'
-libraryjars '${bootstrap.runtime}'
-libraryjars '${bootstrap.annotations.ext}'
-target 1.6
-dontoptimize
@@ -509,27 +506,6 @@
</sequential>
</macrodef>
<target name="annotationsExt">
<cleandir dir="${output}/classes/annotations-ext"/>
<javac2 destdir="${output}/classes/annotations-ext" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}">
<src path="${basedir}/compiler/annotations-ext/src"/>
</javac2>
<jar destfile="${kotlin-home}/lib/kotlin-annotations-ext.jar">
<fileset dir="${output}/classes/annotations-ext"/>
<zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
<manifest>
<attribute name="Built-By" value="${manifest.impl.vendor}"/>
<attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
<attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.compiler.annotations.extended}"/>
<attribute name="Implementation-Version" value="${build.number}"/>
</manifest>
</jar>
</target>
<target name="runtime">
<cleandir dir="${output}/classes/runtime"/>
<javac2 destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}">
@@ -609,11 +585,11 @@
<!-- builds redistributables from sources -->
<target name="dist"
depends="clean,init,prepareDist,preloader,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,annotationsExt,runtime,runtime_sources,jslib,j2kConverter"/>
depends="clean,init,prepareDist,preloader,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>
<!-- 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,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,annotationsExt,runtime,runtime_sources,jslib,j2kConverter"/>
depends="clean,init,prepareDist,preloader,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>
<!-- builds compiler jar from project out dir -->
<target name="dist_quick_compiler_only"