Request for review: 7036525 Disable alternative source mechanism for OPENJDK builds

[David Holmes]

Fixed cc to hotspot-dev

-------- Original Message --------
Subject: Re: Request for review: 7036525 Disable alternative source 
mechanism	for OPENJDK builds
Date: Tue, 03 May 2011 09:08:12 +1000
From: David Holmes <David.Holmes at oracle.com>
Organization: Oracle Corporation
To: John Coomes <John.Coomes at oracle.com>
CC: build-dev <build-dev at openjdk.java.net>, hotspot-dev at openjdk.dev.java.net
References: <4DB90020.7090708 at oracle.com> 
<19898.63905.375477.693659 at oracle.com>	<4DBB533D.4050507 at oracle.com>

Hi John,

Fresh webrev at:

http://cr.openjdk.java.net/~dholmes/7036525/webrev.1/

Thanks,
David

David Holmes said the following on 04/30/11 10:09:
> Thanks John. Currently sitting here shaking my head is disbelief. I'll 
> try this again.
> 
> David
> 
> John Coomes said the following on 04/30/11 03:47:
>> David Holmes (David.Holmes at oracle.com) wrote:
>>> http://cr.openjdk.java.net/~dholmes/7036525/webrev/
>>>
>>> Simple but crude. If OPENJDK is defined then the Hotspot "alternative 
>>> source" mechanism is effectively disabled by checking for a 
>>> non-existent path. This allows people using the alt-src mechanism to 
>>> select which type of build they want in a way that is consistent with 
>>> how builds of OPENJDK are done in the rest of the JDK.
>>>
>>> Tested by checking the "errorReporter.cpp" location in builds 
>>> with/without OPENJDK set, and with/without src/closed present.
>>>
>>> This will be pushed into hotspot-rt/hotspot for hs21-b11
>>
>> Hi David,
>>
>>   38 ifneq ($(OPENJDK),true)
>>   39   HS_ALT_SRC_REL=src/closed
>>   40 else
>>   41   HS_ALT_SRC=NO_SUCH_PATH
>>   42 endif
>>   43 HS_COMMON_SRC=$(GAMMADIR)/$(HS_COMMON_SRC_REL)
>>   44 HS_ALT_SRC=$(GAMMADIR)/$(HS_ALT_SRC_REL)
>>
>> The 'if' block sets HS_ALT_SRC_*REL*, but the else block sets
>> HS_ALT_SRC (no *REL*), and that is overwritten on line 44.
>>
>> I think it works because after line 44, HS_ALT_SRC == $(GAMMADIR)/,
>> but I doubt that was intended.
>>
>> You could change line 41 to
>>
>>     HS_ALT_SRC_REL=$(HS_COMMON_SRC_REL)
>>
>> Then when OPENJDK=true, HS_ALT_SRC==HS_COMMON_SRC, and you don't have
>> to rely on NO_SUCH_PATH.
>>
>> -John