jdk/make/launcher/Launcher-java.base.gmk
changeset 27565 729f9700483a
parent 25859 3317bb8137f4
child 29931 64e274ed6567
equal deleted inserted replaced
27564:eaaa79b68cd5 27565:729f9700483a
    30 # On windows, the debuginfo files get the same name as for java.dll. Build
    30 # On windows, the debuginfo files get the same name as for java.dll. Build
    31 # into another dir and copy selectively so debuginfo for java.dll isn't
    31 # into another dir and copy selectively so debuginfo for java.dll isn't
    32 # overwritten.
    32 # overwritten.
    33 $(eval $(call SetupLauncher,java, \
    33 $(eval $(call SetupLauncher,java, \
    34     -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
    34     -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
    35     $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
    35     $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \
    36     $(JAVA_VERSION_INFO_RESOURCE), $(JDK_OUTPUTDIR)/objs/java_objs,true))
    36     $(JAVA_VERSION_INFO_RESOURCE), $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs,true))
    37 
    37 
    38 $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
    38 $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
    39 	$(MKDIR) -p $(@D)
    39 	$(MKDIR) -p $(@D)
    40 	$(RM) $@
    40 	$(RM) $@
    41 	$(CP) $(JDK_OUTPUTDIR)/objs/java_objs$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) $@
    41 	$(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) $@
    42 
    42 
    43 LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX)
    43 TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX)
    44 
    44 
    45 ifeq ($(OPENJDK_TARGET_OS), windows)
    45 ifeq ($(OPENJDK_TARGET_OS), windows)
    46   $(eval $(call SetupLauncher,javaw, \
    46   $(eval $(call SetupLauncher,javaw, \
    47       -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
    47       -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
    48       $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
    48       $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jli_static.lib, $(JAVA_RC_FLAGS), \
    49       $(JAVA_VERSION_INFO_RESOURCE),,true))
    49       $(JAVA_VERSION_INFO_RESOURCE),,true))
    50 endif
    50 endif
    51 
    51 
    52 $(eval $(call SetupLauncher,keytool, \
    52 $(eval $(call SetupLauncher,keytool, \
    53     -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }'))
    53     -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }'))
    55 ################################################################################
    55 ################################################################################
    56 
    56 
    57 BUILD_JEXEC :=
    57 BUILD_JEXEC :=
    58 BUILD_JEXEC_SRC :=
    58 BUILD_JEXEC_SRC :=
    59 BUILD_JEXEC_INC :=
    59 BUILD_JEXEC_INC :=
    60 BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
    60 BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)
    61 
    61 
    62 #
    62 #
    63 # UNHANDLED:
    63 # UNHANDLED:
    64 # - COMPILE_APPROACH = normal
    64 # - COMPILE_APPROACH = normal
    65 #
    65 #
    88   else
    88   else
    89     BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/launcher
    89     BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/launcher
    90   endif
    90   endif
    91 
    91 
    92   ifeq ($(OPENJDK_TARGET_OS), linux)
    92   ifeq ($(OPENJDK_TARGET_OS), linux)
    93     BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib
    93     BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base
    94     BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/java.base/share/native/libjli
    94     BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/java.base/share/native/libjli
    95   endif
    95   endif
    96 endif
    96 endif
    97 
    97 
    98 #
    98 #
   109           $(BUILD_JEXEC_INC), \
   109           $(BUILD_JEXEC_INC), \
   110       CFLAGS_linux := -fPIC, \
   110       CFLAGS_linux := -fPIC, \
   111       CFLAGS_solaris := -KPIC, \
   111       CFLAGS_solaris := -KPIC, \
   112       LDFLAGS := $(LDFLAGS_JDKEXE) \
   112       LDFLAGS := $(LDFLAGS_JDKEXE) \
   113           $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
   113           $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
   114       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jexec_obj, \
   114       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \
   115       OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \
   115       OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \
   116       DEBUG_SYMBOLS := true, \
   116       DEBUG_SYMBOLS := true, \
   117       PROGRAM := jexec))
   117       PROGRAM := jexec))
   118 
   118 
   119   LIBRARIES += $(BUILD_JEXEC)
   119   TARGETS += $(BUILD_JEXEC)
   120 endif
   120 endif
   121 
   121 
   122 ################################################################################
   122 ################################################################################
   123 
   123 
   124 BUILD_JSPAWNHELPER :=
   124 BUILD_JSPAWNHELPER :=
   125 BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/jspawnhelper
   125 BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/jspawnhelper
   126 JSPAWNHELPER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/unix/native/libjava
   126 JSPAWNHELPER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/unix/native/libjava
   127 BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
   127 BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)
   128 LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o
   128 LINK_JSPAWNHELPER_OBJECTS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o
   129 LINK_JSPAWNHELPER_FLAGS :=
   129 LINK_JSPAWNHELPER_FLAGS :=
   130 
   130 
   131 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), )
   131 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), )
   132   BUILD_JSPAWNHELPER := 1
   132   BUILD_JSPAWNHELPER := 1
   133 endif
   133 endif
   134 
   134 
   135 ifeq ($(OPENJDK_TARGET_OS), macosx)
   135 ifeq ($(OPENJDK_TARGET_OS), macosx)
   136   BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
   136   BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base
   137 endif
   137 endif
   138 
   138 
   139 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
   139 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
   140   LINK_JSPAWNHELPER_FLAGS += $(COMPILER_TARGET_BITS_FLAG)64
   140   LINK_JSPAWNHELPER_FLAGS += $(COMPILER_TARGET_BITS_FLAG)64
   141 endif
   141 endif
   147       LANG := C, \
   147       LANG := C, \
   148       OPTIMIZATION := LOW, \
   148       OPTIMIZATION := LOW, \
   149       CFLAGS := $(CFLAGS_JDKEXE) $(JSPAWNHELPER_CFLAGS), \
   149       CFLAGS := $(CFLAGS_JDKEXE) $(JSPAWNHELPER_CFLAGS), \
   150       LDFLAGS := $(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \
   150       LDFLAGS := $(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \
   151       LDFLAGS_SUFFIX := $(LINK_JSPAWNHELPER_OBJECTS), \
   151       LDFLAGS_SUFFIX := $(LINK_JSPAWNHELPER_OBJECTS), \
   152       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jspawnhelper, \
   152       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jspawnhelper, \
   153       OUTPUT_DIR := $(BUILD_JSPAWNHELPER_DST_DIR), \
   153       OUTPUT_DIR := $(BUILD_JSPAWNHELPER_DST_DIR), \
   154       PROGRAM := jspawnhelper))
   154       PROGRAM := jspawnhelper))
   155 
   155 
   156   $(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS)
   156   $(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS)
   157 
   157 
   158   LIBRARIES += $(BUILD_JSPAWNHELPER)
   158   TARGETS += $(BUILD_JSPAWNHELPER)
   159 endif
   159 endif
   160 
   160 
   161 ################################################################################
   161 ################################################################################
   162 
       
   163 java.base: $(LAUNCHERS) $(LIBRARIES)
       
   164 
       
   165 all: java.base
       
   166 
       
   167 .PHONY: all java.base