make/Bundles.gmk

*** 33,43 ****
  DOCS_TARGETS :=
  
  # On Windows tar frequently complains that "file changed as we read it" for
  # some random source files. This seems to be cause by anti virus scanners and
  # is most likely safe to ignore. When it happens, tar returns '1'.
! ifeq ($(OPENJDK_BUILD_OS), windows)
    TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1"
  endif
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
--- 33,43 ----
  DOCS_TARGETS :=
  
  # On Windows tar frequently complains that "file changed as we read it" for
  # some random source files. This seems to be cause by anti virus scanners and
  # is most likely safe to ignore. When it happens, tar returns '1'.
! ifeq ($(isBuildOs, windows), true)
    TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1"
  endif
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
*** 142,152 ****
  
  ################################################################################
  
  # On Macosx, we bundle up the macosx specific images which already have the
  # correct base directories.
! ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
    JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
    JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
    JDK_BUNDLE_SUBDIR :=
  else
    JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
--- 142,152 ----
  
  ################################################################################
  
  # On Macosx, we bundle up the macosx specific images which already have the
  # correct base directories.
! ifeq ($(call isTargetOs, macosx)+$(DEBUG_LEVEL), true+release)
    JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
    JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
    JDK_BUNDLE_SUBDIR :=
  else
    JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
*** 165,175 ****
  
    ALL_JDK_FILES := $(call CacheFind, $(JDK_IMAGE_DIR))
  
    # Create special filter rules when dealing with unzipped .dSYM directories on
    # macosx
!   ifeq ($(OPENJDK_TARGET_OS), macosx)
      ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
        JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
            $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES))))
      endif
    endif
--- 165,175 ----
  
    ALL_JDK_FILES := $(call CacheFind, $(JDK_IMAGE_DIR))
  
    # Create special filter rules when dealing with unzipped .dSYM directories on
    # macosx
!   ifeq ($(call isTargetOs, macosx), true)
      ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
        JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
            $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES))))
      endif
    endif