merging cacao branch to default

[Thomas Fitzsimmons]

Christian Thalinger wrote:
> On Wed, 2008-03-12 at 11:39 +0000, Gary Benson wrote:
>> Christian Thalinger wrote:
>>> I would like to merge the cacao branch to default.  Any objections?
>> Yes, two:
>>
>>> diff -r 391090a3755d -r 9a0bc3372842 .hgtags
>>> --- a/.hgtags   Thu Mar 06 15:53:27 2008 +0000
>>> +++ b/.hgtags   Wed Mar 12 11:13:40 2008 +0100
>>> @@ -5,3 +5,11 @@ cb78e0fccf14ed4a80b0ada2c98e4621479acbf5
>>>  cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4
>>>  5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5
>>>  bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6
>>> +e27b2d58770e704a422192826f28404ed5e8e6a2 icedtea6-1.0
>>> +96e1bdfed80e258e0a82e19bde45c5c547c2552f icedtea-1.0
>>> +b639d73581e34a5db114ed5addfd84b093d00254 icedtea-1.1
>>> +1ce086327b07f17892cc351719de6897819e32fa icedtea-1.2
>>> +8ea2619c21cfea2611b44879aab0f781ffd3fd50 icedtea-1.3
>>> +cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4
>>> +5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5
>>> +bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6
>> This hunk adds a load of duplicate tags.
> 
> OK, I remove them.
> 
>>> diff -r 391090a3755d -r 9a0bc3372842 Makefile.am
>>> --- a/Makefile.am       Thu Mar 06 15:53:27 2008 +0000
>>> +++ b/Makefile.am       Wed Mar 12 11:13:40 2008 +0100
>> [snip]
>>> @@ -569,7 +597,7 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
>>>         stamps/ports-ecj.stamp stamps/patch-ecj.stamp
>>>         $(MAKE) \
>>>           $(ICEDTEA_ENV_ECJ) \
>>> -         -C openjdk-ecj/
>>> +         -C openjdk-ecj/ j2se_only
>>>         @echo "ecj-poured IcedTea is served:" \
>>>           openjdk-ecj/build/$(LINUX_DIR)
>>>         mkdir -p stamps
>> We don't want j2se_only in the normal build.
> 
> Oops, missed that one.  New diff attached.

A few small things: instead of merging the ChangeLogs can you just 
create a new entry for this patch saying essentially, "merge from cacao 
branch"?

Can you remove README.cacao, and add a section in the README about cacao 
support?  And icedtea-cacao.patch needs to go in EXTRA_DIST.  Otherwise 
fine to commit.

Tom