Simple RFR: 8203311 Clean up profile-includes.txt

[David Holmes]

Sorry about that. I thought the two fixes were travelling together else 
I would have taken steps to put them together. :(

David

On 28/08/2013 8:04 PM, Dawid Weiss wrote:
> Thanks Andreas, I'll switch to that revision.
>
> On Wed, Aug 28, 2013 at 12:00 PM, Andreas Rieber
> <rieberandreas at gmail.com> wrote:
>> Hi Dawid,
>>
>> the fix is in jdk8tl already, just missed to come into jdk8. It's only a few
>> lines.
>>
>> Andreas
>>
>> Here the changeset:
>>
>> Changeset: 3b8fed46b2a8
>> Author:    dholmes
>> Date:      2013-08-21 05:56 -0400
>> URL:       http://hg.openjdk.java.net/jdk8/tl/jdk/rev/3b8fed46b2a8
>>
>> 8023460: OPENJDK build fails due to missing jfr.jar
>> Reviewed-by: alanb
>>
>> ! makefiles/Profiles.gmk
>>
>>
>>
>> On 28.08.13 11:44, Dawid Weiss wrote:
>>>
>>> David,
>>>
>>> Is the fix for this committed anywhere? I've just tried building from
>>> scratch and I'm getting the same error.
>>>
>>> Dawid
>>>
>>> On Wed, Aug 21, 2013 at 10:55 AM, David Holmes <david.holmes at oracle.com>
>>> wrote:
>>>>
>>>> Fix on the way. This exposed another piece that was missing from the
>>>> original change. But mea culpa for not doing an OPENJDK build. Sorry
>>>> about
>>>> that.
>>>>
>>>> Thanks,
>>>> David
>>>>
>>>>
>>>> On 21/08/2013 6:31 PM, Andreas Rieber wrote:
>>>>>
>>>>>
>>>>> Hi David,
>>>>>
>>>>> On 21.08.13 09:53, David Holmes wrote:
>>>>>>
>>>>>>
>>>>>> Hi Andreas,
>>>>>>
>>>>>> On 21/08/2013 4:44 PM, Andreas Rieber wrote:
>>>>>>>
>>>>>>>
>>>>>>> Hi David,
>>>>>>>
>>>>>>> your change causes build problems with ubuntu 12.04. Result is:
>>>>>>>
>>>>>>> make[2]: Entering directory `/usr/local/src/jdk8tl/jdk/makefiles'
>>>>>>> make[2]: *** No rule to make target
>>>>>>>
>>>>>>>
>>>>>>> `/usr/local/src/jdk8tl/build/linux-x86-normal-server-release/images/lib/jfr.jar',
>>>>>>>
>>>>>>>
>>>>>>> needed by `all'.  Stop.
>>>>>>> make[2]: Leaving directory `/usr/local/src/jdk8tl/jdk/makefiles'
>>>>>>> make[1]: *** [images] Error 2
>>>>>>> make[1]: Leaving directory `/usr/local/src/jdk8tl/jdk/makefiles'
>>>>>>> make: *** [images-only] Error 2
>>>>>>>
>>>>>>> I tried several make clean, configure and so on but only when i
>>>>>>> rollback
>>>>>>> your change i can compile.
>>>>>>
>>>>>>
>>>>>>
>>>>>> I presume this is an OpenJDK build?
>>>>>
>>>>>
>>>>>
>>>>> Yes, openJDK build. Just tried clean fresh build on ubuntu 13.04 with
>>>>> jdk8tl, same result:
>>>>>
>>>>> ## Starting images
>>>>> Creating images/lib/charsets.jar
>>>>> make[2]: *** No rule to make target
>>>>>
>>>>>
>>>>> `/usr/local/src/jdk8tl/build/linux-x86_64-normal-server-release/images/lib/jfr.jar',
>>>>> needed by `all'.  Stop.
>>>>> make[2]: *** Waiting for unfinished jobs....
>>>>> Creating images/lib/ext/dnsns.jar
>>>>> Creating images/lib/ext/cldrdata.jar
>>>>> make[1]: *** [images] Error 2
>>>>> make: *** [images-only] Error 2
>>>>>
>>>>>>
>>>>>> That is quite puzzling .... I will investigate.
>>>>>
>>>>>
>>>>>
>>>>> thanks for puzzling
>>>>> Andreas
>>>>>
>>>>>>
>>>>>> Thanks,
>>>>>> David
>>>>>>
>>>>>>> Andreas
>>>>>>>
>>>>>>>
>>>>>>> On 20.08.13 01:33, David Holmes wrote:
>>>>>>>>
>>>>>>>>
>>>>>>>> http://cr.openjdk.java.net/~dholmes/8023311/webrev/
>>>>>>>>
>>>>>>>> Patch inlined below
>>>>>>>>
>>>>>>>> This is a trivial cleanup following on from an earlier change under
>>>>>>>> 8017570. JFR was moved from profile compact3 to the full JRE but not
>>>>>>>> all
>>>>>>>> the variables in profile-includes.txt were updated as needed. jfr.jar
>>>>>>>> needed to removed from the profile3 jar list and added to the jre jar
>>>>>>>> list.
>>>>>>>>
>>>>>>>> This has no impact on the actual build artifacts - JFR was, and
>>>>>>>> remains,
>>>>>>>> in the full JRE only.
>>>>>>>>
>>>>>>>> Thanks,
>>>>>>>> David
>>>>>>>>
>>>>>>>> --- old/makefiles/profile-includes.txt    2013-08-19
>>>>>>>> 19:10:17.554355677
>>>>>>>> -0400
>>>>>>>> +++ new/makefiles/profile-includes.txt    2013-08-19
>>>>>>>> 19:10:14.586187808
>>>>>>>> -0400
>>>>>>>> @@ -102,6 +102,7 @@
>>>>>>>>         security/US_export_policy.jar \
>>>>>>>>         security/local_policy.jar
>>>>>>>>
>>>>>>>> +
>>>>>>>>     PROFILE_2_JRE_BIN_FILES := \
>>>>>>>>         rmid$(EXE_SUFFIX) \
>>>>>>>>         rmiregistry$(EXE_SUFFIX)
>>>>>>>> @@ -140,7 +141,6 @@
>>>>>>>>     PROFILE_3_JRE_OTHER_FILES :=
>>>>>>>>
>>>>>>>>     PROFILE_3_JRE_JAR_FILES := \
>>>>>>>> -    jfr.jar \
>>>>>>>>         management-agent.jar
>>>>>>>>
>>>>>>>>
>>>>>>>> @@ -253,6 +253,6 @@
>>>>>>>>         ext/cldrdata.jar \
>>>>>>>>         ext/dnsns.jar \
>>>>>>>>         ext/nashorn.jar \
>>>>>>>> -    ext/zipfs.jar
>>>>>>>> -
>>>>>>>> +    ext/zipfs.jar \
>>>>>>>> +    jfr.jar
>>>>>>>>
>>>>>>>
>>>>>
>>>>
>>