changeset 727:22a5eca17e5b

Merge
author mduigou
date Thu, 04 Apr 2013 14:52:59 -0700
parents 01f631f89fa3 0155dba36eea
children 23f7507871b3
files .hgtags Makefile common/autoconf/autogen.sh common/autoconf/configure.ac common/autoconf/generated-configure.sh common/autoconf/spec.gmk.in common/bin/hgforest.sh common/makefiles/Main.gmk common/makefiles/MakeBase.gmk make/Defs-internal.gmk make/jdk-rules.gmk make/sanity-rules.gmk make/scripts/hgforest.sh
diffstat 7 files changed, 30 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue Apr 02 15:29:18 2013 -0700
+++ b/.hgignore	Thu Apr 04 14:52:59 2013 -0700
@@ -5,3 +5,6 @@
 ^.hgtip
 ^.bridge2
 .DS_Store
+hotspot.log
+^JTreport
+^JTwork
--- a/.hgtags	Tue Apr 02 15:29:18 2013 -0700
+++ b/.hgtags	Thu Apr 04 14:52:59 2013 -0700
@@ -167,16 +167,20 @@
 661c9aae602bbd9766d12590800c90f1edd1d8dd jdk8-b43
 e4f81a817447c3a4f6868f083c81c2fb1b15d44c jdk8-b44
 633f2378c904c92bb922a6e19e9f62fe8eac14af jdk8-b45
+f3fc96a9b243322ad5d058911162189e3ded0e96 lambda-b45
 27fa766a2298ba8347dc198f0cf85ba6618e17db jdk8-b46
 1dcb4b7b9373e64e135c12fe1f8699f1f80e51e8 jdk8-b47
 3f6c72d1c2a6e5c9e7d81c3dc984886678a128ad jdk8-b48
+f219811ab95916fc381a69410121e63cd6270f36 lambda-b48
 c97b99424815c43818e3cc3ffcdd1a60f3198b52 jdk8-b49
 2fd67618b9a3c847780ed7b9d228e862b6e2824c jdk8-b50
+cc5ead46ec895e756cb62ada8c1650f1cf6daa2a lambda-b50
 57c0aee7309050b9d6cfcbd202dc704e9260b377 jdk8-b51
 8d24def5ceb3b8f2e857f2e18b2804fc59eecf8d jdk8-b52
 febd7ff5280067ca482faaeb9418ae88764c1a35 jdk8-b53
 c1a277c6022affbc6855bdfb039511e73fbe2395 jdk8-b54
 b85b44cced2406792cfb9baab1377ff03e7001d8 jdk8-b55
+115a29d4c47520c4d9d684c321a60803903080bb lambda-b56
 76844579fa4b30929731115b237e477181a82394 jdk8-b56
 522dfac8ca4d07c0b74025d4ac3b6e5feefbb829 jdk8-b57
 9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58
--- a/common/bin/hgforest.sh	Tue Apr 02 15:29:18 2013 -0700
+++ b/common/bin/hgforest.sh	Thu Apr 04 14:52:59 2013 -0700
@@ -30,7 +30,7 @@
 # Python always buffers stdout significantly, thus we will not see any output from hg clone jdk,
 # until a lot of time has passed! By passing -u to python, we get incremental updates
 # on stdout. Much nicer.
-whichhg="`which hg`"
+whichhg="`which hg 2> /dev/null | grep -v '^no hg in'`"
 
 if [ "${whichhg}" = "" ] ; then
   echo Cannot find hg!
@@ -51,7 +51,7 @@
    bpython="`basename "$python"`"
 fi
 
-if [ "python" = "$bpython" -a -x "$python" ] ; then
+if [ -x "$python" -a ! -d "$python" -a "`${python} -V 2>&1 | cut -f 1 -d ' '`" = "Python" ] ; then
   hg="${python} -u ${whichhg}"
 else
   echo Cannot find python from hg launcher. Running plain hg, which probably has buffered stdout.
--- a/common/makefiles/Main.gmk	Tue Apr 02 15:29:18 2013 -0700
+++ b/common/makefiles/Main.gmk	Thu Apr 04 14:52:59 2013 -0700
@@ -197,7 +197,7 @@
 
 
 # Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs
+clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
 	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
 	@$(ECHO) Cleaned all build artifacts.
 
@@ -238,11 +238,13 @@
 clean-docs:
 	$(call CleanComponent,docs)
 	$(call CleanComponent,docstemp)
+clean-test:
+	$(call CleanComponent,testoutput)
 
 .PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
 .PHONY: all test clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build
+.PHONY: clean-langtools clean-docs clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build
 .PHONY: profiles profiles-only profiles-oscheck
 
 FRC: # Force target
--- a/common/makefiles/javadoc/CORE_PKGS.gmk	Tue Apr 02 15:29:18 2013 -0700
+++ b/common/makefiles/javadoc/CORE_PKGS.gmk	Thu Apr 04 14:52:59 2013 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2012, 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
@@ -142,6 +142,7 @@
   java.util.prefs                                \
   java.util.regex                                \
   java.util.spi                                  \
+  java.util.stream                               \
   java.util.zip                                  \
   javax.accessibility                            \
   javax.activation                               \
--- a/common/makefiles/javadoc/Javadoc.gmk	Tue Apr 02 15:29:18 2013 -0700
+++ b/common/makefiles/javadoc/Javadoc.gmk	Thu Apr 04 14:52:59 2013 -0700
@@ -390,6 +390,17 @@
 	  $(call OptionPair,-tag,specdefault:X)				; \
 	  $(call OptionPair,-tag,Note:X)				; \
 	  $(call OptionPair,-tag,ToDo:X)				; \
+          $(call OptionPair,-tag,apiNote:a:<em>API Note</em>)  	        ; \
+          $(call OptionPair,-tag,implSpec:a:<em>Implementation Requirements</em> ); \
+          $(call OptionPair,-tag,implNote:a:<em>Implementation Note</em>); \
+          $(call OptionPair,-tag,param )                                ; \
+          $(call OptionPair,-tag,return )                               ; \
+          $(call OptionPair,-tag,exception )                            ; \
+          $(call OptionPair,-tag,since )                                ; \
+          $(call OptionPair,-tag,version )                              ; \
+          $(call OptionPair,-tag,serialData )                           ; \
+          $(call OptionPair,-tag,factory )                              ; \
+          $(call OptionPair,-tag,see )                                  ; \
           $(call OptionPair,-tag,$(TAG_JLS)) 				; \
 	  $(call OptionOnly,-splitIndex)				; \
 	  $(call OptionPair,-overview,$(COREAPI_OVERVIEW))		; \
--- a/test/Makefile	Tue Apr 02 15:29:18 2013 -0700
+++ b/test/Makefile	Thu Apr 04 14:52:59 2013 -0700
@@ -75,7 +75,9 @@
 	jdk_swing \
 	jdk_tools \
 	jdk_jdi \
-	jdk_jfr
+	jdk_jfr \
+	jdk_lambda
+
 
 # Theses are meta test targets in jdk
 JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
@@ -106,4 +108,3 @@
         $(LANGTOOLS_TEST_LIST)
 
 ################################################################
-