equal
deleted
inserted
replaced
33 DOCS_TARGETS := |
33 DOCS_TARGETS := |
34 |
34 |
35 # On Windows tar frequently complains that "file changed as we read it" for |
35 # On Windows tar frequently complains that "file changed as we read it" for |
36 # some random source files. This seems to be cause by anti virus scanners and |
36 # some random source files. This seems to be cause by anti virus scanners and |
37 # is most likely safe to ignore. When it happens, tar returns '1'. |
37 # is most likely safe to ignore. When it happens, tar returns '1'. |
38 ifeq ($(OPENJDK_BUILD_OS), windows) |
38 ifeq ($(isBuildOs, windows), true) |
39 TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1" |
39 TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1" |
40 endif |
40 endif |
41 |
41 |
42 # Hook to include the corresponding custom file, if present. |
42 # Hook to include the corresponding custom file, if present. |
43 $(eval $(call IncludeCustomExtension, Bundles-pre.gmk)) |
43 $(eval $(call IncludeCustomExtension, Bundles-pre.gmk)) |
142 |
142 |
143 ################################################################################ |
143 ################################################################################ |
144 |
144 |
145 # On Macosx, we bundle up the macosx specific images which already have the |
145 # On Macosx, we bundle up the macosx specific images which already have the |
146 # correct base directories. |
146 # correct base directories. |
147 ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release) |
147 ifeq ($(call isTargetOs, macosx)+$(DEBUG_LEVEL), true+release) |
148 JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR) |
148 JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR) |
149 JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home |
149 JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home |
150 JDK_BUNDLE_SUBDIR := |
150 JDK_BUNDLE_SUBDIR := |
151 else |
151 else |
152 JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR) |
152 JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR) |
165 |
165 |
166 ALL_JDK_FILES := $(call CacheFind, $(JDK_IMAGE_DIR)) |
166 ALL_JDK_FILES := $(call CacheFind, $(JDK_IMAGE_DIR)) |
167 |
167 |
168 # Create special filter rules when dealing with unzipped .dSYM directories on |
168 # Create special filter rules when dealing with unzipped .dSYM directories on |
169 # macosx |
169 # macosx |
170 ifeq ($(OPENJDK_TARGET_OS), macosx) |
170 ifeq ($(call isTargetOs, macosx), true) |
171 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false) |
171 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false) |
172 JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \ |
172 JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \ |
173 $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES)))) |
173 $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES)))) |
174 endif |
174 endif |
175 endif |
175 endif |