Mercurial > hg > release > icedtea8-forest-3.0 > langtools
changeset 3161:ad6886e3a101 icedtea-3.0.1
Merge jdk8u91-b14
| author | andrew |
|---|---|
| date | Wed, 20 Apr 2016 03:39:03 +0100 |
| parents | d05b69482d83 (diff) 8921667c26ba (current diff) |
| children | 7a63f0daa424 |
| files | .hgtags |
| diffstat | 4 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Mar 22 10:30:05 2016 -0700 +++ b/.hgtags Wed Apr 20 03:39:03 2016 +0100 @@ -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 @@ -452,6 +460,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 @@ -534,6 +545,7 @@ 5218bea65fe64b31cf201f3f6dd0310b74acec1e jdk8u72-b12 5b67278c6616dca433488697eb6f2f81fcbbf22d jdk8u72-b13 0ee6d8ae247d449950c18623513ccae4349e70d6 jdk8u72-b14 +076ec0ef64f0b4d71419e99ca2666ca814b508ad icedtea-3.0.0pre09 48d0c20256a37ad20d075091285ea23788186f9a jdk8u72-b15 1a1711b8d11959992c27462d652003965ef3dc36 jdk8u73-b00 c63c6cfda4da83e04dcc378e4c1f7e0d4fd6a008 jdk8u73-b01 @@ -557,6 +569,8 @@ ae2485fab956c636f6ce10a23812204c0ae17046 jdk8u77-b00 37a348477fe89736549913f51ec8143a8e73f71c jdk8u77-b01 47efac0d67984678edf626f407b3d3e54083c242 jdk8u77-b02 +d6b6666581f91588b9c66cadaaddadbe7266d78b icedtea-3.0.0pre10 +dd581e8047e6f15c811b345ed4eef0218ca9fe18 icedtea-3.0.0 094308b2ca1c6d6dd76d9412799b9f3b4299acb5 jdk8u77-b03 4cbd08688ff5a39f936edf16dd765d1efa13d030 jdk8u91-b00 5fa11675dbe55f49663a45d1d5a6c1a2d3b2ec28 jdk8u91-b13
--- a/.jcheck/conf Tue Mar 22 10:30:05 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk8 -bugids=dup
--- a/make/BuildLangtools.gmk Tue Mar 22 10:30:05 2016 -0700 +++ b/make/BuildLangtools.gmk Wed Apr 20 03:39:03 2016 +0100 @@ -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)))
--- a/make/build.xml Tue Mar 22 10:30:05 2016 -0700 +++ b/make/build.xml Wed Apr 20 03:39:03 2016 +0100 @@ -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">