Skip to content

Commit 9c94fc2

Browse files
author
duke
committed
Merge
2 parents df024ee + 2160e91 commit 9c94fc2

File tree

252 files changed

+13320
-5054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+13320
-5054
lines changed

‎langtools/.hgtags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,3 +361,4 @@ cba09a2e6ae969b029783eb59bb01017b78f8eef jdk-9+114
361361
3e3553ee39d9e081573bc7c88a252214a3152763 jdk-9+116
362362
59adcdd0cd3b6724b4fc0083c258bf4682689f2f jdk-9+117
363363
59a16fa5dedea9ff5bea0a501e4d0d40193426f3 jdk-9+118
364+
6347efd1be03b4fdcf18f64c4fe4be5f60c0831a jdk-9+119

‎langtools/make/build.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ javac.opts = -XDignore.symbol.file=true -Xlint:all,-deprecation,-options -Werror
2828
javac.source = 9
2929
javac.target = 9
3030

31+
#version used to compile build tools
32+
javac.build.source = 8
33+
javac.build.target = 8
34+
3135
langtools.resource.includes = \
3236
com/sun/tools/javac/resources/compiler.properties
3337

‎langtools/make/build.xml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,12 @@
239239
</condition>
240240
<replace file=".idea/ant.xml" token="@IDEA_JTREG_HOME@" value="${idea.jtreg.home}"/>
241241
<replace file=".idea/ant.xml" token="@IDEA_TARGET_JDK@" value="${idea.target.jdk}"/>
242-
<replace file=".idea/workspace.xml" token="@IDEA_TARGET_JDK@" value="${idea.target.jdk}"/>
243-
<replace file=".idea/workspace.xml" token="@XPATCH@" value="${xpatch.cmd}"/>
244-
<replace file=".idea/workspace.xml" token="@PATH_SEP@" value="${path.separator}"/>
242+
<replace dir=".idea/runConfigurations" token="@IDEA_TARGET_JDK@" value="${idea.target.jdk}"/>
243+
<replace dir=".idea/runConfigurations" token="@XPATCH@" value="${xpatch.cmd}"/>
245244
<mkdir dir=".idea/classes"/>
246-
<javac srcdir="make/intellij/src"
245+
<javac source="${javac.build.source}"
246+
target="${javac.build.target}"
247+
srcdir="make/intellij/src"
247248
destdir=".idea/classes"/>
248249
</target>
249250

@@ -255,10 +256,8 @@
255256
<copy todir="${build.tools}/propertiesparser" >
256257
<fileset dir="${make.tools.dir}/propertiesparser" includes="**/resources/**"/>
257258
</copy>
258-
<javac fork="true"
259-
source="${javac.source}"
260-
target="${javac.target}"
261-
executable="${langtools.jdk.home}/bin/javac"
259+
<javac source="${javac.build.source}"
260+
target="${javac.build.target}"
262261
srcdir="${make.tools.dir}"
263262
includes="propertiesparser/* anttasks/PropertiesParser* anttasks/PathFileSet*"
264263
destdir="${build.tools}"
@@ -273,10 +272,9 @@
273272
</target>
274273

275274
<target name="-def-pcompile">
276-
<javac fork="true"
277-
source="${javac.source}"
278-
target="${javac.target}"
279-
executable="${langtools.jdk.home}/bin/javac"
275+
<javac
276+
source="${javac.build.source}"
277+
target="${javac.build.target}"
280278
srcdir="${make.tools.dir}"
281279
includes="compileproperties/* anttasks/CompileProperties* anttasks/PathFileSet*"
282280
destdir="${build.dir}/toolclasses/"

‎langtools/make/intellij/runConfigurations/javac.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="javac" type="Application" factoryName="Application">
3+
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
4+
<option name="MAIN_CLASS_NAME" value="com.sun.tools.javac.Main" />
5+
<option name="VM_PARAMETERS" value="@XPATCH@" />
6+
<option name="PROGRAM_PARAMETERS" value="" />
7+
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
8+
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
9+
<option name="ALTERNATIVE_JRE_PATH" value="@IDEA_TARGET_JDK@" />
10+
<option name="ENABLE_SWING_INSPECTOR" value="false" />
11+
<option name="ENV_VARIABLES" />
12+
<option name="PASS_PARENT_ENVS" value="true" />
13+
<module name="langtools" />
14+
<envs />
15+
<RunnerSettings RunnerId="Run" />
16+
<ConfigurationWrapper RunnerId="Run" />
17+
<method>
18+
<option name="Make" enabled="false" />
19+
<option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/.idea/build.xml" target="build-all-classes" />
20+
</method>
21+
</configuration>
22+
</component>

‎langtools/make/intellij/runConfigurations/javadoc.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="javadoc" type="Application" factoryName="Application">
3+
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
4+
<option name="MAIN_CLASS_NAME" value="com.sun.tools.javadoc.Main" />
5+
<option name="VM_PARAMETERS" value="@XPATCH@" />
6+
<option name="PROGRAM_PARAMETERS" value="" />
7+
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
8+
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
9+
<option name="ALTERNATIVE_JRE_PATH" value="@IDEA_TARGET_JDK@" />
10+
<option name="ENABLE_SWING_INSPECTOR" value="false" />
11+
<option name="ENV_VARIABLES" />
12+
<option name="PASS_PARENT_ENVS" value="true" />
13+
<module name="langtools" />
14+
<envs />
15+
<RunnerSettings RunnerId="Run" />
16+
<ConfigurationWrapper RunnerId="Run" />
17+
<method>
18+
<option name="Make" enabled="false" />
19+
<option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/.idea/build.xml" target="build-all-classes" />
20+
</method>
21+
</configuration>
22+
</component>

‎langtools/make/intellij/runConfigurations/javah.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="javah" type="Application" factoryName="Application">
3+
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
4+
<option name="MAIN_CLASS_NAME" value="com.sun.tools.javah.Main" />
5+
<option name="VM_PARAMETERS" value="@XPATCH@ -XaddExports:jdk.compiler/com.sun.tools.javah=ALL-UNNAMED" />
6+
<option name="PROGRAM_PARAMETERS" value="" />
7+
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
8+
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
9+
<option name="ALTERNATIVE_JRE_PATH" value="@IDEA_TARGET_JDK@" />
10+
<option name="ENABLE_SWING_INSPECTOR" value="false" />
11+
<option name="ENV_VARIABLES" />
12+
<option name="PASS_PARENT_ENVS" value="true" />
13+
<module name="langtools" />
14+
<envs />
15+
<RunnerSettings RunnerId="Run" />
16+
<ConfigurationWrapper RunnerId="Run" />
17+
<method>
18+
<option name="Make" enabled="false" />
19+
<option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/.idea/build.xml" target="build-all-classes" />
20+
</method>
21+
</configuration>
22+
</component>

‎langtools/make/intellij/runConfigurations/javap.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="javap" type="Application" factoryName="Application">
3+
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
4+
<option name="MAIN_CLASS_NAME" value="com.sun.tools.javap.Main" />
5+
<option name="VM_PARAMETERS" value="@XPATCH@ -XaddExports:jdk.jdeps/com.sun.tools.javap=ALL-UNNAMED" />
6+
<option name="PROGRAM_PARAMETERS" value="" />
7+
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
8+
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
9+
<option name="ALTERNATIVE_JRE_PATH" value="@IDEA_TARGET_JDK@" />
10+
<option name="ENABLE_SWING_INSPECTOR" value="false" />
11+
<option name="ENV_VARIABLES" />
12+
<option name="PASS_PARENT_ENVS" value="true" />
13+
<module name="langtools" />
14+
<envs />
15+
<RunnerSettings RunnerId="Run" />
16+
<ConfigurationWrapper RunnerId="Run" />
17+
<method>
18+
<option name="Make" enabled="false" />
19+
<option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/.idea/build.xml" target="build-all-classes" />
20+
</method>
21+
</configuration>
22+
</component>

‎langtools/make/intellij/runConfigurations/jshell.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="jshell" type="Application" factoryName="Application">
3+
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
4+
<option name="MAIN_CLASS_NAME" value="jdk.internal.jshell.tool.JShellTool" />
5+
<option name="VM_PARAMETERS" value="@XPATCH@ -XaddExports:jdk.jshell/jdk.internal.jshell.tool=ALL-UNNAMED" />
6+
<option name="PROGRAM_PARAMETERS" value="" />
7+
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
8+
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
9+
<option name="ALTERNATIVE_JRE_PATH" value="@IDEA_TARGET_JDK@" />
10+
<option name="ENABLE_SWING_INSPECTOR" value="false" />
11+
<option name="ENV_VARIABLES" />
12+
<option name="PASS_PARENT_ENVS" value="true" />
13+
<module name="langtools" />
14+
<envs />
15+
<method>
16+
<option name="Make" enabled="false" />
17+
<option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/.idea/build.xml" target="build-all-classes" />
18+
</method>
19+
</configuration>
20+
</component>

‎langtools/make/intellij/runConfigurations/jtreg__debug_.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="jtreg (debug)" type="Remote" factoryName="Remote" singleton="true">
3+
<option name="USE_SOCKET_TRANSPORT" value="true" />
4+
<option name="SERVER_MODE" value="true" />
5+
<option name="SHMEM_ADDRESS" />
6+
<option name="HOST" value="localhost" />
7+
<option name="PORT" value="5900" />
8+
<RunnerSettings RunnerId="Debug">
9+
<option name="DEBUG_PORT" value="5900" />
10+
<option name="TRANSPORT" value="0" />
11+
<option name="LOCAL" value="false" />
12+
</RunnerSettings>
13+
<ConfigurationWrapper RunnerId="Debug" />
14+
<method>
15+
<option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/.idea/build.xml" target="jtreg-debug" />
16+
</method>
17+
</configuration>
18+
</component>

‎langtools/make/intellij/runConfigurations/jtreg__run_.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="jtreg (run)" type="AntRunConfiguration" factoryName="Ant Target">
3+
<antsettings antfile="file://$PROJECT_DIR$/.idea/build.xml" target="jtreg" />
4+
<method>
5+
<option name="Make" enabled="false" />
6+
</method>
7+
</configuration>
8+
</component>

0 commit comments

Comments
 (0)