changeset 3397:fd398d3bb56a

8157030: langtools dev build broken after classfile version bump Summary: fix build to use different source/target version when compiling build tools Reviewed-by: jlahoda
author mcimadamore
date Mon, 16 May 2016 12:03:41 +0100
parents 6347efd1be03
children 5c3dfebefa4a
files make/build.properties make/build.xml
diffstat 2 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/make/build.properties	Sat May 14 08:03:03 2016 -0700
+++ b/make/build.properties	Mon May 16 12:03:41 2016 +0100
@@ -28,6 +28,10 @@
 javac.source = 9
 javac.target = 9
 
+#version used to compile build tools
+javac.build.source = 8
+javac.build.target = 8
+
 langtools.resource.includes = \
         com/sun/tools/javac/resources/compiler.properties
 
--- a/make/build.xml	Sat May 14 08:03:03 2016 -0700
+++ b/make/build.xml	Mon May 16 12:03:41 2016 +0100
@@ -243,7 +243,9 @@
         <replace file=".idea/workspace.xml" token="@XPATCH@" value="${xpatch.cmd}"/>
         <replace file=".idea/workspace.xml" token="@PATH_SEP@" value="${path.separator}"/>
         <mkdir dir=".idea/classes"/>
-        <javac srcdir="make/intellij/src"
+        <javac source="${javac.build.source}"
+               target="${javac.build.target}"
+               srcdir="make/intellij/src"
                destdir=".idea/classes"/>
     </target>
 
@@ -255,10 +257,8 @@
         <copy todir="${build.tools}/propertiesparser" >
             <fileset dir="${make.tools.dir}/propertiesparser" includes="**/resources/**"/>
         </copy>
-        <javac fork="true"
-               source="${javac.source}"
-               target="${javac.target}"
-               executable="${langtools.jdk.home}/bin/javac"
+        <javac source="${javac.build.source}"
+               target="${javac.build.target}"
                srcdir="${make.tools.dir}"
                includes="propertiesparser/* anttasks/PropertiesParser* anttasks/PathFileSet*"
                destdir="${build.tools}"
@@ -273,10 +273,9 @@
     </target>
 
      <target name="-def-pcompile">
-        <javac fork="true"
-               source="${javac.source}"
-               target="${javac.target}"
-               executable="${langtools.jdk.home}/bin/javac"
+        <javac
+               source="${javac.build.source}"
+               target="${javac.build.target}"
                srcdir="${make.tools.dir}"
                includes="compileproperties/* anttasks/CompileProperties* anttasks/PathFileSet*"
                destdir="${build.dir}/toolclasses/"