stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8296137: diags-examples.xml is broken

Browse Source 
Reviewed-by: iris, vromero, ihse
This commit is contained in:
Jonathan Gibbons 2022-11-07 15:58:42 +00:00
parent 00d22f605d
commit f8b2574ebc
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
make/langtools/diags-examples.xml
View File

@ -35,20 +35,20 @@ Usage:
By default, the reports will be generated in langtools/build/diags-examples/report/. By default, the reports will be generated in langtools/build/diags-examples/report/.
--> -->
<project name="diags-examples" default="diags-examples" basedir=".."> <project name="diags-examples" default="diags-examples" basedir="../..">
<import file="build.xml"/> <import file="build.xml"/>
<!-- specify working directory for the tool --> <!-- specify working directory for the tool -->
<property name="diags.examples.dir" location="${build.dir}/diag-examples"/> <property name="diags.examples.dir" location="${build.dir}/diag-examples"/>
<!-- compiled classes for the tool --> <!-- compiled classes for the tool -->
<property name="diags.examples.classes" location="${diags.examples.dir}/classes}"/> <property name="diags.examples.classes" location="${diags.examples.dir}/classes"/>
<!-- directory for generated reports --> <!-- directory for generated reports -->
<property name="diags.examples.report" location="${diags.examples.dir}/report"/> <property name="diags.examples.report" location="${diags.examples.dir}/report"/>
<!-- default target, generates reports for all available locales --> <!-- default target, generates reports for all available locales -->
<target name="diags-examples" depends="run-en_US,run-ja,run-zh_CN"/> <target name="diags-examples" depends="run-en_US,run-ja,run-zh_CN,run-de"/>
<!-- generate report for US English locale --> <!-- generate report for US English locale -->
<target name="run-en_US" depends="-build-runner,-def-runner"> <target name="run-en_US" depends="-build-runner,-def-runner">
@ -68,12 +68,18 @@ By default, the reports will be generated in langtools/build/diags-examples/repo
<runner lang="zh" country="CN" outfile="${diags.examples.report}/zh_CN.html"/> <runner lang="zh" country="CN" outfile="${diags.examples.report}/zh_CN.html"/>
</target> </target>
<!-- generate report for German locale -->
<target name="run-de" depends="-build-runner,-def-runner">
<mkdir dir="${diags.examples.report}"/>
<runner lang="de" outfile="${diags.examples.report}/de.html"/>
</target>
<!-- compile the tool that runs the examples --> <!-- compile the tool that runs the examples -->
<target name="-build-runner" depends="build"> <target name="-build-runner" depends="build">
<mkdir dir="${diags.examples.classes}"/> <mkdir dir="${diags.examples.classes}"/>
<javac fork="true" <javac fork="true"
executable="${build.bin}/javac" executable="${build.bin}/javac"
srcdir="test/tools/javac/diags" srcdir="test/langtools/tools/javac/diags"
destdir="${diags.examples.classes}" destdir="${diags.examples.classes}"
includes="ArgTypeCompilerFactory.java,Example.java,FileManager.java,HTMLWriter.java,RunExamples.java,DocCommentProcessor.java" includes="ArgTypeCompilerFactory.java,Example.java,FileManager.java,HTMLWriter.java,RunExamples.java,DocCommentProcessor.java"
sourcepath="" sourcepath=""
@ -98,7 +104,7 @@ By default, the reports will be generated in langtools/build/diags-examples/repo
<sequential> <sequential>
<java fork="true" <java fork="true"
jvm="${langtools.jdk.home}/bin/java" jvm="${langtools.jdk.home}/bin/java"
dir="test/tools/javac/diags" dir="test/langtools/tools/javac/diags"
classpath="${diags.examples.classes};${dist.lib.dir}/javac.jar;${dist.lib.dir}/javap.jar" classpath="${diags.examples.classes};${dist.lib.dir}/javac.jar;${dist.lib.dir}/javap.jar"
classname="RunExamples"> classname="RunExamples">
<jvmarg value="-Duser.language=@{lang}"/> <jvmarg value="-Duser.language=@{lang}"/>

2
test/langtools/tools/javac/diags/Example.java
View File

@ -234,7 +234,7 @@ class Example implements Comparable<Example> {
//automatic modules: //automatic modules:
Map<String, List<Path>> module2Files = Map<String, List<Path>> module2Files =
modulePathFiles.stream() modulePathFiles.stream()
.map(f -> f.toPath()) .map(f -> f.toPath().toAbsolutePath())
.collect(Collectors.groupingBy(p -> modulePath.relativize(p) .collect(Collectors.groupingBy(p -> modulePath.relativize(p)
.getName(0) .getName(0)
.toString())); .toString()));