Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Thu, 22 Jan 2015 14:39:36 +0400
- author
- dcherepanov
- date
- Thu, 22 Jan 2015 14:39:36 +0400
- changeset 1299
- 1b5849dd603b
- parent 1298
- 67098bd0efb9
- parent 1293
- 07d4aadfb948
- child 1303
- 29d98ac8b377
- child 1305
- ff4a622a5cc4
Merge
1.1 --- a/.hgtags Mon Jan 05 09:01:01 2015 -0800 1.2 +++ b/.hgtags Thu Jan 22 14:39:36 2015 +0400 1.3 @@ -314,6 +314,8 @@ 1.4 1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b24 1.5 1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b25 1.6 d1a7ea2c3e1091e0df1285963328a96f475f240d jdk8u20-b26 1.7 +3229d7b76babcf6710b3a965a2eda3f3bb2aa972 jdk8u20-b31 1.8 +9955a899edb359f2dc1704ea86044e9819cb805d jdk8u20-b32 1.9 97c6d6a8e5bb3dfc24b9a32711aa0906ea110e23 jdk8u25-b00 1.10 c4cfb4376f5916c5d7eb1f39a0e23402de0d9818 jdk8u25-b01 1.11 b4d29a751077e5500e766b8104dd1cb7148a550f jdk8u25-b02 1.12 @@ -333,6 +335,21 @@ 1.13 f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16 1.14 d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17 1.15 efac90a2da447c2b2d43ee1b1e20c0828659f9c5 jdk8u25-b18 1.16 +1a0b4ec68abc4e9248ca6041fff04612674a9b9f jdk8u25-b31 1.17 +6db0898d3f90ad9eae2f017299314b88766446e3 jdk8u31-b00 1.18 +85792859f3bdd6a2c1bdfcf2828bb2730e06ac3c jdk8u31-b01 1.19 +4898a7460ae620ac5356cb224e1fdf3c29312533 jdk8u31-b02 1.20 +886ace09d0934d5410572764685f13119d523823 jdk8u31-b03 1.21 +e2d32fe85fb93ce5179c25f5bfd49750a85c9342 jdk8u31-b04 1.22 +97de4d73edf1435c9b87d765d2ad91bb16c8d913 jdk8u31-b05 1.23 +f1b61760d01de6ad8d360227ac6c2122765680a2 jdk8u31-b06 1.24 +e9cbffb6c1119f3ef39c68db53c36c5e544c0d3c jdk8u31-b07 1.25 +4cec543118e7720d6105f25b60742d25a458cab7 jdk8u31-b08 1.26 +ea4b31ec437d74c62b844bd8b35f0bc3a27915b4 jdk8u31-b09 1.27 +01a98532348477a84b6e3c322fdd12dfed28d96d jdk8u31-b10 1.28 +ec85d5d0e3c05b0b6d61f4fc3f41313448ed9b05 jdk8u31-b11 1.29 +ca98e3e9727ffdcde2c9980668d0c7f344261938 jdk8u31-b12 1.30 +fde671d8b2537b6be61f67e583164b5b8b33ac5b jdk8u31-b13 1.31 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00 1.32 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01 1.33 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02 1.34 @@ -353,3 +370,6 @@ 1.35 e1c506c8e1db7356d120dd7d22b2c50276b6bcee jdk8u40-b17 1.36 83d1d42c3df409c87ef7cb0126343a009857ca71 jdk8u40-b18 1.37 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u40-b19 1.38 +b31a07adaef50dacba20e376cff6f1096e745092 jdk8u40-b20 1.39 +765a17e75fd622f7b892381e23c9b2c531d416f0 jdk8u40-b21 1.40 +ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00
2.1 --- a/make/Javadoc.gmk Mon Jan 05 09:01:01 2015 -0800 2.2 +++ b/make/Javadoc.gmk Thu Jan 22 14:39:36 2015 +0400 2.3 @@ -114,10 +114,10 @@ 2.4 2.5 # Url to devdocs page 2.6 # Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html 2.7 -DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html 2.8 -DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html 2.9 +DEV_DOCS_URL-7 = https://docs.oracle.com/javase/7/docs/index.html 2.10 +DEV_DOCS_URL-8 = https://docs.oracle.com/javase/8/docs/index.html 2.11 DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION)) 2.12 -DOCS_BASE_URL = http://download.oracle.com/javase/7/docs 2.13 +DOCS_BASE_URL = https://docs.oracle.com/javase/7/docs 2.14 2.15 # Common Java trademark line 2.16 JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \ 2.17 @@ -1116,14 +1116,15 @@ 2.18 NASHORNAPI_HEADER := <strong>Nashorn API</strong> 2.19 NASHORNAPI_BOTTOM := $(call CommonBottom,$(NASHORNAPI_FIRST_COPYRIGHT_YEAR)) 2.20 NASHORNAPI_GROUPNAME := Packages 2.21 -NASHORNAPI_REGEXP := com.sun.source.* 2.22 +NASHORNAPI_REGEXP := jdk.nashorn.api.scripting.* 2.23 + 2.24 # NASHORNAPI_PKGS is located in NON_CORE_PKGS.gmk 2.25 2.26 NASHORNAPI_INDEX_HTML = $(NASHORNAPI_DOCDIR)/index.html 2.27 -NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options 2.28 -NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages 2.29 +NASHORNAPI_OPTIONS_FILE = $(DOCSTMPDIR)/nashornapi.options 2.30 +NASHORNAPI_PACKAGES_FILE = $(DOCSTMPDIR)/nashornapi.packages 2.31 2.32 -treeapidocs: $(NASHORNAPI_INDEX_HTML) 2.33 +nashornapidocs: $(NASHORNAPI_INDEX_HTML) 2.34 2.35 # Set relative location to core api document root 2.36 $(NASHORNAPI_INDEX_HTML): GET2DOCSDIR=$(NASHORNAPI2COREAPI)/..
3.1 --- a/make/Main.gmk Mon Jan 05 09:01:01 2015 -0800 3.2 +++ b/make/Main.gmk Thu Jan 22 14:39:36 2015 +0400 3.3 @@ -1,5 +1,5 @@ 3.4 # 3.5 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 3.6 +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. 3.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 # 3.9 # This code is free software; you can redistribute it and/or modify it 3.10 @@ -142,17 +142,12 @@ 3.11 @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images) 3.12 @$(call TargetExit) 3.13 3.14 -profiles: profiles-oscheck source-tips jdk hotspot profiles-only 3.15 +profiles: source-tips jdk hotspot profiles-only 3.16 profiles-only: start-make 3.17 @$(call TargetEnter) 3.18 @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles) 3.19 @$(call TargetExit) 3.20 3.21 -profiles-oscheck: 3.22 - ifneq ($(OPENJDK_TARGET_OS), linux) 3.23 - @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1 3.24 - endif 3.25 - 3.26 install: images install-only 3.27 install-only: start-make 3.28 @$(call TargetEnter) 3.29 @@ -240,7 +235,7 @@ 3.30 .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 3.31 .PHONY: default all clean dist-clean bootcycle-images start-make 3.32 .PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build 3.33 -.PHONY: profiles profiles-only profiles-oscheck 3.34 +.PHONY: profiles profiles-only 3.35 3.36 include $(root_dir)/make/Jprt.gmk 3.37
