Merge pull request #1638 from SAP/pr-jdk-23+17

Merge to tag jdk-23+17

make/common/JdkNativeCompilation.gmk

@@ -35,12 +35,6 @@ include NativeCompilation.gmk
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, common/JdkNativeCompilation.gmk))
 
-FindSrcDirsForLib += \
- $(call uniq, $(wildcard \
- $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
- $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
- $(TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
-
 FindSrcDirsForComponent += \
  $(call uniq, $(wildcard \
  $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/$(strip $2) \
@@ -104,14 +98,17 @@ JDK_RCFLAGS=$(RCFLAGS) \
  -D"JDK_NAME=$(JDK_RC_NAME) $(VERSION_SHORT)" \
  -D"JDK_FVER=$(subst .,$(COMMA),$(VERSION_NUMBER_FOUR_POSITIONS))"
 
-# Setup make rules for creating a native shared library with suitable defaults
-# for the OpenJDK project.
+# Setup make rules for creating a native binary with suitable defaults
+# for the OpenJDK project. This macro is mostly considered to be an internal
+# support version. Please use SetupJdkLibrary or SetupJdkExecutable instead.
 #
 # Parameter 1 is the name of the rule. This name is used as variable prefix,
 # and the targets generated are listed in a variable by that name.
 #
 # Remaining parameters are named arguments. These are all passed on to
-# SetupNativeCompilation, except for
+# SetupNativeCompilation. This macro also adds the following additional
+# arguments:
+#
 # EXTRA_RCFLAGS -- additional RCFLAGS to append.
 # EXTRA_HEADER_DIRS -- additional directories to look for headers in
 # EXTRA_SRC -- additional directories to look for source in
@@ -122,19 +119,46 @@ JDK_RCFLAGS=$(RCFLAGS) \
 # SRC -- this is passed on, but preprocessed to accept source dir designations
 # RC_FILEDESC -- override the default FILEDESC for Windows version.rc
 # such as "java.base:headers".
-SetupJdkLibrary = $(NamedParamsMacroTemplate)
-define SetupJdkLibraryBody
+# JDK_LIBS -- libraries generated by the JDK build system to link against
+# JDK_LIBS_<os> or JDK_LIBS_<osType> -- additional JDK_LIBS for the given OS
+# or OS type only
+# DEFAULT_CFLAGS -- if false, do not add default CFLAGS and CXXFLAGS
+# CFLAGS_FILTER_OUT -- flags to filter out from default CFLAGS
+# CXXFLAGS_FILTER_OUT -- flags to filter out from default CXXFLAGS
+# LDFLAGS_FILTER_OUT -- flags to filter out from default LDFLAGS
+# LD_SET_ORIGIN -- if false, do not add SET_*_ORIGIN flags to LDFLAGS
+# APPEND_LDFLAGS -- a quirk to have additional LDFLAGS that will be set after
+# the origin flags
+#
+SetupJdkNativeCompilation = $(NamedParamsMacroTemplate)
+define SetupJdkNativeCompilationBody
+ ifeq ($$($1_TYPE), EXECUTABLE)
+ $1_NATIVE_DIR_PREFIX :=
+ $1_MODULES_PATH := modules_cmds
+ $1_RC_EXT := exe
+ $1_RC_FTYPE := 0x1L
+ else
+ $1_NATIVE_DIR_PREFIX := lib
+ $1_MODULES_PATH := modules_libs
+ $1_RC_EXT := dll
+ $1_RC_FTYPE := 0x2L
+ endif
+
  ifeq ($$($1_OUTPUT_DIR), )
  ifneq ($$(MODULE), )
- $1_OUTPUT_DIR := $$(call FindLibDirForModule, $$(MODULE))
+ ifeq ($$($1_TYPE), STATIC_LIBRARY)
+ $1_OUTPUT_DIR := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)
+ else
+ $1_OUTPUT_DIR := $$(SUPPORT_OUTPUTDIR)/$$($1_MODULES_PATH)/$$(strip $$(MODULE))
+ endif
  else
  $$(error Must specify OUTPUT_DIR in a MODULE free context)
  endif
  endif
 
  ifeq ($$($1_OBJECT_DIR), )
  ifneq ($$(MODULE), )
- $1_OBJECT_DIR := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/lib$$($1_NAME)
+ $1_OBJECT_DIR := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/$$($1_NATIVE_DIR_PREFIX)$$($1_NAME)
  else
  $$(error Must specify OBJECT_DIR in a MODULE free context)
  endif
@@ -146,7 +170,7 @@ define SetupJdkLibraryBody
 
  ifeq ($$($1_SRC), )
  ifneq ($$(MODULE), )
- $1_SRC := $$(call FindSrcDirsForLib, $$(MODULE), $$($1_NAME))
+ $1_SRC := $$(call FindSrcDirsForComponent, $$(MODULE), $$($1_NATIVE_DIR_PREFIX)$$($1_NAME))
  else
  $$(error Must specify SRC in a MODULE free context)
  endif
@@ -171,12 +195,11 @@ define SetupJdkLibraryBody
  ifeq ($$($1_RC_FILEDESC), )
  $1_RC_FILEDESC := $(JDK_RC_NAME) binary
  endif
-
  $1_RCFLAGS := $(JDK_RCFLAGS) \
- -D"JDK_FILEDESC=$$(strip $$($1_RC_FILEDESC))" \
- -D"JDK_FNAME=$$($1_NAME).dll" \
+ -D"JDK_FILEDESC=$$($1_RC_FILEDESC)" \
+ -D"JDK_FNAME=$$($1_NAME).$$($1_RC_EXT)" \
  -D"JDK_INTERNAL_NAME=$$($1_NAME)" \
- -D"JDK_FTYPE=0x2L" \
+ -D"JDK_FTYPE=$$($1_RC_FTYPE)" \
  -I$(TOPDIR)/src/java.base/windows/native/common \
  $$($1_EXTRA_RCFLAGS)
 
@@ -199,11 +222,19 @@ define SetupJdkLibraryBody
  endif
 
  ifneq ($$($1_DEFAULT_CFLAGS), false)
- # Set the default flags first to be able to override
- $1_CFLAGS := $$(filter-out $$($1_CFLAGS_FILTER_OUT), $$(CFLAGS_JDKLIB)) $$($1_CFLAGS)
+ ifeq ($$($1_TYPE), EXECUTABLE)
+ # Set the default flags first to be able to override
+ $1_CFLAGS := $$(filter-out $$($1_CFLAGS_FILTER_OUT), $$(CFLAGS_JDKEXE)) $$($1_CFLAGS)
 
- # Set the default flags first to be able to override
- $1_CXXFLAGS := $$(filter-out $$($1_CXXFLAGS_FILTER_OUT), $$(CXXFLAGS_JDKLIB)) $$($1_CXXFLAGS)
+ # Set the default flags first to be able to override
+ $1_CXXFLAGS := $$(filter-out $$($1_CXXFLAGS_FILTER_OUT), $$(CXXFLAGS_JDKEXE)) $$($1_CXXFLAGS)
+ else
+ # Set the default flags first to be able to override
+ $1_CFLAGS := $$(filter-out $$($1_CFLAGS_FILTER_OUT), $$(CFLAGS_JDKLIB)) $$($1_CFLAGS)
+
+ # Set the default flags first to be able to override
+ $1_CXXFLAGS := $$(filter-out $$($1_CXXFLAGS_FILTER_OUT), $$(CXXFLAGS_JDKLIB)) $$($1_CXXFLAGS)
+ endif
  endif
 
  ifneq ($$($1_CFLAGS), )
@@ -217,125 +248,67 @@ define SetupJdkLibraryBody
  endif
 
  ifneq ($$($1_DEFAULT_LDFLAGS), false)
- # Set the default flags first to be able to override
- $1_LDFLAGS := $$(filter-out $$($1_LDFLAGS_FILTER_OUT), $$(LDFLAGS_JDKLIB)) $$($1_LDFLAGS)
+ ifeq ($$($1_TYPE), EXECUTABLE)
+ # Set the default flags first to be able to override
+ $1_LDFLAGS := $$(filter-out $$($1_LDFLAGS_FILTER_OUT), $$(LDFLAGS_JDKEXE)) $$($1_LDFLAGS)
+ else
+ # Set the default flags first to be able to override
+ $1_LDFLAGS := $$(filter-out $$($1_LDFLAGS_FILTER_OUT), $$(LDFLAGS_JDKLIB)) $$($1_LDFLAGS)
+ endif
  endif
 
  ifneq ($$($1_LD_SET_ORIGIN), false)
- $1_LDFLAGS += $$(call SET_SHARED_LIBRARY_ORIGIN)
+ ifeq ($$($1_TYPE), EXECUTABLE)
+ $1_LDFLAGS += $$(call SET_EXECUTABLE_ORIGIN)
+ else
+ $1_LDFLAGS += $$(call SET_SHARED_LIBRARY_ORIGIN)
+ endif
  endif
  # APPEND_LDFLAGS, if it exists, must be set after the origin flags
  # This is a workaround to keep existing behavior
  $1_LDFLAGS += $$($1_APPEND_LDFLAGS)
 
  # Since we reuse the rule name ($1), all our arguments will pass through.
  # We lose in transparency, but gain in brevity in this call...
- $$(eval $$(call SetupNativeCompilation, $1, ))
+ $$(eval $$(call SetupNativeCompilation, $1))
 endef
 
-# Setup make rules for creating a native executable with suitable defaults for
-# the OpenJDK project.
+# Setup make rules for creating a native library with suitable defaults
+# for the OpenJDK project. The default is to create a shared library,
+# but by passing TYPE := STATIC_LIBARY, a static library can be created.
 #
 # Parameter 1 is the name of the rule. This name is used as variable prefix,
 # and the targets generated are listed in a variable by that name.
 #
 # Remaining parameters are named arguments. These are all passed on to
-# SetupNativeCompilation, except for
-# EXTRA_RCFLAGS -- additional RCFLAGS to append.
-SetupJdkExecutable = $(NamedParamsMacroTemplate)
-define SetupJdkExecutableBody
- $1_TYPE := EXECUTABLE
-
- ifeq ($$($1_OUTPUT_DIR), )
- ifneq ($$(MODULE), )
- $1_OUTPUT_DIR := $$(call FindExecutableDirForModule, $$(MODULE))
- else
- $$(error Must specify OUTPUT_DIR in a MODULE free context)
- endif
- endif
-
- ifeq ($$($1_OBJECT_DIR), )
- ifneq ($$(MODULE), )
- $1_OBJECT_DIR := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/$$($1_NAME)
- else
- $$(error Must specify OBJECT_DIR in a MODULE free context)
- endif
- endif
-
- ifeq ($$($1_LINK_TYPE), C++)
- $1_LIBS += $(LIBCXX)
- endif
-
- ifeq ($$($1_SRC), )
- ifneq ($$(MODULE), )
- $1_SRC := $$(call FindSrcDirsForComponent, $$(MODULE), $$($1_NAME))
- else
- $$(error Must specify SRC in a MODULE free context)
- endif
- else
- $1_SRC := $$(foreach dir, $$($1_SRC), $$(call ProcessDir, $$(dir)))
- endif
- ifneq ($$($1_EXTRA_SRC), )
- $1_SRC += $$(foreach dir, $$($1_EXTRA_SRC), $$(call ProcessDir, $$(dir)))
- endif
-
- ifeq ($$($1_VERSIONINFO_RESOURCE), )
- $1_VERSIONINFO_RESOURCE := $$(GLOBAL_VERSION_INFO_RESOURCE)
- endif
-
- $1_RCFLAGS := $(JDK_RCFLAGS) \
- -D"JDK_FILEDESC=$(JDK_RC_NAME) binary" \
- -D"JDK_FNAME=$$($1_NAME).exe" \
- -D"JDK_INTERNAL_NAME=$$($1_NAME)" \
- -D"JDK_FTYPE=0x1L" \
- -I$(TOPDIR)/src/java.base/windows/native/common \
- $$($1_EXTRA_RCFLAGS)
-
- ifneq ($$($1_HEADERS_FROM_SRC), false)
- $1_SRC_HEADER_FLAGS := $$(addprefix -I, $$(wildcard $$($1_SRC)))
- endif
-
- $1_JDK_LIBS += $$($1_JDK_LIBS_$$(OPENJDK_TARGET_OS))
- $1_JDK_LIBS += $$($1_JDK_LIBS_$$(OPENJDK_TARGET_OS_TYPE))
- # Prepend JDK libs before external libs
- $1_LIBS := $$($1_JDK_LIBS) $$($1_LIBS)
-
- ifneq ($$($1_EXTRA_HEADER_DIRS), )
- $1_PROCESSED_EXTRA_HEADER_DIRS := $$(foreach dir, $$($1_EXTRA_HEADER_DIRS), \
- $$(call ProcessDir, $$(dir)))
- $1_EXTRA_HEADER_FLAGS := $$(addprefix -I, $$($1_PROCESSED_EXTRA_HEADER_DIRS))
- endif
-
- ifneq ($$($1_DEFAULT_CFLAGS), false)
- # Set the default flags first to be able to override
- $1_CFLAGS := $$(filter-out $$($1_CFLAGS_FILTER_OUT), $$(CFLAGS_JDKEXE)) $$($1_CFLAGS)
-
- # Set the default flags first to be able to override
- $1_CXXFLAGS := $$(filter-out $$($1_CXXFLAGS_FILTER_OUT), $$(CXXFLAGS_JDKEXE)) $$($1_CXXFLAGS)
- endif
-
- ifneq ($$($1_CFLAGS), )
- $1_CFLAGS += $$($1_SRC_HEADER_FLAGS) $$($1_EXTRA_HEADER_FLAGS)
- endif
- ifneq ($$($1_CXXFLAGS), )
- $1_CXXFLAGS += $$($1_SRC_HEADER_FLAGS) $$($1_EXTRA_HEADER_FLAGS)
- endif
- ifeq ($$($1_CFLAGS)$$($1_CXXFLAGS), )
- $1_CFLAGS += $$($1_SRC_HEADER_FLAGS) $$($1_EXTRA_HEADER_FLAGS)
+# SetupJdkNativeCompilation. Please see that macro for details.
+SetupJdkLibrary = $(NamedParamsMacroTemplate)
+define SetupJdkLibraryBody
+ # If type is unspecified, default to LIBRARY
+ ifeq ($$($1_TYPE), )
+ $1_TYPE := LIBRARY
  endif
 
- ifneq ($$($1_DEFAULT_LDFLAGS), false)
-  # Set the default flags first to be able to override
-  $1_LDFLAGS := $$(filter-out $$($1_LDFLAGS_FILTER_OUT), $$(LDFLAGS_JDKEXE)) $$($1_LDFLAGS)
- endif
+ # Since we reuse the rule name ($1), all our arguments will pass through.
+ # We lose in transparency, but gain in brevity in this call...
+ $$(eval $$(call SetupJdkNativeCompilation, $1))
+endef
 
- ifneq ($$($1_LD_SET_ORIGIN), false)
- $1_LDFLAGS += $$(call SET_EXECUTABLE_ORIGIN)
- endif
+# Setup make rules for creating a native executable with suitable defaults
+# for the OpenJDK project.
+#
+# Parameter 1 is the name of the rule. This name is used as variable prefix,
+# and the targets generated are listed in a variable by that name.
+#
+# Remaining parameters are named arguments. These are all passed on to
+# SetupJdkNativeCompilation. Please see that macro for details.
+SetupJdkExecutable = $(NamedParamsMacroTemplate)
+define SetupJdkExecutableBody
+ $1_TYPE := EXECUTABLE
 
  # Since we reuse the rule name ($1), all our arguments will pass through.
  # We lose in transparency, but gain in brevity in this call...
- $$(eval $$(call SetupNativeCompilation, $1))
+ $$(eval $$(call SetupJdkNativeCompilation, $1))
 endef
 
 endif # _JDK_NATIVE_COMPILATION_GMK

make/common/NativeCompilation.gmk

@@ -73,8 +73,6 @@ include native/Paths.gmk
 # used both for C and C++.
 # LIBS_<toolchain>_<OS> the libraries to link to for the specified target
 # OS and toolchain, used both for C and C++.
-# ARFLAGS the archiver flags to be used on unix platforms
-# LIBFLAGS the flags for the lib tool used on windows
 # OBJECT_DIR the directory where we store the object files
 # OUTPUT_DIR the directory where the resulting binary is put
 # SYMBOLS_DIR the directory where the debug symbols are put, defaults to OUTPUT_DIR

make/common/modules/LauncherCommon.gmk

@@ -151,9 +151,7 @@ define SetupBuildLauncherBody
  LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN,/../lib) \
  -L$(call FindLibDirForModule, java.base), \
  LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \
- JDK_LIBS_linux := -ljli, \
- JDK_LIBS_macosx := -ljli, \
- JDK_LIBS_aix := -ljli_static, \
+ JDK_LIBS_unix := -ljli, \
  JDK_LIBS_windows := \
  $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib \
  $$($1_WINDOWS_JLI_LIB), \
@@ -177,7 +175,7 @@ define SetupBuildLauncherBody
  $$(BUILD_LAUNCHER_$1): $$(BUILD_PLIST_$1)
 
  ifeq ($(call isTargetOs, aix), true)
- $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static)
+ $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli)
  endif
 
  ifeq ($(call isTargetOs, windows), true)

make/common/native/Link.gmk

@@ -78,7 +78,7 @@ define CreateStaticLibrary
  endif
  endif
 
- $1_VARDEPS := $$($1_AR) $$(ARFLAGS) $$($1_ARFLAGS) $$($1_LIBS) \
+ $1_VARDEPS := $$($1_AR) $$(ARFLAGS) $$($1_LIBS) \
  $$($1_EXTRA_LIBS)
  ifeq ($$($1_ENABLE_PARTIAL_LINKING), true)
  $1_VARDEPS += $$($1_LD) $$($1_SYSROOT_LDFLAGS)
@@ -116,7 +116,7 @@ define CreateStaticLibrary
  endif
  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
  $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
- $$($1_AR) $$(ARFLAGS) $$($1_ARFLAGS) -r -cs $$($1_TARGET) \
+ $$($1_AR) $$(ARFLAGS) -r -cs $$($1_TARGET) \
  $$($1_AR_OBJ_ARG) $$($1_RES))
  ifeq ($(STATIC_BUILD), true)
  $(RM) $$(@D)/$$(basename $$(@F)).symbols; \

make/common/native/LinkMicrosoft.gmk

@@ -38,7 +38,7 @@ endef
 
 ################################################################################
 define CreateStaticLibraryMicrosoft
- $1_VARDEPS := $$($1_LIB) $$(LIBFLAGS) $$($1_LIBFLAGS) $$($1_LIBS) \
+ $1_VARDEPS := $$($1_LIB) $$(LIBFLAGS) $$($1_LIBS) \
  $$($1_EXTRA_LIBS)
  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
  $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
@@ -50,7 +50,7 @@ define CreateStaticLibraryMicrosoft
  $$(call LogInfo, Building static library $$($1_BASENAME))
  $$(call MakeDir, $$($1_OUTPUT_DIR) $$($1_SYMBOLS_DIR))
  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
- $$($1_LIB) -nologo $$(LIBFLAGS) $$($1_LIBFLAGS) -out:$$($1_TARGET) \
+ $$($1_LIB) -nologo $$(LIBFLAGS) -out:$$($1_TARGET) \
  $$($1_LD_OBJ_ARG) $$($1_RES))
 endef
 

make/conf/github-actions.conf

@@ -29,17 +29,17 @@ GTEST_VERSION=1.14.0
 JTREG_VERSION=7.3.1+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.2/sapmachine-jdk-21.0.2_linux-x64_bin.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=3123189ec5b99eed78de0328e2fd49d7c13cc7d4524c341f1fe8fbd5165be31f
+LINUX_X64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-22/sapmachine-jdk-22_linux-x64_bin.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=42c13834842b64e3a553aaee308b99802db81e48a0b7e0c87bf3a9791ce29d60
 
 MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.2/sapmachine-jdk-21.0.2_macos-x64_bin.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=826fb6c8c5b4c24a1150ad3e393114a8be9072b9f9a65bc10ec8343971eb48fc
+MACOS_X64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-22/sapmachine-jdk-22_macos-x64_bin.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=63f5c6ecb1aebea19892c740e0bed610a85376b0115566b83d34ded642d19d8a
 
 MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
-MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_macos-aarch64_bin.tar.gz
-MACOS_AARCH64_BOOT_JDK_SHA256=f12e1e0a2dffc847951598f597c8ee60fb0913932f24b2b09c62cfd2f0f4dfb9
+MACOS_AARCH64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-22/sapmachine-jdk-22_macos-aarch64_bin.tar.gz
+MACOS_AARCH64_BOOT_JDK_SHA256=ee55231c8d2da95c1be4f85361b4cca2d0f3d5b25e63c4b649b6c4b1c7a5d866
 
 WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.2/sapmachine-jdk-21.0.2_windows-x64_bin.zip
-WINDOWS_X64_BOOT_JDK_SHA256=8b2bc8007381240728ca50a23f020a3603ca84314308df707d4b3eff5b3bcfd5
+WINDOWS_X64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-22/sapmachine-jdk-22_windows-x64_bin.zip
+WINDOWS_X64_BOOT_JDK_SHA256=1f4e8d834ac3af6c49ea3d2260ab6e312175d56a3a98d65a47659bbbce497cb4

make/conf/jib-profiles.js

@@ -390,8 +390,8 @@ var getJibProfilesCommon = function (input, data) {
  };
  };
 
- common.boot_jdk_version = "21";
- common.boot_jdk_build_number = "35";
+ common.boot_jdk_version = "22";
+ common.boot_jdk_build_number = "36";
  common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
  + common.boot_jdk_version
  + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");