it2-bootstrap build failure (again)

[Aleksey Shipilev]

Sorry, I should have been more clear. This file is not in root repo, but
in jdk repo; I had cd'ed before taking a patch:

$ ls jdk/make/java/java/FILES_java.gmk
jdk/make/java/java/FILES_java.gmk

Any troubles now?

-Aleksey.

On 08/29/2012 04:40 PM, Brian Goetz wrote:
> Unfortunately if I pushed this (which is outside the jdk repo) it would
> break old-buildsystem builds of It1, since this file is in the root repo
> which is not branched.  If the It2 branch were going to live longer,
> we'd branch the other repos too, but given that It2 will be merging into
> default soon, is it worth it?
> 
> FWIW we are developing with the new build systems ("make images").
> 
> On 8/29/2012 8:23 AM, Aleksey Shipilev wrote:
>> Hi,
>>
>> I've seen this before with old build system few weeks ago. It seems to
>> be fixed with the patch below. Can anyone push this? Is there anything
>> else I should check? Run some sort of *.gmk generator to pull in new
>> classes into that list?
>>
>> -Aleksey.
>>
>> diff -r e4e2682c1d16 make/java/java/FILES_java.gmk
>> --- a/make/java/java/FILES_java.gmk    Tue Aug 28 15:09:36 2012 -0700
>> +++ b/make/java/java/FILES_java.gmk    Wed Aug 29 16:21:48 2012 +0400
>> @@ -238,7 +238,6 @@
>>       java/util/ListIterator.java \
>>       java/util/Fillable.java \
>>       java/util/Collection.java \
>> -    java/util/CollectionHelpers.java \
>>           java/util/Set.java \
>>               java/util/SortedSet.java \
>>                   java/util/NavigableSet.java \
>> @@ -385,22 +384,13 @@
>>       java/util/functions/BiSink.java \
>>       java/util/functions/Factory.java \
>>       java/util/functions/UnaryOperator.java \
>> -    java/util/streams/ParallelStream.java \
>> -    java/util/streams/ParallelStreamOps.java \
>> -    java/util/streams/SequentialMapPipeline.java \
>> -    java/util/streams/MapStreamOps.java \
>>       java/util/streams/Streamable.java \
>>       java/util/streams/Stream.java \
>> -    java/util/streams/SequentialPipeline.java \
>> -    java/util/streams/StreamOps.java \
>>       java/util/streams/StreamBuilder.java \
>>       java/util/streams/StreamBuilders.java \
>> -    java/util/streams/MapStreamable.java \
>>       java/util/streams/StatefulSink.java \
>>       java/util/streams/Streams.java \
>>       java/util/streams/MapStream.java \
>> -    java/util/streams/ParallelPipeline.java \
>> -    java/util/streams/ParallelStreamable.java \
>>       java/util/streams/ops/MapFilterKeysOp.java \
>>       java/util/streams/ops/ToArrayOp.java \
>>       java/util/streams/ops/SortedOp.java \
>> @@ -413,18 +403,14 @@
>>       java/util/streams/ops/MapExtractKeysOp.java \
>>       java/util/streams/ops/AllMatchOp.java \
>>       java/util/streams/ops/StatelessOp.java \
>> -    java/util/streams/ops/EagerOp.java \
>>       java/util/streams/ops/StatefulOp.java \
>> -    java/util/streams/ops/IdOp.java \
>>       java/util/streams/ops/CumulateOp.java \
>>       java/util/streams/ops/AnyMatchOp.java \
>> -    java/util/streams/ops/ElementwiseOp.java \
>>       java/util/streams/ops/MapOp.java \
>>       java/util/streams/ops/FlatMapOp.java \
>>       java/util/streams/ops/FoldOp.java \
>>       java/util/streams/ops/MapFilterValuesOp.java \
>>       java/util/streams/ops/MappedOp.java \
>> -    java/util/streams/ops/ShortCircuitEagerOp.java \
>>       java/util/streams/ops/UniqOp.java \
>>       java/util/streams/ops/NoneMatchOp.java \
>>       java/util/prefs/Preferences.java \
>>