Javac target JVM version explicitly specified
When compiling from command line on a machine with Java 7 installed you get class format errors when running on Java 6 later
This commit is contained in:
@@ -12,6 +12,8 @@
|
|||||||
<property name="output.name" value="kotlin-compiler-${build.number}"/>
|
<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="java.target" value="1.6"/>
|
||||||
|
|
||||||
<path id="classpath">
|
<path id="classpath">
|
||||||
<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"/>
|
<fileset dir="${idea.sdk}" includes="lib/protobuf-2.5.0.jar"/>
|
||||||
@@ -212,7 +214,7 @@
|
|||||||
|
|
||||||
<target name="preloader">
|
<target name="preloader">
|
||||||
<cleandir dir="${output}/classes/preloader"/>
|
<cleandir dir="${output}/classes/preloader"/>
|
||||||
<javac destdir="${output}/classes/preloader" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
|
<javac destdir="${output}/classes/preloader" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" target="${java.target}">
|
||||||
<src refid="preloaderSources.path"/>
|
<src refid="preloaderSources.path"/>
|
||||||
</javac>
|
</javac>
|
||||||
|
|
||||||
@@ -281,7 +283,7 @@
|
|||||||
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
|
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${basedir}/dependencies/ant-contrib.jar"/>
|
||||||
|
|
||||||
<cleandir dir="${output}/classes/compiler"/>
|
<cleandir dir="${output}/classes/compiler"/>
|
||||||
<javac destdir="${output}/classes/compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
|
<javac destdir="${output}/classes/compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" target="${java.target}">
|
||||||
<src refid="compilerSources.path"/>
|
<src refid="compilerSources.path"/>
|
||||||
<classpath refid="classpath"/>
|
<classpath refid="classpath"/>
|
||||||
</javac>
|
</javac>
|
||||||
@@ -389,7 +391,7 @@
|
|||||||
|
|
||||||
<target name="antTools">
|
<target name="antTools">
|
||||||
<cleandir dir="${output}/classes/buildTools"/>
|
<cleandir dir="${output}/classes/buildTools"/>
|
||||||
<javac destdir="${output}/classes/buildTools" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
|
<javac destdir="${output}/classes/buildTools" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" target="${java.target}">
|
||||||
<src>
|
<src>
|
||||||
<dirset dir="${basedir}/build-tools">
|
<dirset dir="${basedir}/build-tools">
|
||||||
<include name="core/src"/>
|
<include name="core/src"/>
|
||||||
@@ -456,7 +458,7 @@
|
|||||||
<target name="annotationsExt">
|
<target name="annotationsExt">
|
||||||
<cleandir dir="${output}/classes/annotations-ext"/>
|
<cleandir dir="${output}/classes/annotations-ext"/>
|
||||||
|
|
||||||
<javac destdir="${output}/classes/annotations-ext" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
|
<javac destdir="${output}/classes/annotations-ext" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" target="${java.target}">
|
||||||
<src path="${basedir}/compiler/annotations-ext/src"/>
|
<src path="${basedir}/compiler/annotations-ext/src"/>
|
||||||
</javac>
|
</javac>
|
||||||
|
|
||||||
@@ -476,7 +478,7 @@
|
|||||||
|
|
||||||
<target name="runtime">
|
<target name="runtime">
|
||||||
<cleandir dir="${output}/classes/runtime"/>
|
<cleandir dir="${output}/classes/runtime"/>
|
||||||
<javac destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
|
<javac destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" target="${java.target}">
|
||||||
<src path="${basedir}/runtime/src"/>
|
<src path="${basedir}/runtime/src"/>
|
||||||
</javac>
|
</javac>
|
||||||
|
|
||||||
@@ -531,7 +533,7 @@
|
|||||||
|
|
||||||
<cleandir dir="${output}/classes/j2k"/>
|
<cleandir dir="${output}/classes/j2k"/>
|
||||||
|
|
||||||
<javac destdir="${output}/classes/j2k" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
|
<javac destdir="${output}/classes/j2k" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" target="${java.target}">
|
||||||
<src path="${basedir}/j2k/src"/>
|
<src path="${basedir}/j2k/src"/>
|
||||||
<classpath path="${kotlin-home}/lib/kotlin-compiler.jar"/>
|
<classpath path="${kotlin-home}/lib/kotlin-compiler.jar"/>
|
||||||
</javac>
|
</javac>
|
||||||
|
|||||||
Reference in New Issue
Block a user