< prev index next >

make/launcher/LauncherCommon.gmk

Print this page

        

*** 103,113 **** endif $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \ $$(addprefix -J, $$($1_JAVA_ARGS)) $$($1_LAUNCHER_CLASS), "$$a"$(COMMA) )) }' $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR) ! ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($$($1_MACOSX_SIGNED), true) $1_PLIST_FILE := Info-privileged.plist $1_CODESIGN := true else $1_PLIST_FILE := Info-cmdline.plist --- 103,113 ---- endif $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \ $$(addprefix -J, $$($1_JAVA_ARGS)) $$($1_LAUNCHER_CLASS), "$$a"$(COMMA) )) }' $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR) ! ifeq ($(call isTargetOs, macosx), true) ifeq ($$($1_MACOSX_SIGNED), true) $1_PLIST_FILE := Info-privileged.plist $1_CODESIGN := true else $1_PLIST_FILE := Info-cmdline.plist
*** 177,202 **** )) $1 += $$(BUILD_LAUNCHER_$1) TARGETS += $$($1) ! ifeq ($(OPENJDK_TARGET_OS), aix) $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static) endif ! ifeq ($(OPENJDK_TARGET_OS), windows) $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, java, /libjava) \ $$($1_WINDOWS_JLI_LIB) endif endef ################################################################################ # Create man pages for jmod to pick up. There should be a one-to-one # relationship between executables and man pages (even if this is not always # the case), so piggyback man page generation on the launcher compilation. ! ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) # Only build manpages on unix systems. # We assume all our man pages should reside in section 1. MAN_FILES_MD := $(wildcard $(addsuffix /*.md, $(call FindModuleManDirs, $(MODULE)))) MAN_FILES_TROFF := $(wildcard $(addsuffix /*.1, $(call FindModuleManDirs, $(MODULE)))) --- 177,202 ---- )) $1 += $$(BUILD_LAUNCHER_$1) TARGETS += $$($1) ! ifeq ($(call isTargetOs, aix), true) $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static) endif ! ifeq ($(call isTargetOs, windows), true) $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, java, /libjava) \ $$($1_WINDOWS_JLI_LIB) endif endef ################################################################################ # Create man pages for jmod to pick up. There should be a one-to-one # relationship between executables and man pages (even if this is not always # the case), so piggyback man page generation on the launcher compilation. ! ifeq ($(call isTargetOsType, unix), true) # Only build manpages on unix systems. # We assume all our man pages should reside in section 1. MAN_FILES_MD := $(wildcard $(addsuffix /*.md, $(call FindModuleManDirs, $(MODULE)))) MAN_FILES_TROFF := $(wildcard $(addsuffix /*.1, $(call FindModuleManDirs, $(MODULE))))
< prev index next >