OpenJDK / amber / amber
changeset 44306:52913079f75e
Merge
| author | prr |
|---|---|
| date | Fri, 10 Mar 2017 10:33:18 -0800 |
| parents | de3cce1236b6 a0134e35553d |
| children | 8f905d7d01d8 |
| files | |
| diffstat | 4 files changed, 3 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Mon Mar 06 10:40:03 2017 -0800 +++ b/.hgtags-top-repo Fri Mar 10 10:33:18 2017 -0800 @@ -402,3 +402,4 @@ 4eb77fb98952dc477a4229575c81d2263a9ce711 jdk-9+157 a4087bc10a88a43ea3ad0919b5b4af1c86977221 jdk-9+158 fe8466adaef8178dba94be53c789a0aaa87d13bb jdk-9+159 +4d29ee32d926ebc960072d51a3bc558f95c1cbad jdk-9+160
--- a/make/CreateJmods.gmk Mon Mar 06 10:40:03 2017 -0800 +++ b/make/CreateJmods.gmk Fri Mar 10 10:33:18 2017 -0800 @@ -139,7 +139,7 @@ --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ --os-version $(REQUIRED_OS_VERSION) \ --module-path $(JMODS_DIR) \ - --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ + --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@) $(MV) $(JMODS_TEMPDIR)/$(notdir $@) $@
--- a/make/Images.gmk Mon Mar 06 10:40:03 2017 -0800 +++ b/make/Images.gmk Fri Mar 10 10:33:18 2017 -0800 @@ -310,34 +310,6 @@ endif # Windows ################################################################################ -# doc files - -JRE_DOC_LOCATION ?= $(JDK_TOPDIR) -JDK_DOC_LOCATION ?= $(JDK_TOPDIR) - -JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES)) -JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES)) - -# Processing license files from source area to image area -# These are modified to have the platform specific EOL chars. -define process-doc-file - $(call LogInfo, Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)) - $(MKDIR) -p $(@D) - $(RM) $@ - LC_ALL=C $(SED) 's/$$//g' $< > $@ - $(CHMOD) 444 $@ -endef - -$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/% - $(process-doc-file) - -$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/% - $(process-doc-file) - -JRE_TARGETS += $(JRE_DOC_TARGETS) -JDK_TARGETS += $(JDK_DOC_TARGETS) - -################################################################################ # src.zip $(JDK_IMAGE_DIR)/lib/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
--- a/make/Javadoc.gmk Mon Mar 06 10:40:03 2017 -0800 +++ b/make/Javadoc.gmk Fri Mar 10 10:33:18 2017 -0800 @@ -357,9 +357,7 @@ $(eval $(call SetupJavadocGeneration, docletapi, \ MODULES := jdk.javadoc, \ PACKAGES := \ - jdk.javadoc.doclet \ - jdk.javadoc.doclet.taglet \ - jdk.javadoc.doclets, \ + jdk.javadoc.doclet, \ API_ROOT := jdk, \ DEST_DIR := javadoc/doclet, \ TITLE := Doclet API, \