Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/.hgtags	Wed Apr 01 11:29:21 2015 -0700
     1.2 +++ b/.hgtags	Thu Apr 09 22:38:26 2015 -0700
     1.3 @@ -406,3 +406,4 @@
     1.4  ea714a39e902fb8729f71f2d0f634855646e297d jdk8u60-b07
     1.5  0785e45b19c864264f2054a8130c49fe6f70925c jdk8u60-b08
     1.6  da6d0717c74a1e2ae4498bf4dc230e20686517ed jdk8u60-b09
     1.7 +39cd90aa447ae87ed3b2968dcf1a90d08fff964d jdk8u60-b10

     2.1 --- a/make/Javadoc.gmk	Wed Apr 01 11:29:21 2015 -0700
     2.2 +++ b/make/Javadoc.gmk	Thu Apr 09 22:38:26 2015 -0700
     2.3 @@ -1,4 +1,4 @@
     2.4 -# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     2.5 +# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
     2.6  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7  #
     2.8  # This code is free software; you can redistribute it and/or modify it
     2.9 @@ -74,6 +74,7 @@
    2.10  JNLP_FIRST_COPYRIGHT_YEAR = 1998
    2.11  PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
    2.12  JDKNET_FIRST_COPYRIGHT_YEAR = 2014
    2.13 +JACCESSAPI_FIRST_COPYRIGHT_YEAR = 2002
    2.14  
    2.15  # Oracle name
    2.16  FULL_COMPANY_NAME = Oracle and/or its affiliates
    2.17 @@ -1208,6 +1209,57 @@
    2.18  
    2.19  #############################################################
    2.20  #
    2.21 +# jaccessdocs - Java Accessibility Utilities
    2.22 +#
    2.23 +
    2.24 +# Disable generation for now due to build break of nightly
    2.25 +#ALL_OTHER_TARGETS += jaccessdocs
    2.26 +
    2.27 +JACCESSAPI_DOCDIR := $(JRE_API_DOCSDIR)/accessibility/jaccess/spec
    2.28 +JACCESSAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
    2.29 +JACCESSAPI_DOCTITLE := JACCESS API
    2.30 +JACCESSAPI_WINDOWTITLE := JACCESS API
    2.31 +JACCESSAPI_HEADER := <strong>JACCESS API</strong>
    2.32 +JACCESSAPI_BOTTOM := $(call CommonBottom,$(JACCESSAPI_FIRST_COPYRIGHT_YEAR))
    2.33 +# JACCESSAPI_PKGS is located in NON_CORE_PKGS.gmk
    2.34 +
    2.35 +JACCESSAPI_INDEX_HTML = $(JACCESSAPI_DOCDIR)/index.html
    2.36 +JACCESSAPI_OPTIONS_FILE = $(DOCSTMPDIR)/jaccess.options
    2.37 +JACCESSAPI_PACKAGES_FILE = $(DOCSTMPDIR)/jaccess.packages
    2.38 +
    2.39 +jaccessdocs: $(JACCESSAPI_INDEX_HTML)
    2.40 +
    2.41 +# Set relative location to core api document root
    2.42 +$(JACCESSAPI_INDEX_HTML): GET2DOCSDIR=$(JACCESSAPI2COREAPI)/..
    2.43 +
    2.44 +# Run javadoc if the index file is out of date or missing
    2.45 +$(JACCESSAPI_INDEX_HTML): $(JACCESSAPI_OPTIONS_FILE) $(JACCESSAPI_PACKAGES_FILE) coredocs
    2.46 +	$(prep-javadoc)
    2.47 +	$(call JavadocSummary,$(JACCESSAPI_OPTIONS_FILE),$(JACCESSAPI_PACKAGES_FILE))
    2.48 +	$(JAVADOC_CMD) -d $(@D) \
    2.49 +	    @$(JACCESSAPI_OPTIONS_FILE) @$(JACCESSAPI_PACKAGES_FILE)
    2.50 +
    2.51 +# Create file with javadoc options in it
    2.52 +$(JACCESSAPI_OPTIONS_FILE):
    2.53 +	$(prep-target)
    2.54 +	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
    2.55 +	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
    2.56 +	  $(call OptionPair,-encoding,ascii) ; \
    2.57 +	  $(call OptionOnly,-nodeprecatedlist) ; \
    2.58 +	  $(call OptionPair,-doctitle,$(JACCESSAPI_DOCTITLE)) ; \
    2.59 +	  $(call OptionPair,-windowtitle,$(JACCESSAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
    2.60 +	  $(call OptionPair,-header,$(JACCESSAPI_HEADER)$(DRAFT_HEADER)) ; \
    2.61 +	  $(call OptionPair,-bottom,$(JACCESSAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
    2.62 +	  $(call OptionTrip,-linkoffline,$(JACCESSAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
    2.63 +	) >> $@
    2.64 +
    2.65 +# Create a file with the package names in it
    2.66 +$(JACCESSAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JACCESSAPI_PKGS))
    2.67 +	$(prep-target)
    2.68 +	$(call PackageFilter,$(JACCESSAPI_PKGS))
    2.69 +
    2.70 +#############################################################
    2.71 +#
    2.72  # jdk.net docs
    2.73  #
    2.74  

     3.1 --- a/make/common/NON_CORE_PKGS.gmk	Wed Apr 01 11:29:21 2015 -0700
     3.2 +++ b/make/common/NON_CORE_PKGS.gmk	Thu Apr 09 22:38:26 2015 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  #
     3.5 -# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
     3.6 +# Copyright (c) 2002, 2015, 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 @@ -100,6 +100,8 @@
    3.11       jdk.net \
    3.12       jdk.management.cmm
    3.13  
    3.14 +JACCESSAPI_PKGS = com.sun.java.accessibility.util
    3.15 +
    3.16  # non-core packages in rt.jar
    3.17  NON_CORE_PKGS = $(DOMAPI_PKGS) \
    3.18      $(MGMT_PKGS) \
    3.19 @@ -111,4 +113,5 @@
    3.20      $(SMARTCARDIO_PKGS) \
    3.21      $(SCTPAPI_PKGS) \
    3.22      $(APPLE_EXT_PKGS) \
    3.23 -    $(JDK_PKGS)
    3.24 +    $(JDK_PKGS) \
    3.25 +    $(JACCESSAPI_PKGS)