Review Request : 7151595 : Disable copying of java db demos when NO_DEMOS defined

[David Holmes]

Looks okay to me.

David

On 7/03/2012 5:40 AM, Mike Duigou wrote:
> As a followup to Max's report I have posted a webrev which corrects the problem he noticed.
>
> WEBREV @ : http://cr.openjdk.java.net/~mduigou/7151595/0/webrev/
>
> Thanks,
>
> Mike
>
> On Mar 5 2012, at 20:55 , Weijun Wang wrote:
>
>>
>>
>> On 03/06/2012 12:33 PM, Mike Duigou wrote:
>>> Yes, it looks like part of it should be skipped. I did not try the NO_DEMOS patch with closed source in the path.
>>>
>>> If I were writing Release.gmk today I would make the DB rule run after the initial-image-jre step so that it could install things directly to their final destination.
>>>
>>> Here's a patch which should disable demos for the db step. If it works I will create an issue.
>>>
>>> Thanks,
>>>
>>> Mike
>>>
>>> diff --git a/make/common/Release.gmk b/make/common/Release.gmk
>>> --- a/make/common/Release.gmk
>>> +++ b/make/common/Release.gmk
>>> @@ -947,8 +947,12 @@
>>>          done
>>>          $(CP) $(ABS_DB_PATH)/README-JDK.html $(JDK_IMAGE_DIR)/db
>>>          $(RM) -rf $(DEMODIR)/db
>>
>> This line can also be included in if block
>>
>>> +ifdef NO_DEMOS
>>
>> This should be "ifndef".
>>
>>>          $(MV) $(JDK_IMAGE_DIR)/db/demo $(DEMODIR)/db
>>>          $(CP) $(ABS_DB_PATH)/README-JDK-DEMOS.html $(DEMODIR)/db/
>>> +else
>>> +       $(RM) $(JDK_IMAGE_DIR)/db/demo
>>
>> Should have "-rf". In fact, I don't care if it's removed or not.
>>
>>> +endif
>>>          $(RM) $(JDK_IMAGE_DIR)/db/index.html $(JDK_IMAGE_DIR)/db/register.html
>>>   endif
>>
>> Then it works.
>>
>> Thanks
>> Max
>>
>>>
>>>
>>> On Mar 5 2012, at 19:41 , David Holmes wrote:
>>>
>>>> Shouldn't we skip this section if NO_DEMOS is specified?
>>>>
>>>> David
>>>>
>>>> On 6/03/2012 1:34 PM, Weijun Wang wrote:
>>>>> If NO_DEMOS are specified, there is no demo dir and "make images" fails.
>>>>> Yes, maybe it should fail, but I must work with images build now (on
>>>>> deploy workspace) and I really like the NO_DEMOS option...
>>>>>
>>>>> How about this?
>>>>>
>>>>> diff --git a/make/common/Release.gmk b/make/common/Release.gmk
>>>>> --- a/make/common/Release.gmk
>>>>> +++ b/make/common/Release.gmk
>>>>> @@ -947,6 +947,7 @@
>>>>> done
>>>>> $(CP) $(ABS_DB_PATH)/README-JDK.html $(JDK_IMAGE_DIR)/db
>>>>> $(RM) -rf $(DEMODIR)/db
>>>>> + $(MKDIR) $(DEMODIR)
>>>>> $(MV) $(JDK_IMAGE_DIR)/db/demo $(DEMODIR)/db
>>>>> $(CP) $(ABS_DB_PATH)/README-JDK-DEMOS.html $(DEMODIR)/db/
>>>>> $(RM) $(JDK_IMAGE_DIR)/db/index.html $(JDK_IMAGE_DIR)/db/register.html
>>>>>
>>>>> Thanks
>>>>> Max
>>>>>
>>>>> On 02/28/2012 09:53 AM, Kelly O'Hair wrote:
>>>>>> Looks fine to me.
>>>>>>
>>>>>> -kto
>>>>>>
>>>>>> On Feb 27, 2012, at 4:14 PM, Mike Duigou wrote:
>>>>>>
>>>>>>> Hello all;
>>>>>>>
>>>>>>> WEBREV @ http://cr.openjdk.java.net/~mduigou/7143162/1/webrev/
>>>>>>>
>>>>>>> An updated version of my previous webrev. I'm reposting it because
>>>>>>> this version includes a previously missing bit from the top level
>>>>>>> sanity makefile that produce warning notices when demos and samples
>>>>>>> are turned off similar to the NO_DOCS javadoc warning. Also includes
>>>>>>> a correction in Release.gmk.
>>>>>>>
>>>>>>> Overall this is fairly simple patch for review. It allows developers
>>>>>>> to shut off building of the jdk demos and samples. Disabling these
>>>>>>> builds has a very positive impact upon build turnaround for
>>>>>>> incremental builds. Export NO_DEMOS and/or NO_SAMPLES in your shell
>>>>>>> before running make and demos and/or samples will be skipped.
>>>>>>>
>>>>>>> The default behaviour remains unchanged.
>>>>>>>
>>>>>>> Thanks,
>>>>>>>
>>>>>>> Mike
>>>>>>
>>>
>