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

Fix runtime for kotlin-for-upsource and simplify classpath

Browse Source
This commit is contained in:
Alexander Udalov
2014-12-25 22:48:14 +03:00
parent 11dfdfc123
commit fa9e1ca602
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+7 -19
View File
@@ -792,7 +792,7 @@
depends="init,prepare-dist,preloader,serialize-builtins,compiler-quick" depends="init,prepare-dist,preloader,serialize-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">
<zip destfile="${output}/${output.name}.zip"> <zip destfile="${output}/${output.name}.zip">
<zipfileset prefix="kotlinc" dir="${kotlin-home}" excludes="bin/*"/> <zipfileset prefix="kotlinc" dir="${kotlin-home}" excludes="bin/*"/>
<zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" includes="*.bat" filemode="644"/> <zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" includes="*.bat" filemode="644"/>
@@ -800,32 +800,20 @@
</zip> </zip>
</target> </target>
<target name="kotlin-for-upsource" depends="dist"> <target name="kotlin-for-upsource">
<cleandir dir="${output}/classes/idea-analysis"/> <cleandir dir="${output}/classes/idea-analysis"/>
<javac2 destdir="${output}/classes/idea-analysis" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" <javac2 destdir="${output}/classes/idea-analysis" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
source="${java.target}" target="${java.target}"> source="${java.target}" target="${java.target}">
<withKotlin externalannotations="${external.annotations.path}"/> <withKotlin externalannotations="${external.annotations.path}"/>
<src> <src>
<dirset dir="${basedir}/idea/ide-common"> <dirset dir="${basedir}/idea/ide-common" includes="src"/>
<include name="src"/> <dirset dir="${basedir}/idea/idea-analysis" includes="src"/>
</dirset>
<dirset dir="${basedir}/idea/idea-analysis">
<include name="src"/>
</dirset>
</src> </src>
<classpath> <classpath>
<fileset dir="${idea.sdk}" includes="core/*.jar"/>
<fileset dir="${idea.sdk}" includes="core-analysis/*.jar"/> <fileset dir="${idea.sdk}" includes="core-analysis/*.jar"/>
<fileset dir="${idea.sdk}" includes="lib/protobuf-2.5.0.jar"/> <pathelement location="${output}/kotlin-compiler-before-shrink.jar"/>
<path refid="classpath"/>
<fileset dir="${basedir}/lib" includes="**/*.jar"/>
<fileset dir="${dependencies.dir}" includes="jline.jar"/>
<fileset dir="${dependencies.dir}" includes="jansi.jar"/>
<fileset dir="${dependencies.dir}" includes="cli-parser-1.1.1.jar"/>
<fileset dir="${basedir}/ideaSDK/jps" includes="jps-model.jar"/>
<fileset dir="${kotlin-home}/lib" includes="kotlin-runtime.jar"/>
<pathelement location="${output}/classes/compiler"/>
</classpath> </classpath>
</javac2> </javac2>
@@ -883,5 +871,5 @@
</zip> </zip>
</target> </target>
<target name="build-artifacts" depends="zip-compiler,kotlin-for-upsource,zip-test-data"/> <target name="build-artifacts" depends="dist,zip-compiler,kotlin-for-upsource,zip-test-data"/>
</project> </project>