webrevs.2 for macosx changes to jdk7u-osx (original) (raw)

Artem Ananiev artem.ananiev at oracle.com
Tue Nov 29 03:11:44 PST 2011

Hi, Michael,

thanks for this hard work!

See my comments below. I only looked at the changes related to the current macosx-port workspace. Will take a look at the webrev against 7u-osx a little bit later.

On 11/28/2011 8:08 PM, Michael McMahon wrote:

Hi,

Here is another version of the macosx webrev. This time it includes all of the modifications and new files from macosx-port. Hence many of the problems pointed out earlier with the inconsistencies relative to the bsd code are gone now. It builds and runs on all platforms and has been synced with jdk7u-dev (as of Friday Nov 25). I left the // MacOSX comments in to highlight changes that people may want to look at more closely. Lastly, this time I have also included a webrev showing the changes relative to macosx-port for reference. Changes relative to jdk7u-osx http://cr.openjdk.java.net/~michaelm/7113349/2/jdk7u-osx/modified/ New files http://cr.openjdk.java.net/~michaelm/7113349/2/jdk7u-osx/modified/ Changes relative to macosx-port http://cr.openjdk.java.net/~michaelm/7113349/2/macosx-port/modified/

I haven't looked through all the files, just those that are related to client libs. One general question is about BSD support: do we really want to throw it out?

make/sun/awt/Makefile: initIDs.c is already included to FILES_c on linux/solaris, in make/sun/xawt/FILES_c_unix.gmk

make/sun/Makefile: what is this comment about?

make/sun/awt/mawt.gmk: some ifdef changes look strange, lines 226-235 and 252.

make/sun/font/Makefile: lines 200-213 and 213-224 could be merged.

make/sun/jawt/Makefile: the same as in make/sun/font/Makefile

make/sun/xawt/Makefile: the same as in make/sun/awt/mawt.gmk

make/tools/freetypecheck/Makefile: still contains some checks against BSD platform

src/share/classes/java/lang/System.java: empty diff

src/share/classes/javax/accessibility/AccessibleContext.java: empty diff

src/share/classes/javax/swing/UIManager.java: default L&F selection will likely be changed later, but for now the instanceof check can be changed to "toolkit.getClass().getName().equals(LWCToolkit)" to avoid loading LWCToolkit class, if it's not loaded yet.

src/share/classes/sun/awt/image/BufImgSurfaceData.java: should be unchanged?

src/share/classes/sun/font/FileFont.java: src/share/classes/sun/font/FontManagerFactory.java: the same as right above

src/share/classes/sun/print/PrintJob2D.java: src/share/classes/sun/print/RasterPrinterJob.java: src/share/native/common/check_code.c: src/share/native/java/lang/java_props.h: empty diff

src/share/native/sun/awt/image/BufImgSurfaceData.c: should it be "malloc.h" instead of <stdlib.h>?

src/share/native/sun/awt/debug/debug_util.h: src/share/native/sun/awt/image/DataBufferNative.c: src/share/native/sun/font/DrawGlyphList.c: src/share/native/sun/font/sunFont.c: src/share/native/sun/java2d/SurfaceData.c: src/share/native/sun/java2d/opengl/OGLRenderQueue.c: src/share/native/sun/java2d/opengl/OGLTextRenderer.c: src/solaris/native/sun/awt/X11Color.c: src/solaris/native/sun/awt/X11DrawingArea.c: src/solaris/native/sun/awt/list.c: src/solaris/native/sun/font/X11FontScaler.c: src/solaris/native/sun/font/X11TextRenderer.c: the same as right above

src/share/native/sun/awt/medialib/mlib_ImageAffine.h: should be either !defined(MACOSX), or no changes to this file at all

src/share/native/sun/awt/medialib/mlib_types.h: the same as right above

src/share/native/sun/font/AccelGlyphCache.c: the same as in BufImgSurfaceData.c

the same as right above

src/solaris/native/java/lang/java_props_md.c: sprops.os_arch is already set at line 460 (and then overridden if MACOSX), so the change at line 476 looks wrong. Given that, this file could be left unchanged at all

src/solaris/native/sun/awt/awt_LoadLibrary.c: should be unchanged

Thanks, Michael.

Thanks,

Artem

More information about the macosx-port-dev mailing list