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

build.xml: use absolute paths, extract some constants

Browse Source
This commit is contained in:
Alexander Udalov
2014-12-30 15:24:37 +03:00
parent a8046020fb
commit 6fe483f0cf
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+14 -14
View File
@@ -17,13 +17,13 @@
<property name="bootstrap.runtime" value="${bootstrap.compiler.home}/lib/kotlin-runtime.jar"/> <property name="bootstrap.runtime" value="${bootstrap.compiler.home}/lib/kotlin-runtime.jar"/>
<property name="bootstrap.runtime.minimal" value="${bootstrap.compiler.home}/lib/kotlin-runtime-minimal.jar"/> <property name="bootstrap.runtime.minimal" value="${bootstrap.compiler.home}/lib/kotlin-runtime-minimal.jar"/>
<property name="output.relative" value="dist"/> <property name="output" value="${basedir}/dist"/>
<property name="output" value="${basedir}/${output.relative}"/>
<property name="kotlin-home" value="${output}/kotlinc"/> <property name="kotlin-home" value="${output}/kotlinc"/>
<property name="build.number" value="snapshot"/> <property name="build.number" value="snapshot"/>
<property name="bootstrap.build.no.tests" value="false"/> <property name="bootstrap.build.no.tests" value="false"/>
<property name="output.name" value="kotlin-compiler-${build.number}"/>
<property name="idea.sdk" value="${basedir}/ideaSDK"/> <property name="idea.sdk" value="${basedir}/ideaSDK"/>
<property name="protobuf.jar" value="${idea.sdk}/lib/protobuf-2.5.0.jar"/>
<property name="javax.inject.jar" value="${basedir}/lib/javax.inject.jar"/>
<property name="java.target" value="1.6"/> <property name="java.target" value="1.6"/>
@@ -58,7 +58,7 @@
<path id="classpath"> <path id="classpath">
<file file="${bootstrap.runtime}"/> <file file="${bootstrap.runtime}"/>
<fileset dir="${idea.sdk}" includes="core/*.jar"/> <fileset dir="${idea.sdk}" includes="core/*.jar"/>
<fileset dir="${idea.sdk}" includes="lib/protobuf-2.5.0.jar"/> <pathelement location="${protobuf.jar}"/>
<fileset dir="${basedir}/lib" includes="**/*.jar"/> <fileset dir="${basedir}/lib" includes="**/*.jar"/>
<fileset dir="${dependencies.dir}" includes="jline.jar"/> <fileset dir="${dependencies.dir}" includes="jline.jar"/>
@@ -437,12 +437,12 @@
<zipgroupfileset dir="${basedir}/lib" includes="*.jar"/> <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
<zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/> <zipgroupfileset dir="${basedir}/ideaSDK/core" includes="*.jar" excludes="util.jar"/>
<zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="jna-utils.jar"/> <zipfileset src="${idea.sdk}/lib/jna-utils.jar"/>
<zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="oromatcher.jar"/> <zipfileset src="${idea.sdk}/lib/oromatcher.jar"/>
<zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="protobuf-2.5.0.jar"/> <zipfileset src="${idea.sdk}/jps/jps-model.jar"/>
<zipgroupfileset dir="${basedir}/ideaSDK/jps" includes="jps-model.jar"/> <zipfileset src="${dependencies.dir}/jline.jar"/>
<zipgroupfileset dir="${dependencies.dir}" includes="jline.jar"/> <zipfileset src="${dependencies.dir}/cli-parser-1.1.1.jar"/>
<zipgroupfileset dir="${dependencies.dir}" includes="cli-parser-1.1.1.jar"/> <zipfileset src="${protobuf.jar}"/>
<manifest> <manifest>
<attribute name="Built-By" value="${manifest.impl.vendor}"/> <attribute name="Built-By" value="${manifest.impl.vendor}"/>
@@ -778,7 +778,7 @@
<include name="libraries/stdlib/src"/> <include name="libraries/stdlib/src"/>
</src> </src>
<class-path> <class-path>
<pathelement path="${output.relative}/classes/builtins"/> <pathelement path="${output}/classes/builtins"/>
</class-path> </class-path>
</new-kotlinc> </new-kotlinc>
</target> </target>
@@ -789,8 +789,8 @@
<include name="core/reflection.jvm/src"/> <include name="core/reflection.jvm/src"/>
</src> </src>
<class-path> <class-path>
<pathelement path="${output.relative}/classes/builtins"/> <pathelement path="${output}/classes/builtins"/>
<pathelement path="${output.relative}/classes/stdlib"/> <pathelement path="${output}/classes/stdlib"/>
</class-path> </class-path>
</new-kotlinc> </new-kotlinc>
</target> </target>
@@ -880,7 +880,7 @@
description="Builds compiler jar from project out dir"/> description="Builds compiler jar from project out dir"/>
<target name="zip-compiler"> <target name="zip-compiler">
<zip destfile="${output}/${output.name}.zip"> <zip destfile="${output}/kotlin-compiler-${build.number}.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"/>
<zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" excludes="*.bat" filemode="755"/> <zipfileset prefix="kotlinc/bin" dir="${kotlin-home}/bin" excludes="*.bat" filemode="755"/>