Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8-b37
authorduke
Wed, 05 Jul 2017 18:09:43 +0200
changeset 12491 b3a91113026c
parent 12490 f99f1766a830 (diff)
parent 12473 2892463f7eeb (current diff)
child 12492 2e8c637e1ab6
child 12493 dccdf7b8791f
child 12494 6cf597938c70
child 12496 c44bb90734f8
child 12513 6123dd756c56
child 12518 593f1b183333
child 12522 1ce24ce9df2f
child 12558 9a300e0567f7
child 12563 070b00370cae
child 12569 cbbdab4be33e
child 12570 dfc1984cce6a
child 12573 426adeeabf00
child 12575 b03bb9688c69
child 12577 8bf61a6c4a22
child 12714 73f1f7097c5e
child 12813 c10ab96dcf41
child 12985 b8e776b87b52
child 13042 44d134b0557e
child 13055 fd5de8008e96
Merge
--- a/.hgtags-top-repo	Wed Jul 05 18:09:18 2017 +0200
+++ b/.hgtags-top-repo	Wed Jul 05 18:09:43 2017 +0200
@@ -157,3 +157,4 @@
 42f275168fa5d9e7c70b246614dca8cf81f52c2e jdk8-b33
 894a478d2c4819a1a0f230bd7bdd09f3b2de9a8c jdk8-b34
 5285317ebb4e8e4f6d8d52b5616fa801e2ea844d jdk8-b35
+6a6ba0a07f33d37a2f97b1107e60c6a9a69ec84d jdk8-b36
--- a/common/autoconf/configure	Wed Jul 05 18:09:18 2017 +0200
+++ b/common/autoconf/configure	Wed Jul 05 18:09:43 2017 +0200
@@ -10489,7 +10489,7 @@
 
 # Setup default logging of stdout and stderr to build.log in the output root.
 BUILD_LOG='$(OUTPUT_ROOT)/build.log'
-BUILD_LOG_WRAPPER='$(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
+BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
 
 
 
--- a/common/autoconf/configure.ac	Wed Jul 05 18:09:18 2017 +0200
+++ b/common/autoconf/configure.ac	Wed Jul 05 18:09:43 2017 +0200
@@ -1004,7 +1004,7 @@
 
 # Setup default logging of stdout and stderr to build.log in the output root.
 BUILD_LOG='$(OUTPUT_ROOT)/build.log'
-BUILD_LOG_WRAPPER='$(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
+BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
 AC_SUBST(BUILD_LOG)
 AC_SUBST(BUILD_LOG_WRAPPER)
 
--- a/corba/.hgtags	Wed Jul 05 18:09:18 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 18:09:43 2017 +0200
@@ -157,3 +157,4 @@
 1e2ac1ea3f6c32a62bf88f3fa330120c30db59cb jdk8-b33
 e24c5cc8b0f7cc48374eef0f995838fb4823e0eb jdk8-b34
 e3d735914edd0a621b16bb85417423f8e6af5d51 jdk8-b35
+a5a61f259961a7f46b002e5cc50b4a9bf86927b6 jdk8-b36
--- a/hotspot/.hgtags	Wed Jul 05 18:09:18 2017 +0200
+++ b/hotspot/.hgtags	Wed Jul 05 18:09:43 2017 +0200
@@ -241,3 +241,4 @@
 f284b08835584517c1ca3dd67341f569e763841f jdk8-b34
 f621660a297baa48fab9dca28e99d318826e8304 jdk8-b35
 dff6e3459210f8dd0430b9b03ccc99280560da30 hs24-b08
+50b4400ca1ecb2ac2fde35f5e53ec8f04b86be7f jdk8-b36
--- a/jaxp/.hgtags	Wed Jul 05 18:09:18 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 18:09:43 2017 +0200
@@ -157,3 +157,4 @@
 9bcab2b8b8ea578e594916a3d3df6dbec7984bcb jdk8-b33
 8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34
 e187f3ede64965dc2979df9a211107cd3d38eacb jdk8-b35
+cfd288fe1d3e2b700838342e70d71d44ac991af5 jdk8-b36
--- a/jaxp/makefiles/Makefile	Wed Jul 05 18:09:18 2017 +0200
+++ b/jaxp/makefiles/Makefile	Wed Jul 05 18:09:43 2017 +0200
@@ -47,7 +47,7 @@
 
 $(eval $(call SetupJavaCompilation,BUILD_JAXP,\
 		SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
-		SRC:=$(JAXP_TOPDIR)/src/share/classes,\
+		SRC:=$(JAXP_TOPDIR)/src,\
 		CLEAN:=.properties,\
 		BIN:=$(JAXP_OUTPUTDIR)/classes,\
 		SRCZIP:=$(JAXP_OUTPUTDIR)/dist/lib/src.zip))
--- a/jaxws/.hgtags	Wed Jul 05 18:09:18 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 18:09:43 2017 +0200
@@ -157,3 +157,4 @@
 ea80b2388dce711fbde8e4fd6e07c2c64ad16743 jdk8-b33
 f1d020a49c8c33667fb10c8caa255206a78a3675 jdk8-b34
 e8afc16522e190cb93c66bcb15d6fba0fe9e6833 jdk8-b35
+89b36c658e39f0a2957be55453a3a3befd9c8a6b jdk8-b36
--- a/jdk/.hgtags	Wed Jul 05 18:09:18 2017 +0200
+++ b/jdk/.hgtags	Wed Jul 05 18:09:43 2017 +0200
@@ -157,3 +157,4 @@
 78cea258caaba3980ba186c426da82c8fe41bfd7 jdk8-b33
 29b680393f33bf953688c17d93aca7a870ca4024 jdk8-b34
 2e3e1356ffbddb2ae95c08da72830ba9ab8b3181 jdk8-b35
+45da9cb055ee258dc09e69c1718e27eadea38e45 jdk8-b36
--- a/langtools/.hgtags	Wed Jul 05 18:09:18 2017 +0200
+++ b/langtools/.hgtags	Wed Jul 05 18:09:43 2017 +0200
@@ -157,3 +157,4 @@
 46831c72b7f6c69fef2cc2935001863643a65f94 jdk8-b33
 6b105afbb77ca9600a99eade31f686d070c70581 jdk8-b34
 defd666a786334465496c8901fa302b779c7e045 jdk8-b35
+94bbaa67686f44a124cd16fd9f1e8a6a3f684d2d jdk8-b36
jdk-sandbox