OpenJDK / portola / portola
changeset 12050:28109b684ac0
7152186: java.awt.HeadlessException when running AWT apps [macosx]
Reviewed-by: anthony
| author | michaelm |
|---|---|
| date | Thu, 08 Mar 2012 14:38:26 +0000 |
| parents | de3e33eb5fa1 |
| children | 60092b8cec96 |
| files | jdk/make/com/apple/osxui/Makefile jdk/make/sun/headless/Makefile jdk/make/sun/jawt/Makefile jdk/make/sun/lwawt/Makefile jdk/make/sun/xawt/Makefile jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c |
| diffstat | 6 files changed, 8 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/com/apple/osxui/Makefile Thu Mar 08 00:46:33 2012 -0500 +++ b/jdk/make/com/apple/osxui/Makefile Thu Mar 08 14:38:26 2012 +0000 @@ -98,7 +98,7 @@ OTHER_LDLIBS = \ -lawt -losxapp \ - -llwawt -L$(LIBDIR)/lwawt -Xlinker -rpath -Xlinker @loader_path/lwawt \ + -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \ -framework Cocoa \ -framework Carbon \ -framework ApplicationServices \
--- a/jdk/make/sun/headless/Makefile Thu Mar 08 00:46:33 2012 -0500 +++ b/jdk/make/sun/headless/Makefile Thu Mar 08 14:38:26 2012 +0000 @@ -29,11 +29,6 @@ MOTIF_VERSION = none MOTIF_VERSION_STRING=none -ifeq ($(PLATFORM), macosx) -LIB_LOCATION = $(LIBDIR)/headless -else -endif - PACKAGE = sun.awt LIBRARY = awt_headless PRODUCT = sun
--- a/jdk/make/sun/jawt/Makefile Thu Mar 08 00:46:33 2012 -0500 +++ b/jdk/make/sun/jawt/Makefile Thu Mar 08 14:38:26 2012 +0000 @@ -133,7 +133,7 @@ ifeq ($(PLATFORM), macosx) vpath %.m $(call NativeSrcDirList,,native/sun/awt) -OTHER_LDLIBS = -llwawt -L$(LIBDIR)/lwawt -Xlinker -rpath -Xlinker @loader_path/lwawt \ +OTHER_LDLIBS = -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \ -framework Cocoa endif # PLATFORM
--- a/jdk/make/sun/lwawt/Makefile Thu Mar 08 00:46:33 2012 -0500 +++ b/jdk/make/sun/lwawt/Makefile Thu Mar 08 14:38:26 2012 +0000 @@ -26,10 +26,10 @@ BUILDDIR = ../.. MODULE = awt PACKAGE = sun.lwawt -LIBRARY = lwawt +LIBRARY = awt_lwawt PRODUCT = sun -LIB_LOCATION = $(LIBDIR)/lwawt +LIB_LOCATION = $(LIBDIR) include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/xawt/Makefile Thu Mar 08 00:46:33 2012 -0500 +++ b/jdk/make/sun/xawt/Makefile Thu Mar 08 14:38:26 2012 +0000 @@ -28,10 +28,6 @@ LIBRARY = awt_xawt PRODUCT = sun -ifeq ($(PLATFORM), macosx) -LIB_LOCATION = $(LIBDIR)/xawt -endif - include $(BUILDDIR)/common/Defs.gmk GEN_DIR=$(GENSRCDIR)/sun/awt/X11
--- a/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c Thu Mar 08 00:46:33 2012 -0500 +++ b/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c Thu Mar 08 14:38:26 2012 +0000 @@ -77,11 +77,12 @@ * Pathnames to the various awt toolkits */ + #ifdef MACOSX - #define XAWT_PATH "/xawt/libawt_xawt.dylib" - #define LWAWT_PATH "/lwawt/liblwawt.dylib" + #define XAWT_PATH "/libawt_xawt.dylib" + #define LWAWT_PATH "/libawt_lwawt.dylib" #define DEFAULT_PATH LWAWT_PATH - #define HEADLESS_PATH "/headless/libawt_headless.dylib" + #define HEADLESS_PATH "/libawt_headless.dylib" #else #define XAWT_PATH "/libawt_xawt.so" #define DEFAULT_PATH XAWT_PATH