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 ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release) |
148 JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR) |
148 JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR) |
149 JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR) |
|
150 JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home |
149 JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home |
151 JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home |
|
152 JDK_BUNDLE_SUBDIR := |
150 JDK_BUNDLE_SUBDIR := |
153 JRE_BUNDLE_SUBDIR := |
|
154 else |
151 else |
155 JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR) |
152 JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR) |
156 JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR) |
|
157 JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER) |
153 JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER) |
158 JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER) |
|
159 ifneq ($(DEBUG_LEVEL), release) |
154 ifneq ($(DEBUG_LEVEL), release) |
160 JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) |
155 JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) |
161 JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) |
|
162 endif |
156 endif |
163 endif |
157 endif |
164 |
158 |
165 ################################################################################ |
159 ################################################################################ |
166 |
160 |
202 ) \ |
196 ) \ |
203 $(call CacheFind, $(SYMBOLS_IMAGE_DIR)) |
197 $(call CacheFind, $(SYMBOLS_IMAGE_DIR)) |
204 |
198 |
205 TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES)) |
199 TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES)) |
206 |
200 |
207 ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR)) |
|
208 |
|
209 # Create special filter rules when dealing with unzipped .dSYM directories on |
|
210 # macosx |
|
211 ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
212 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false) |
|
213 JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \ |
|
214 $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES)))) |
|
215 endif |
|
216 endif |
|
217 |
|
218 JRE_BUNDLE_FILES := $(filter-out \ |
|
219 $(JRE_SYMBOLS_EXCLUDE_PATTERN) \ |
|
220 $(SYMBOLS_EXCLUDE_PATTERN), \ |
|
221 $(ALL_JRE_FILES)) |
|
222 JRE_SYMBOLS_BUNDLE_FILES := $(filter \ |
|
223 $(JRE_SYMBOLS_EXCLUDE_PATTERN) \ |
|
224 $(SYMBOLS_EXCLUDE_PATTERN), \ |
|
225 $(ALL_JRE_FILES)) |
|
226 |
|
227 $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \ |
201 $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \ |
228 BUNDLE_NAME := $(JDK_BUNDLE_NAME), \ |
202 BUNDLE_NAME := $(JDK_BUNDLE_NAME), \ |
229 FILES := $(JDK_BUNDLE_FILES), \ |
203 FILES := $(JDK_BUNDLE_FILES), \ |
230 SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \ |
204 SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \ |
231 BASE_DIRS := $(JDK_IMAGE_DIR), \ |
205 BASE_DIRS := $(JDK_IMAGE_DIR), \ |
232 SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
206 SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
233 )) |
207 )) |
234 |
208 |
235 PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE) |
209 PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE) |
236 |
210 |
237 $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \ |
|
238 BUNDLE_NAME := $(JRE_BUNDLE_NAME), \ |
|
239 FILES := $(JRE_BUNDLE_FILES), \ |
|
240 BASE_DIRS := $(JRE_IMAGE_DIR), \ |
|
241 SUBDIR := $(JRE_BUNDLE_SUBDIR), \ |
|
242 )) |
|
243 |
|
244 PRODUCT_TARGETS += $(BUILD_JRE_BUNDLE) |
|
245 |
|
246 $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \ |
211 $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \ |
247 BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \ |
212 BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \ |
248 FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \ |
213 FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \ |
249 BASE_DIRS := $(JDK_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \ |
214 BASE_DIRS := $(JDK_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \ |
250 SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
215 SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
251 UNZIP_DEBUGINFO := true, \ |
216 UNZIP_DEBUGINFO := true, \ |
252 )) |
217 )) |
253 |
218 |
254 PRODUCT_TARGETS += $(BUILD_JDK_SYMBOLS_BUNDLE) |
219 PRODUCT_TARGETS += $(BUILD_JDK_SYMBOLS_BUNDLE) |
255 |
|
256 $(eval $(call SetupBundleFile, BUILD_JRE_SYMBOLS_BUNDLE, \ |
|
257 BUNDLE_NAME := $(JRE_SYMBOLS_BUNDLE_NAME), \ |
|
258 FILES := $(JRE_SYMBOLS_BUNDLE_FILES), \ |
|
259 BASE_DIRS := $(JRE_IMAGE_DIR), \ |
|
260 SUBDIR := $(JRE_BUNDLE_SUBDIR), \ |
|
261 UNZIP_DEBUGINFO := true, \ |
|
262 )) |
|
263 |
|
264 PRODUCT_TARGETS += $(BUILD_JRE_SYMBOLS_BUNDLE) |
|
265 |
220 |
266 # The demo bundle is only created to support client tests. Ideally it should |
221 # The demo bundle is only created to support client tests. Ideally it should |
267 # be built with the main test bundle, but since the prerequisites match |
222 # be built with the main test bundle, but since the prerequisites match |
268 # better with the product build, it makes more sense to keep it there for now. |
223 # better with the product build, it makes more sense to keep it there for now. |
269 $(eval $(call SetupBundleFile, BUILD_TEST_DEMOS_BUNDLE, \ |
224 $(eval $(call SetupBundleFile, BUILD_TEST_DEMOS_BUNDLE, \ |