--- a/jdk/make/java/jli/Makefile Tue Mar 06 10:25:45 2012 +0800
+++ b/jdk/make/java/jli/Makefile Tue Mar 06 20:34:38 2012 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -44,92 +44,121 @@
include $(BUILDDIR)/common/Defs.gmk
-ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+ifneq ($(SYSTEM_ZLIB),true)
+ ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+endif #SYSTEM_ZLIB
LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
-LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
+
+# set the platform specific directory for macosx, also this platform shares
+# substantial family ties with its siblings (solaris and linux), thus we add
+# solaris src path to its compilation dependencies.
+ifeq ($(PLATFORM), macosx)
+ LAUNCHER_PLATFORM_SRC = $(BUILDDIR)/../src/macosx/bin
+ LAUNCHER_SOLARIS_PLATFORM_SRC = $(BUILDDIR)/../src/solaris/bin
+else # !MACOSX
+ LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
+endif #PLATFORM
ifeq ($(ZERO_BUILD), true)
-ERGO_FAMILY=zero
-else
-ifeq ($(ARCH_FAMILY), amd64)
-ERGO_FAMILY=i586
-else
-ERGO_FAMILY=$(ARCH_FAMILY)
-endif
-endif
-
+ ERGO_FAMILY=zero
+else # !ZERO_BUILD
+ ifneq (,$(findstring $(ARCH_FAMILY), amd64 x86_64))
+ ERGO_FAMILY=i586
+ else # !X86 FAMILY
+ ERGO_FAMILY=$(ARCH_FAMILY)
+ endif #ARCH_FAMILY
+endif # ZERO_BUILD
#
# Files to compile.
#
-FILES_c = \
- java.c \
- splashscreen_stubs.c \
- java_md.c \
- parse_manifest.c \
- version_comp.c \
- wildcard.c \
- jli_util.c \
- inflate.c \
- inftrees.c \
- inffast.c \
- zadler32.c \
- zcrc32.c \
- zutil.c
+FILES_c = java.c \
+ splashscreen_stubs.c \
+ parse_manifest.c \
+ version_comp.c \
+ wildcard.c \
+ jli_util.c
+
+ifneq ($(SYSTEM_ZLIB),true)
+ FILES_c += inflate.c \
+ inftrees.c \
+ inffast.c \
+ zadler32.c \
+ zcrc32.c \
+ zutil.c
+endif # SYSTEM_ZLIB
-ifneq ($(PLATFORM), windows)
- FILES_c += ergo.c
- ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
- # if the architecture specific ergo file exists then
- # use it, else use the generic definitions from ergo.c
- ifneq ($(wildcard $(LAUNCHER_PLATFORM_SRC)/$(ERGO_ARCH_FILE)),)
- FILES_c += $(ERGO_ARCH_FILE)
- else
- OTHER_CPPFLAGS += -DUSE_GENERIC_ERGO
- endif
-endif
+# add platform specific files
+ifeq ($(PLATFORM), windows)
+ FILES_c += java_md.c
+else # NIXES
+ FILES_c += java_md_common.c
+ ifeq ($(PLATFORM), macosx)
+ FILES_c += java_md_macosx.c
+ else # SOLARIS/LINUX
+ FILES_c += java_md_solinux.c
+ FILES_c += ergo.c
+ ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
+ # if the architecture specific ergo file exists then
+ # use it, else use the generic definitions from ergo.c
+ ifneq ($(wildcard $(LAUNCHER_PLATFORM_SRC)/$(ERGO_ARCH_FILE)),)
+ FILES_c += $(ERGO_ARCH_FILE)
+ else # !ERGO_ARCH_FILE
+ OTHER_CPPFLAGS += -DUSE_GENERIC_ERGO
+ endif # ERGO_ARCH_FILE
+ endif #MACOSX
+endif #WINDOWS
# Names of arch directories
LIBARCH_DEFINES = -DLIBARCHNAME='"$(LIBARCH)"'
ifeq ($(PLATFORM), solaris)
LIBARCH_DEFINES += -DLIBARCH32NAME='"$(LIBARCH32)"'
LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
-endif
+endif # PLATFORM
-OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
-
+ifeq ($(PLATFORM), macosx)
+ OTHER_CPPFLAGS += $(LIBARCH_DEFINES) -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+else # ! MACOSX
+ OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
+endif #PLATFORM
ifneq ($(PLATFORM), windows) # UNIX systems
- LD_RUNPATH_EXTRAS += ..
- LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli
- # Note: its important to keep this order meaning -lc is the
- # last library otherwise it could cause compatibility issues
- # by pulling in SUNW_private symbols from libc
- LDLIBS = -ldl -lc
-ifeq ($(USE_PTHREADS),true)
- LDLIBS += -lpthread
-endif # USE_PTHREADS
+ ifeq ($(PLATFORM), macosx)
+ LIB_LOCATION = $(LIBDIR)/jli
+ else # SOLARIS/LINUX
+ LD_RUNPATH_EXTRAS += ..
+ LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli
+ # Note: it is important to keep this order, meaning -lc as the
+ # last library, otherwise it could cause compatibility issues
+ # by pulling in SUNW_private symbols from libc
+ LDLIBS = -ldl -lc
+ ifeq ($(USE_PTHREADS),true)
+ LDLIBS += -lpthread
+ endif # USE_PTHREADS
+ endif # PLATFORM
endif # PLATFORM
ifeq ($(PLATFORM), windows)
- EXTRA_LIBS = advapi32.lib \
- comctl32.lib \
- user32.lib
-
- JAVALIB =
- OTHER_LCF = -export:JLI_Launch \
- -export:JLI_ManifestIterate \
- -export:JLI_SetTraceLauncher \
- -export:JLI_ReportErrorMessage \
- -export:JLI_ReportErrorMessageSys \
- -export:JLI_ReportMessage \
- -export:JLI_ReportExceptionDescription
-
-endif
+ EXTRA_LIBS = advapi32.lib \
+ comctl32.lib \
+ user32.lib
+ JAVALIB =
+ OTHER_LCF = -export:JLI_Launch \
+ -export:JLI_ManifestIterate \
+ -export:JLI_SetTraceLauncher \
+ -export:JLI_ReportErrorMessage \
+ -export:JLI_ReportErrorMessageSys \
+ -export:JLI_ReportMessage \
+ -export:JLI_ReportExceptionDescription
+endif # PLATFORM
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
-OTHER_INCLUDES += -I$(ZIP_SRC)
+ifneq ($(SYSTEM_ZLIB),true)
+ OTHER_INCLUDES += -I$(ZIP_SRC)
+else # !SYSTEM_ZLIB
+ LDLIBS += -lz
+endif # SYSTEM_ZLIB
#
# Library to compile.
@@ -150,18 +179,52 @@
# library.
#
ifeq ($(PLATFORM), windows)
+ STATIC_LIBRARY = $(OBJDIR)/static/$(LIBPREFIX)$(LIBRARY).lib
-STATIC_LIBRARY = $(OBJDIR)/static/$(LIBPREFIX)$(LIBRARY).lib
-
-$(STATIC_LIBRARY): $(FILES_o)
+ $(STATIC_LIBRARY): $(FILES_o)
@$(prep-target)
$(LIBEXE) -nologo -out:$@ $(FILES_o)
+ library:: $(STATIC_LIBRARY)
+endif # PLATFORM
+
+ifeq ($(PLATFORM), macosx)
+ # Some Obj-C code is embedded in java_md_macosx.c, we stipulate so, using
+ # "-x" option. Not doing so will cause the compiler to choose the language
+ # based on the filename suffix, also "-Os" optimizes the file for size.
+ CFLAGS_$(VARIANT)/java_md_macosx.o = -Os -x objective-c
+ # Needed for linking the various launchers
+ LDFLAGS += -framework Cocoa -framework Security \
+ -framework ApplicationServices
+ # Add solaris sources containing common logic to the header path
+ OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)
+endif # PLATFORM
+
+STATIC_LIBRARY_DIR = $(OBJDIR)/static
+STATIC_LIBRARY_NAME = lib$(LIBRARY).a
+STATIC_LIBRARY = $(STATIC_LIBRARY_DIR)/$(STATIC_LIBRARY_NAME)
+
+$(STATIC_LIBRARY_DIR): | $(OBJDIR)
+ @$(MKDIR) $(STATIC_LIBRARY_DIR)
+
+$(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
+ @$(prep-target)
+ $(AR) $(ARFLAGS) $@ $(FILES_o)
+
library:: $(STATIC_LIBRARY)
-endif # PLATFORM
-
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
+vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
+ifneq ($(SYSTEM_ZLIB),true)
+ vpath %.c $(ZIP_SRC)
+else # !SYSTEM_ZLIB
+ #
+ # Add to ambient vpath so we pick up the library files, for macos we add
+ # solaris sources which contains the common logic for all nixes
+ #
+ ifeq ($(PLATFORM), macosx)
+ vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) \
+ $(LAUNCHER_SOLARIS_PLATFORM_SRC)
+ else # !MACOSX
+ vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
+ endif # MACOSX
+endif # SYSTEM_LIB