Mercurial > hg > openjdk > jdk9
changeset 2534:7810f75d016a jdk-9+164
Merge
author | lana |
---|---|
date | Thu, 30 Mar 2017 17:23:14 +0000 |
parents | 41d9f0545d53 (current diff) 148642751a9f (diff) |
children | 6fe9f8461672 6fafcd0896fc |
files | |
diffstat | 5 files changed, 42 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Wed Mar 29 23:33:04 2017 +0000 +++ b/common/autoconf/flags.m4 Thu Mar 30 17:23:14 2017 +0000 @@ -355,7 +355,7 @@ SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG" JVM_CFLAGS="$JVM_CFLAGS $PICFLAG" fi - SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path[$]1' + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$(or [$]1,/.)' SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1' @@ -375,7 +375,7 @@ # Linking is different on MacOSX PICFLAG='' SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG" - SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path[$]1' + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$(or [$]1,/.)' SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1'
--- a/common/autoconf/generated-configure.sh Wed Mar 29 23:33:04 2017 +0000 +++ b/common/autoconf/generated-configure.sh Thu Mar 30 17:23:14 2017 +0000 @@ -5174,7 +5174,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1490200383 +DATE_WHEN_GENERATED=1490856742 ############################################################################### # @@ -49489,7 +49489,7 @@ SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG" JVM_CFLAGS="$JVM_CFLAGS $PICFLAG" fi - SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$1' + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$(or $1,/.)' SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/$1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,$1' @@ -49509,7 +49509,7 @@ # Linking is different on MacOSX PICFLAG='' SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG" - SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$1' + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$(or $1,/.)' SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/$1' SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,$1'
--- a/common/conf/jib-profiles.js Wed Mar 29 23:33:04 2017 +0000 +++ b/common/conf/jib-profiles.js Thu Mar 30 17:23:14 2017 +0000 @@ -910,7 +910,7 @@ freetype: { organization: common.organization, ext: "tar.gz", - revision: "2.3.4+1.0", + revision: "2.7.1-v120+1.0", module: "freetype-" + input.target_platform } };
--- a/make/Javadoc.gmk Wed Mar 29 23:33:04 2017 +0000 +++ b/make/Javadoc.gmk Thu Mar 30 17:23:14 2017 +0000 @@ -27,6 +27,7 @@ include $(SPEC) include MakeBase.gmk include $(JDK_TOPDIR)/make/Tools.gmk +include $(JDK_TOPDIR)/make/ModuleTools.gmk ################################################################################ @@ -174,6 +175,7 @@ -tag param \ -tag return \ -tag throws \ + -taglet build.tools.taglet.ModuleGraph \ -tag since \ -tag version \ -tag serialData \ @@ -188,6 +190,13 @@ DEFAULT_JAVADOC_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \ -serialwarn -encoding ISO-8859-1 -breakiterator --system none +# +# TODO: this should be set by the configure option. +# +ifndef ENABLE_MODULE_GRAPH + ENABLE_MODULE_GRAPH=false +endif + ################################################################################ # Setup make rules for running javadoc. # @@ -321,7 +330,8 @@ $$(eval $$(call ListPathsSafely, $1_PACKAGES, $$($1_PACKAGES_FILE))) endif $$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/docs/$1.javadoc, \ - $$($1_JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) -d $$(@D) \ + $$($1_JAVA) -Djava.awt.headless=true -DenableModuleGraph=$(ENABLE_MODULE_GRAPH) \ + $(NEW_JAVADOC) -d $$(@D) \ $$(DEFAULT_JAVADOC_TAGS) $$(DEFAULT_JAVADOC_OPTIONS) \ --module-source-path $$(call PathList, $$(JAVADOC_SOURCE_DIRS)) \ $$($1_OPTIONS) $$($1_PACKAGES_ARG)) @@ -735,18 +745,34 @@ ZIP_TARGETS += $(JAVADOC_ARCHIVE) ################################################################################ +# generate .dot files for module graphs + +JAVADOC_MODULE_GRAPHS_DIR := $(SUPPORT_OUTPUTDIR)/docs/module-graphs +JAVADOC_MODULE_GRAPHS := $(JAVADOC_MODULE_GRAPHS_DIR)/java.se.dot +JAVADOC_MODULE_GRAPHS_PROPS := $(JDK_TOPDIR)/make/src/classes/build/tools/jigsaw/javadoc-graphs.properties + +$(JAVADOC_MODULE_GRAPHS): $(BUILD_JIGSAW_TOOLS) $(JAVADOC_MODULE_GRAPHS_PROPS) + $(MKDIR) -p $(@D) + $(TOOL_GENGRAPHS) --spec --output $(JAVADOC_MODULE_GRAPHS_DIR) \ + --dot-attributes $(JAVADOC_MODULE_GRAPHS_PROPS) + +MODULE_GRAPH_TARGETS += $(JAVADOC_MODULE_GRAPHS) + +################################################################################ # Hook to include the corresponding custom file, if present. $(eval $(call IncludeCustomExtension, , Javadoc.gmk)) ################################################################################ +docs-module-graphs: $(MODULE_GRAPH_TARGETS) + docs-javadoc: $(TARGETS) docs-copy: $(COPY_TARGETS) docs-zip: $(ZIP_TARGETS) -all: docs-javadoc docs-copy docs-zip +all: docs-module-graphs docs-javadoc docs-copy docs-zip -.PHONY: default all docs-javadoc docs-copy docs-zip +.PHONY: default all docs-module-graphs docs-javadoc docs-copy docs-zip
--- a/make/Main.gmk Wed Mar 29 23:33:04 2017 +0000 +++ b/make/Main.gmk Thu Mar 30 17:23:14 2017 +0000 @@ -363,6 +363,9 @@ ################################################################################ # Docs targets +docs-module-graphs: + +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-module-graphs) + docs-javadoc: +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javadoc) @@ -375,7 +378,7 @@ update-build-docs: +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk) -ALL_TARGETS += docs-javadoc docs-copy docs-zip update-build-docs +ALL_TARGETS += docs-module-graphs docs-javadoc docs-copy docs-zip update-build-docs ################################################################################ # Cross compilation support @@ -772,6 +775,8 @@ bootcycle-images: jdk-image + docs-module-graphs: exploded-image buildtools-modules + docs-javadoc: $(GENSRC_TARGETS) rmic # The gensrc step for jdk.jdi creates an html file that is used by docs-copy. @@ -929,7 +934,7 @@ endif # This target builds the documentation image -docs-image: docs-javadoc docs-copy +docs-image: docs-module-graphs docs-javadoc docs-copy # This target builds the test image test-image: prepare-test-image test-image-hotspot-jtreg-native \