Mercurial > hg > openjdk > lambda
changeset 689:e8f5161206ae
Merge
| author | mduigou |
|---|---|
| date | Fri, 08 Mar 2013 16:02:22 -0800 |
| parents | cd7f2c7e2a0e (current diff) 52d82f83de31 (diff) |
| children | 837a1f05233b |
| files | .hgtags README README-builds.html common/autoconf/configure.ac common/autoconf/generated-configure.sh common/autoconf/help.m4 common/autoconf/spec.gmk.in common/makefiles/JavaCompilation.gmk common/makefiles/Main.gmk |
| diffstat | 6 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Thu Mar 07 11:17:28 2013 -0800 +++ b/.hgignore Fri Mar 08 16:02:22 2013 -0800 @@ -5,3 +5,6 @@ ^.hgtip ^.bridge2 .DS_Store +hotspot.log +^JTreport +^JTwork
--- a/.hgtags Thu Mar 07 11:17:28 2013 -0800 +++ b/.hgtags Fri Mar 08 16:02:22 2013 -0800 @@ -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/makefiles/Main.gmk Thu Mar 07 11:17:28 2013 -0800 +++ b/common/makefiles/Main.gmk Fri Mar 08 16:02:22 2013 -0800 @@ -175,9 +175,10 @@ @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images) -test: start-make +test: images test-only +test-only: start-make @$(call TargetEnter) - @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true + @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true @$(call TargetExit) # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
--- a/common/makefiles/javadoc/CORE_PKGS.gmk Thu Mar 07 11:17:28 2013 -0800 +++ b/common/makefiles/javadoc/CORE_PKGS.gmk Fri Mar 08 16:02:22 2013 -0800 @@ -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 Thu Mar 07 11:17:28 2013 -0800 +++ b/common/makefiles/javadoc/Javadoc.gmk Fri Mar 08 16:02:22 2013 -0800 @@ -390,6 +390,17 @@ $(call OptionPair,-tag,specdefault:X) ; \ $(call OptionPair,-tag,Note:X) ; \ $(call OptionPair,-tag,ToDo:X) ; \ + $(call OptionPair,-tag,apiNote:optcm:<em>API Note<em>) ; \ + $(call OptionPair,-tag,implSpec:optcm:<em>Implementation Requirements<em> ); \ + $(call OptionPair,-tag,implNote:optcm:<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/make/scripts/webrev.ksh Thu Mar 07 11:17:28 2013 -0800 +++ b/make/scripts/webrev.ksh Fri Mar 08 16:02:22 2013 -0800 @@ -3023,7 +3023,7 @@ cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|' fi if [[ -n $WGET ]]; then - msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup"` + msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup" | html_quote` fi if [[ -z $msg ]]; then msg="${id}"