7179349 misses updating new build makefiles

Kelly O'Hair kelly.ohair at oracle.com
Mon Oct 22 19:55:57 PDT 2012


So I pushed in 3 changesets for this into build-infra/jdk8:

http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/664ecabfb68d
   Creates the new ToBin tool for OSX.

http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/32d123b84096
   Creates the icon file for OSX

http://hg.openjdk.java.net/build-infra/jdk8/jdk/rev/ac3520291aa8
  Adds -I option

Basically I used GensrcIcons.gmk but did some renaming on the existing variables so they have X11 in their names.

NOTE: The changes that actually use this generated file is not IN build-infra/jdk8 yet but the changes in build-infra should be harmless.
Still, until those changes are merges in, we won't know.

-kto



On Oct 22, 2012, at 7:34 PM, David Holmes wrote:

> Kelly,
> 
> On 23/10/2012 8:04 AM, Kelly O'Hair wrote:
>> I am trying to look into this.
>> 
>> It appears we don't have a "GenerateNativeSource.gmk" and  the existing "GenerateJavaSource.gmk" seems to generate more than
>> just Java source.  I'll look at adding to "GenerateJavaSource.gmk", but it probably should be renamed.
>> Give me a few hours.
> 
> AFAICS this is simply an OSX version of what already happens in sun/xawt/Makefile. In both cases the ToBin tool does a similar job.
> 
> The new build logic for this is in GensrcIcons.gmk
> 
> David
> ----
> 
>> -kto
>> 
>> On Oct 22, 2012, at 1:13 PM, Mike Duigou wrote:
>> 
>>> Ping!
>>> 
>>> Anyone from build-infra group able to answer any of my questions below so that this can be resolved?
>>> 
>>> Having a busted new build-infra on MacOSX for all jdk8 repos is unacceptable.
>>> 
>>> Mike
>>> 
>>> On Oct 18 2012, at 14:37 , Mike Duigou wrote:
>>> 
>>>> 
>>>> On Oct 18 2012, at 10:54 , Kelly O'Hair wrote:
>>>> 
>>>>> ALL Makefile and build changes need to be reviewed by the build-dev at openjdk.java.net team.
>>>>> 
>>>>> This gives us a heads up, and the build-infra team can red-flag when we see an issue.
>>>>> 
>>>>> I've sent out more global email on this topic.
>>>>> 
>>>>> Has a bug been filed on this regression in the build-infra build?
>>>> 
>>>> I have created JDK-8001158 for this issue.
>>>> 
>>>>> (I'm kind of short handed on the build-infra team right now, so anyone able to help out here would be great)
>>>> 
>>>> I took another look at modifying CompileNativeLibraries.gmk but couldn't work out the correct handling of a couple of things:
>>>> 
>>>> 1. Where the generated source (AWTIconData.h) should properly go.
>>>> 
>>>> 2. Where the production rule for generating the AWTIconData.h should live
>>>> 
>>>> 3. How to modify the SetupNativeCompilation call to add in the -I for the gensrc dir containing AWTIconData.h
>>>> 
>>>> 4. Proper clean/clobber rules for the AWTIconData.h file.
>>>> 
>>>>> 
>>>>> -kto
>>>>> 
>>>>> On Oct 17, 2012, at 7:45 PM, Mike Duigou wrote:
>>>>> 
>>>>>> A fix was recently integrated into JDK 8 mainline repo which breaks new-infra builds on MacOS X.
>>>>>> 
>>>>>> http://hg.openjdk.java.net/jdk8/awt/jdk/rev/d6cba7bfbb3d
>>>>>> 
>>>>>> The logic for creating the icon file created is not present in the new build infra makefiles. (jdk/makefiles)
>>>>>> 
>>>>>> The ToBin.java program can also be omitted with something like the following:
>>>>>> 
>>>>>> (/bin/echo "static unsigned char sAWTIconData[] = {"; hexdump -v -e '"\t" 32/1 "%u, " "\n"' $(ICON) ; /bin/echo "};")>  $(ICON_DATA)
>>>>>> 
>>>>>> Mike
>>>>> 
>>>> 
>>> 
>> 




More information about the build-infra-dev mailing list