If this looks okay to you then I'll push it.
(It also enables -ea for jdk.javadoc code, which I suspect was always
the intent.)
Thanks,
- Mark
# HG changeset patch
# Parent 84d1306b39efaebe4dbeff2b9c84fc7ec4189556
Fix launcher script for new -Xpatch
diff --git a/make/launcher.sh-template b/make/launcher.sh-template
--- a/make/launcher.sh-template
+++ b/make/launcher.sh-template
@@ -33,11 +33,8 @@
esac
mylib="$mydir/../modules"
-# patch langtools modules
-bcp=-Xpatch:"$mylib"
-
# tools currently assumes that assertions are enabled in the launcher
-ea=-ea:com.sun.tools...
+ea=-ea:com.sun.tools...:jdk.javadoc...
# Any parameters starting with -J are passed to the JVM.
# All other parameters become parameters of #PROGRAM#.
@@ -58,5 +55,10 @@
done
unset DUALCASE
+# patch langtools modules
+mods='java.compiler jdk.compiler jdk.javadoc jdk.jdeps jdk.jshell'
+patches=
+for m in $mods; do patches="$patches$nl-Xpatch:$m=$mylib/$m"; done
+
IFS=$nl
-"#TARGET_JAVA#" $bcp ${ea} ${javaOpts} #PROGRAM# ${toolOpts}
+"#TARGET_JAVA#" ${patches} ${ea} ${javaOpts} #PROGRAM# ${toolOpts}
