make/Javadoc.gmk

*** 288,310 ****
  $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
  </font>
  
  # Common javadoc options used by all bundles
  
! ifdef OPENJDK
!   ADDITIONAL_JAVADOCFLAGS = \
!       -Xdocrootparent $(DOCS_BASE_URL)
! else
!   ADDITIONAL_JAVADOCFLAGS =
! endif
  
  define COMMON_JAVADOCFLAGS
      $(call OptionOnly,-XDignore.symbol.file=true) ; \
      $(call OptionOnly,-quiet) ; \
      $(call OptionOnly,-use) ; \
      $(call OptionOnly,-keywords) ; \
!     $(call OptionOnly,$(ADDITIONAL_JAVADOCFLAGS))
  endef
  
  # Common javadoc tags used by all bundles
  
  # Java language specification cite
--- 288,306 ----
  $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
  </font>
  
  # Common javadoc options used by all bundles
  
! # This flag may be overridden from a custom makefile
! DOCROOTPARENT_FLAG = -Xdocrootparent $(DOCS_BASE_URL)
  
  define COMMON_JAVADOCFLAGS
      $(call OptionOnly,-XDignore.symbol.file=true) ; \
      $(call OptionOnly,-quiet) ; \
      $(call OptionOnly,-use) ; \
      $(call OptionOnly,-keywords) ; \
!     $(call OptionOnly,$(DOCROOTPARENT_FLAG))
  endef
  
  # Common javadoc tags used by all bundles
  
  # Java language specification cite
*** 1036,1047 ****
  
  ALL_OTHER_TARGETS += mgmtdocs
  
  MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
  MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
- JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
- JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/jdk.snmp/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
  MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
  MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
  MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
  MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
  MGMT_OVERVIEW := $(JDK_TOPDIR)/src/java.management/share/classes/mgmt-overview.html
--- 1032,1041 ----
*** 1061,1075 ****
  $(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
  
  # Run javadoc if the index file is out of date or missing
  $(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
          $(prep-javadoc)
-         @if [ -f $(JVM_MIB_SRC) ] ; then \
-           $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
-         else \
-           $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
-         fi
          $(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
          $(JAVADOC_CMD_SMALL) -d $(@D) \
              @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
  
  # Create file with javadoc options in it
--- 1055,1064 ----
*** 1703,1707 ****
--- 1692,1700 ----
          popd ;
  
  #############################################################
  .PHONY: all docs coredocs otherdocs \
       $(ALL_OTHER_TARGETS) zip-docs
+ 
+ ################################################################################
+ 
+ $(eval $(call IncludeCustomExtension, , Javadoc-post.gmk))