6914986: Make sure openjdk doc generation not turned off with JDK_UPDATE_VERSION

Thu, 07 Jan 2010 23:17:01 +0000

author
andrew
date
Thu, 07 Jan 2010 23:17:01 +0000
changeset 151
432cbbdc44bc
parent 149
20aeeb517139
child 152
a3242906c774

6914986: Make sure openjdk doc generation not turned off with JDK_UPDATE_VERSION
Summary: Only turn off documentation for updates when not building OpenJDK
Reviewed-by: ohair

make/Defs-internal.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/make/Defs-internal.gmk	Thu Dec 17 14:10:19 2009 -0800
     1.2 +++ b/make/Defs-internal.gmk	Thu Jan 07 23:17:01 2010 +0000
     1.3 @@ -231,9 +231,11 @@
     1.4  ifndef NO_DOCS
     1.5    # Default value (we want javadoc run)
     1.6    GENERATE_DOCS=true
     1.7 -  # No DOCS build when JDK_UPDATE_VERSION set
     1.8 -  ifdef JDK_UPDATE_VERSION
     1.9 -    GENERATE_DOCS=false
    1.10 +  # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
    1.11 +  ifndef OPENJDK
    1.12 +    ifdef JDK_UPDATE_VERSION
    1.13 +      GENERATE_DOCS=false
    1.14 +    endif
    1.15    endif
    1.16    # If langtools, corba, jaxp, and jaxws are not being built, 
    1.17    #   a full jdk javadoc is not possible

mercurial