Review of 7057705: can't generate api docs for JDK7 updates

[Dalibor Topic]

Thanks, Abhijit. I'll provide a bit more background on this change, since it's always a bit scary to see changes flowing into the public repos without having seen them discussed prior to that on a public list, or in other words - it should never happen. 

As Abhijit writes, this change comes from 7u1, and as I wrote in one of the drafts, that's a CPU - but this is not a security fix, it's 'just' a build fix to allow RE to start producing builds from jdk7u mainline for testing. 

With that explanation, I'll borrow from Joe Darcy's bag of tricks of dealing with unforeseen circumstances in OpenJDK 6, and retroactively approve this fix, so that RE can produce a build for testing.

cheers,
dalibor topic

On 7/16/11 1:33 AM, Abhijit Saha wrote:
> CR:  7057705: can't generate api docs for JDK7 updates
> 
> Weblink : http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7057705
> 
> Description :
> Can't generate api docs for JDK7 updates. should be able to generate docs for jdk updates. RE builds always build docs in JDK7, unlike earlier JDK releases. Restriction to NOT build the docs if JDK_UPDATE_VERSION is set should be removed.
> 
> Targeted forest : http://hg.openjdk.java.net/jdk7u/jdk7u
> 
> Fix coming from :  7u1
> 
> Fix done by : katleman
> 
> Explanation: This happened since it's a change necessary for RE to be able to start to produce builds for testing.
> 
> changeset/patch
> 
> # HG changeset patch
> # User katleman
> # Date 1308702629 25200
> # Node ID 831f1dadcc357616c50e267413a51c4a4b49d1df
> # Parent  ee67ee3bd597af3097664b1a7d130ffb0b14a1d2
> 7057705: can't generate api docs for JDK7 updates
> Reviewed-by: asaha
> 
> diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
> --- a/make/Defs-internal.gmk
> +++ b/make/Defs-internal.gmk
> @@ -261,12 +261,6 @@ ifndef NO_DOCS
>  ifndef NO_DOCS
>    # Default value (we want javadoc run)
>    GENERATE_DOCS=true
> -  # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
> -  ifndef OPENJDK
> -    ifdef JDK_UPDATE_VERSION
> -      GENERATE_DOCS=false
> -    endif
> -  endif
>    # If langtools, corba, jaxp, and jaxws are not being built,
>    #   a full jdk javadoc is not possible
>    ifneq ($(BUILD_LANGTOOLS), true)
> 
> 



-- 
Oracle <http://www.oracle.com>
Dalibor Topic | Java F/OSS Ambassador
Phone: +494023646738 <tel:+494023646738> | Mobile: +491772664192 <tel:+491772664192>
Oracle Java Platform Group

ORACLE Deutschland B.V. & Co. KG | Nagelsweg 55 | 20097 Hamburg

ORACLE Deutschland B.V. & Co. KG
Hauptverwaltung: Riesstr. 25, D-80992 München
Registergericht: Amtsgericht München, HRA 95603

Komplementärin: ORACLE Deutschland Verwaltung B.V.
Hertogswetering 163/167, 3543 AS Utrecht, Niederlande
Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697
Geschäftsführer: Jürgen Kunz, Marcel van de Molen, Alexander van der Ven

Green Oracle <http://www.oracle.com/commitment> Oracle is committed to developing practices and products that help protect the environment