/hg/icedtea8-forest/langtools: 35 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Tue Nov 8 05:24:46 UTC 2016


changeset bc44f1f002c9 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=bc44f1f002c9
author: asaha
date: Wed Jun 22 08:52:25 2016 -0700

	Added tag jdk8u102-b14 for changeset 0549bf2f507d


changeset cc1e702fab6a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=cc1e702fab6a
author: asaha
date: Mon Apr 11 12:35:04 2016 -0700

	Added tag jdk8u111-b00 for changeset 90f493bfe1fa


changeset 85b3985bce89 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=85b3985bce89
author: asaha
date: Thu Apr 28 10:05:33 2016 -0700

	Merge


changeset 0848f6992f45 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=0848f6992f45
author: asaha
date: Tue May 10 12:20:00 2016 -0700

	Merge


changeset f183270f427c in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f183270f427c
author: asaha
date: Mon May 16 14:35:02 2016 -0700

	Merge


changeset 6729145cba72 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=6729145cba72
author: asaha
date: Wed Jun 15 13:52:05 2016 -0700

	Merge


changeset 18568fe46895 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=18568fe46895
author: asaha
date: Wed Jun 01 16:18:46 2016 -0700

	Added tag jdk8u92-b32 for changeset 4e8ce6c84e4c


changeset 3ca74ce54c35 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3ca74ce54c35
author: asaha
date: Fri Jun 10 10:48:40 2016 -0700

	Added tag jdk8u92-b33 for changeset 18568fe46895


changeset 728f53370fa5 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=728f53370fa5
author: asaha
date: Wed Jun 15 14:28:02 2016 -0700

	Merge


changeset 085fd7e08f48 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=085fd7e08f48
author: asaha
date: Wed Jun 15 14:34:25 2016 -0700

	Merge


changeset c73016a4ecd3 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=c73016a4ecd3
author: asaha
date: Tue Jun 21 09:14:19 2016 -0700

	Added tag jdk8u111-b01 for changeset 085fd7e08f48


changeset 48f83d1ed148 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=48f83d1ed148
author: asaha
date: Thu Jun 23 08:38:10 2016 -0700

	Merge


changeset f66a535fb6b3 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f66a535fb6b3
author: asaha
date: Thu Jun 23 09:04:06 2016 -0700

	Merge


changeset 5b345e7eb131 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=5b345e7eb131
author: asaha
date: Mon Jun 27 12:10:39 2016 -0700

	Added tag jdk8u111-b02 for changeset f66a535fb6b3


changeset 310476ce93b9 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=310476ce93b9
author: asaha
date: Tue Jun 28 22:03:35 2016 -0700

	Added tag jdk8u92-b34 for changeset 3ca74ce54c35


changeset d86027f25a9a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d86027f25a9a
author: asaha
date: Wed Jun 29 12:02:51 2016 -0700

	Merge


changeset 386c8bc6dd3e in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=386c8bc6dd3e
author: asaha
date: Wed Jun 29 12:16:34 2016 -0700

	Merge


changeset b4bd1c5fbbe3 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b4bd1c5fbbe3
author: asaha
date: Mon Jul 04 13:06:03 2016 -0700

	Added tag jdk8u111-b03 for changeset 386c8bc6dd3e


changeset 1b511d4e93e7 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=1b511d4e93e7
author: asaha
date: Mon Jul 04 15:08:38 2016 -0700

	Added tag jdk8u102-b31 for changeset d86027f25a9a


changeset f74918365a72 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f74918365a72
author: asaha
date: Tue Jul 05 15:03:58 2016 -0700

	Merge


changeset fd9b6417c521 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=fd9b6417c521
author: bpatel
date: Wed Jul 06 20:07:09 2016 -0700

	8151921: Improved page resolution
	Reviewed-by: jjg, ksrini


changeset 5710d574a99a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=5710d574a99a
author: asaha
date: Tue Jul 12 14:40:39 2016 -0700

	Added tag jdk8u111-b04 for changeset fd9b6417c521


changeset 9ce3a6ba4575 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=9ce3a6ba4575
author: asaha
date: Mon Jul 18 19:25:32 2016 -0700

	Added tag jdk8u111-b05 for changeset 5710d574a99a


changeset 405b1845ab39 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=405b1845ab39
author: asaha
date: Mon Jul 25 11:21:15 2016 -0700

	Added tag jdk8u111-b06 for changeset 9ce3a6ba4575


changeset a1af868d0d45 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=a1af868d0d45
author: asaha
date: Mon Aug 01 12:08:59 2016 -0700

	Added tag jdk8u111-b07 for changeset 405b1845ab39


changeset 8a30511b2ea4 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=8a30511b2ea4
author: asaha
date: Thu Aug 04 23:36:47 2016 -0700

	8162511: 8u111 L10n resource file updates
	Summary: 8u111 L10n resource file updates
	Reviewed-by: coffeys
	Contributed-by: li.jiang at oracle.com


changeset 62cbd4997d4b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=62cbd4997d4b
author: asaha
date: Mon Aug 08 11:29:19 2016 -0700

	Added tag jdk8u111-b08 for changeset 8a30511b2ea4


changeset 1d4853d9975e in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=1d4853d9975e
author: asaha
date: Tue Aug 16 12:19:58 2016 -0700

	Added tag jdk8u111-b09 for changeset 62cbd4997d4b


changeset 74b16a9a8eda in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=74b16a9a8eda
author: asaha
date: Mon Aug 22 10:53:55 2016 -0700

	8164452: 8u111 L10n resource file update - msgdrop 20
	Summary: 8u111 L10n resource file update - msgdrop 20
	Reviewed-by: coffeys
	Contributed-by: li.jiang at oracle.com


changeset f51f1b8a7b58 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f51f1b8a7b58
author: asaha
date: Mon Aug 22 13:22:10 2016 -0700

	Added tag jdk8u111-b10 for changeset 74b16a9a8eda


changeset 8e5e70b9cff8 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=8e5e70b9cff8
author: asaha
date: Wed Aug 31 09:49:16 2016 -0700

	Added tag jdk8u111-b11 for changeset f51f1b8a7b58


changeset ef3134b243da in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=ef3134b243da
author: asaha
date: Wed Sep 14 12:43:28 2016 -0700

	Added tag jdk8u111-b12 for changeset 8e5e70b9cff8


changeset 0e2e745ed6d7 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=0e2e745ed6d7
author: asaha
date: Wed Sep 21 13:43:10 2016 -0700

	Added tag jdk8u111-b13 for changeset ef3134b243da


changeset a553c153d376 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=a553c153d376
author: andrew
date: Thu Nov 03 18:13:11 2016 +0000

	Merge jdk8u111-b14


changeset 56b10dbfe87e in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=56b10dbfe87e
author: andrew
date: Tue Nov 08 05:26:14 2016 +0000

	Added tag icedtea-3.2.0 for changeset a553c153d376


diffstat:

 .hgtags                                                                     |  43 ++++++++++
 .jcheck/conf                                                                |   2 -
 make/BuildLangtools.gmk                                                     |   4 +-
 make/build.xml                                                              |   2 +-
 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java |  11 +-
 src/share/classes/com/sun/tools/javac/resources/javac_ja.properties         |   4 +-
 test/com/sun/javadoc/testJavascript/TestJavascript.java                     |  13 +-
 7 files changed, 61 insertions(+), 18 deletions(-)

diffs (238 lines):

diff -r 0549bf2f507d -r 56b10dbfe87e .hgtags
--- a/.hgtags	Tue Jun 21 18:50:20 2016 -0700
+++ b/.hgtags	Tue Nov 08 05:26:14 2016 +0000
@@ -50,6 +50,7 @@
 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73
 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74
 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75
+83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12
 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76
 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
@@ -63,6 +64,7 @@
 ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86
 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87
 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88
+681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13
 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89
 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90
 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91
@@ -111,6 +113,7 @@
 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134
 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135
 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
+8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14
 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
@@ -295,6 +298,7 @@
 1a57c569cb811a897691e42049eca33da8f8d761 jdk8u20-b07
 0f821eb7e92b242c878dca68ef63f9626643ee8f jdk8u20-b08
 aa0cb3af23d376e012a142b0531c4f42032fdacf jdk8u20-b09
+dd7b57ab4ab1a4bb93c543af3a13f66fe85a7802 icedtea-3.0.0pre01
 a0d9c18a1041c4217db9cda1817f0e348f1be885 jdk8u20-b10
 7ad480b982bf95b8a7290c8769b2698f6aacaf6b jdk8u20-b11
 e101a12a45a777268a2e729803499a7514255e5b jdk8u20-b12
@@ -308,6 +312,7 @@
 e92effa22ecee1cb9965c278e45e2b1a6fbe0766 jdk8u20-b20
 7de1481c6cd88b42d815ae65e2d5b1cd918e11d1 jdk8u20-b21
 61fb0d8b169164ad5db15b6c497489cb30efb9c6 jdk8u20-b22
+948daf9c5e22c99a8c4d26d7956d9b55b888ab08 icedtea-3.0.0pre02
 5c1d6da1445aa3a2e5cf6101c70e79bfbe2745a5 jdk8u20-b23
 9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b24
 9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b25
@@ -375,6 +380,9 @@
 94f30e5fde53e3ddcd3c4e9842349318eae8fe10 jdk8u40-b18
 0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u40-b19
 c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20
+0d5d2b8411d9c36f180c6d0d3029629fa2070018 icedtea-3.0.0pre03
+66f265db6f474faba47a35888ca9131562fd59a1 icedtea-3.0.0pre04
+811deb5a72d392f846f0ab4e38d4ee392e9553cf icedtea-3.0.0pre05
 9113c7c8d902ec94b28ca0ef4a6466bdba65fcfc jdk8u40-b21
 79177246b3dbe5296fb53755d8695acdaef59fc8 jdk8u40-b22
 fb294b49373bda0b3afc7f011d64ecefed73b42e jdk8u40-b23
@@ -453,6 +461,9 @@
 97328f3e2aa2c713931edf471270a1208980b963 jdk8u60-b21
 d1febf79ce5ea41fb4b818ffd3589cf923e6de5f jdk8u60-b22
 7f88b5dc78cebc2c5ebb716938fd9a7632b052b2 jdk8u60-b23
+69b782e543d54118f9354b6071830de5feb96b83 icedtea-3.0.0pre06
+3c76eafe1b7010bf5536add7097c318d349efb16 icedtea-3.0.0pre07
+0d3479e0bac61b3fab0f8e884fc6bda8f8f351a5 icedtea-3.0.0pre08
 2af11e10da7dc24610551bbeed02c4ca3f4ae654 jdk8u60-b24
 8d152d1e45944616309886e730ffcbfb5c078d22 jdk8u60-b25
 3876ab6f471b85a02bb2cdaca00652f169f9e27a jdk8u60-b26
@@ -535,6 +546,7 @@
 5218bea65fe64b31cf201f3f6dd0310b74acec1e jdk8u72-b12
 5b67278c6616dca433488697eb6f2f81fcbbf22d jdk8u72-b13
 0ee6d8ae247d449950c18623513ccae4349e70d6 jdk8u72-b14
+076ec0ef64f0b4d71419e99ca2666ca814b508ad icedtea-3.0.0pre09
 48d0c20256a37ad20d075091285ea23788186f9a jdk8u72-b15
 ee6ec29fce4fa75ff846f7cbf61da162d8c5b605 jdk8u72-b31
 1a1711b8d11959992c27462d652003965ef3dc36 jdk8u73-b00
@@ -570,6 +582,9 @@
 ae2485fab956c636f6ce10a23812204c0ae17046 jdk8u77-b00
 37a348477fe89736549913f51ec8143a8e73f71c jdk8u77-b01
 47efac0d67984678edf626f407b3d3e54083c242 jdk8u77-b02
+d6b6666581f91588b9c66cadaaddadbe7266d78b icedtea-3.0.0pre10
+dd581e8047e6f15c811b345ed4eef0218ca9fe18 icedtea-3.0.0
+d05b69482d8390591cf8a1ebf9166ba46259bebd icedtea-3.0-branchpoint
 094308b2ca1c6d6dd76d9412799b9f3b4299acb5 jdk8u77-b03
 837f6e6559d578fadecb4932f3ceedfc31681bca jdk8u77-b31
 4cbd08688ff5a39f936edf16dd765d1efa13d030 jdk8u91-b00
@@ -591,8 +606,15 @@
 b86071b48b55340a3e712e91b2ba203a55a79571 jdk8u76-b12
 db821ed6165c5080b09e829b4523dcf82d995a2f jdk8u92-b00
 12846c3fc5a151a33e9446eff6e6704110c00362 jdk8u92-b13
+f3a9ed2cc7219a2b9b0cfd11729bbd0ef798e7ee icedtea-3.1.0pre01
+dbf29857221f4aa707e3a7acf850b06e690bcc01 icedtea-3.1.0pre02
+ff680965fa8c23cdafdd1028e1f33d0f351ad079 icedtea-3.1.0pre03
+fc69984700e156fe3290daea69e2d2ecc8acccaf icedtea-3.1.0pre04
 c99c71a68555038fdd1e86a10dab9c9007ec3745 jdk8u92-b14
 71176efa69475fc737d1245a28e739ddf105fd1c jdk8u92-b31
+4e8ce6c84e4ca9dd385012c10e059c15dbfcc468 jdk8u92-b32
+18568fe46895af6a7b562ffe6334a24fb5d9ee50 jdk8u92-b33
+3ca74ce54c351db2ac551e495a8b7ee65fb09e64 jdk8u92-b34
 580f87c4d91aa8cc493dbbd84a1be9671fd733f3 jdk8u81-b00
 a93c1e57407944362e05c79d756425e8c1274d9a jdk8u101-b01
 86a9d99ffadaf26b3d8417666a3600ea1ce7560f jdk8u101-b02
@@ -606,6 +628,8 @@
 20f3856902a522f01b28aa2aa38701606af83ab8 jdk8u101-b10
 5cc23fe55ff4c64838e2335644b674bdd0888340 jdk8u101-b11
 0cef544b9eee7042001a2b7f5f9e8a48ef20d779 jdk8u101-b12
+05822f2e947be716d90fa20335b57c9ce5ee62aa icedtea-3.1.0
+88f7b4f1b721ab67ca4cd72e691d2f6c7a72c64b icedtea-3.2.0pre01
 8dc8f71216bf40c259bb4127270922fb6a6ca293 jdk8u101-b13
 10ffafaf53404de7fd23784aa3ff6016d107b9c8 jdk8u76-b00
 0caab0d65a04d8cce71976a6bdc1ca0841bcbcf0 jdk8u76-b01
@@ -627,3 +651,22 @@
 592d155cc1332eba606900a7273863c74ef082a4 jdk8u102-b11
 16c58d7af5a4937e46bccd58114a56a7ffcd685c jdk8u102-b12
 56b0df415b570e31dc0b97d4a1c8f28b85240089 jdk8u102-b13
+19ea84ae4992037367f85aadb746279ab489422a icedtea-3.2.0pre02
+5665ca5e1896dcf47faa2c5c50d1130b8b783944 icedtea-3.2.0pre03
+0549bf2f507dae59bfcd7d11e038cdc62376fee7 jdk8u102-b14
+d86027f25a9aa960d69cf3a524588a873ae888f5 jdk8u102-b31
+90f493bfe1faca0573844fdd2497070c8b224d76 jdk8u111-b00
+085fd7e08f4855f134a8048251c4535ddde1feee jdk8u111-b01
+f66a535fb6b3b41419c987cc90407507a64712b2 jdk8u111-b02
+386c8bc6dd3ea0d49ea483cbbe95f4b12b66db23 jdk8u111-b03
+fd9b6417c521c5ec26224129d90b38d40c04c54d jdk8u111-b04
+5710d574a99aeff3600c49a4aed34fa1b373f7b8 jdk8u111-b05
+9ce3a6ba45751aaf57cb50609f3fd64c02d66f51 jdk8u111-b06
+405b1845ab3995b43efe0e770070b90f4c5c9080 jdk8u111-b07
+8a30511b2ea4714f5868b33be07b0562bb1edbfb jdk8u111-b08
+62cbd4997d4bf8433186d3fa30847577aa483ea3 jdk8u111-b09
+74b16a9a8eda03779e55ba145bdb6a08a1ebd780 jdk8u111-b10
+f51f1b8a7b58355c11392effdf0e4f738a79a8ad jdk8u111-b11
+8e5e70b9cff8f928d28db4890d4e5905a739d210 jdk8u111-b12
+ef3134b243da77d0aed9f3cef2b3855c3be2111a jdk8u111-b13
+a553c153d37671a371767229c71189d963964996 icedtea-3.2.0
diff -r 0549bf2f507d -r 56b10dbfe87e .jcheck/conf
--- a/.jcheck/conf	Tue Jun 21 18:50:20 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
diff -r 0549bf2f507d -r 56b10dbfe87e make/BuildLangtools.gmk
--- a/make/BuildLangtools.gmk	Tue Jun 21 18:50:20 2016 -0700
+++ b/make/BuildLangtools.gmk	Tue Nov 08 05:26:14 2016 +0000
@@ -36,7 +36,7 @@
     JAVAC := $(JAVAC), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA), \
-    FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
+    FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation $(JAVAC_WERROR)))
 
 # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
 RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool
@@ -175,7 +175,7 @@
         JAVAC := "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
             -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
             com.sun.tools.javac.Main, \
-        FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \
+        FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation $(JAVAC_WERROR), \
         SERVER_DIR := $(SJAVAC_SERVER_DIR), \
         SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
 
diff -r 0549bf2f507d -r 56b10dbfe87e make/build.xml
--- a/make/build.xml	Tue Jun 21 18:50:20 2016 -0700
+++ b/make/build.xml	Tue Nov 08 05:26:14 2016 +0000
@@ -1027,7 +1027,7 @@
         </javac>
         <taskdef name="genstubs"
                  classname="anttasks.GenStubsTask"
-                 classpath="${build.toolclasses.dir}/"/>
+                 classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
     </target>
 
     <target name="-def-javadoc-tool" depends="-check-target.java.home">
diff -r 0549bf2f507d -r 56b10dbfe87e src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Jun 21 18:50:20 2016 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Nov 08 05:26:14 2016 +0000
@@ -380,11 +380,12 @@
         HtmlTree script = new HtmlTree(HtmlTag.SCRIPT);
         script.addAttr(HtmlAttr.TYPE, "text/javascript");
         String scriptCode = DocletConstants.NL +
-                "    targetPage = \"\" + window.location.search;" + DocletConstants.NL +
-                "    if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
-                "        targetPage = targetPage.substring(1);" + DocletConstants.NL +
-                "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
-                "        targetPage = \"undefined\";" + DocletConstants.NL +
+                "    tmpTargetPage = \"\" + window.location.search;" + DocletConstants.NL +
+                "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + DocletConstants.NL +
+                "        tmpTargetPage = tmpTargetPage.substring(1);" + DocletConstants.NL +
+                "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + DocletConstants.NL +
+                "        tmpTargetPage = \"undefined\";" + DocletConstants.NL +
+                "    targetPage = tmpTargetPage;" + DocletConstants.NL +
                 "    function validURL(url) {" + DocletConstants.NL +
                 "        try {" + DocletConstants.NL +
                 "            url = decodeURIComponent(url);" + DocletConstants.NL +
diff -r 0549bf2f507d -r 56b10dbfe87e src/share/classes/com/sun/tools/javac/resources/javac_ja.properties
--- a/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Tue Jun 21 18:50:20 2016 -0700
+++ b/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Tue Nov 08 05:26:14 2016 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 javac.opt.classpath=\u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
 javac.opt.sourcepath=\u5165\u529B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
 javac.opt.bootclasspath=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B
+javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306E\u5148\u982D\u306B\u4ED8\u52A0\u3059\u308B
 javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
 javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
 javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
diff -r 0549bf2f507d -r 56b10dbfe87e test/com/sun/javadoc/testJavascript/TestJavascript.java
--- a/test/com/sun/javadoc/testJavascript/TestJavascript.java	Tue Jun 21 18:50:20 2016 -0700
+++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java	Tue Nov 08 05:26:14 2016 +0000
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756
+ * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756 8151921
  * @summary  Verify that the output has the right javascript.
  * @author   jamieh
  * @library  ../lib/
@@ -50,11 +50,12 @@
             "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"},
         {BUG_ID + FS + "index.html",
             "<script type=\"text/javascript\">" + NL +
-                        "    targetPage = \"\" + window.location.search;" + NL +
-            "    if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
-            "        targetPage = targetPage.substring(1);" + NL +
-            "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
-            "        targetPage = \"undefined\";" + NL +
+            "    tmpTargetPage = \"\" + window.location.search;" + NL +
+            "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + NL +
+            "        tmpTargetPage = tmpTargetPage.substring(1);" + NL +
+            "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + NL +
+            "        tmpTargetPage = \"undefined\";" + NL +
+            "    targetPage = tmpTargetPage;" + NL +
             "    function validURL(url) {" + NL +
             "        try {" + NL +
             "            url = decodeURIComponent(url);" + NL +


More information about the distro-pkg-dev mailing list