154 else |
154 else |
155 JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR) |
155 JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR) |
156 JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR) |
156 JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR) |
157 JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER) |
157 JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER) |
158 JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER) |
158 JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER) |
159 JRE_COMPACT1_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)-compact1 |
|
160 JRE_COMPACT2_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)-compact2 |
|
161 JRE_COMPACT3_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)-compact3 |
|
162 ifneq ($(DEBUG_LEVEL), release) |
159 ifneq ($(DEBUG_LEVEL), release) |
163 JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) |
160 JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) |
164 JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) |
161 JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) |
165 endif |
162 endif |
166 endif |
163 endif |
279 PRODUCT_TARGETS += $(BUILD_TEST_DEMOS_BUNDLE) |
276 PRODUCT_TARGETS += $(BUILD_TEST_DEMOS_BUNDLE) |
280 endif |
277 endif |
281 |
278 |
282 ################################################################################ |
279 ################################################################################ |
283 |
280 |
284 ifneq ($(filter profiles-bundles, $(MAKECMDGOALS)), ) |
|
285 ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
286 $(error Creating compact profiles bundles on macosx is unsupported) |
|
287 endif |
|
288 |
|
289 define GenerateCompactProfilesBundles |
|
290 ALL_JRE_COMPACT$1_FILES := $$(call CacheFind, $$(JRE_COMPACT$1_IMAGE_DIR)) |
|
291 |
|
292 JRE_COMPACT$1_BUNDLE_FILES := $$(filter-out \ |
|
293 $$(SYMBOLS_EXCLUDE_PATTERN), \ |
|
294 $$(ALL_JRE_COMPACT$1_FILES)) |
|
295 |
|
296 $$(eval $$(call SetupBundleFile, BUILD_JRE_COMPACT$1_BUNDLE, \ |
|
297 BUNDLE_NAME := $$(JRE_COMPACT$1_BUNDLE_NAME), \ |
|
298 FILES := $$(JRE_COMPACT$1_BUNDLE_FILES), \ |
|
299 BASE_DIRS := $$(JRE_COMPACT$1_IMAGE_DIR), \ |
|
300 SUBDIR := $$(JRE_COMPACT$1_BUNDLE_SUBDIR), \ |
|
301 )) |
|
302 |
|
303 PROFILES_TARGETS += $$(BUILD_JRE_COMPACT$1_BUNDLE) |
|
304 endef |
|
305 |
|
306 $(eval $(call GenerateCompactProfilesBundles,1)) |
|
307 $(eval $(call GenerateCompactProfilesBundles,2)) |
|
308 $(eval $(call GenerateCompactProfilesBundles,3)) |
|
309 endif |
|
310 |
|
311 ################################################################################ |
|
312 |
|
313 ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) |
281 ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) |
314 TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR)) |
282 TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR)) |
315 |
283 |
316 $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ |
284 $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ |
317 BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ |
285 BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ |
343 $(eval $(call IncludeCustomExtension, Bundles.gmk)) |
311 $(eval $(call IncludeCustomExtension, Bundles.gmk)) |
344 |
312 |
345 ################################################################################ |
313 ################################################################################ |
346 |
314 |
347 product-bundles: $(PRODUCT_TARGETS) |
315 product-bundles: $(PRODUCT_TARGETS) |
348 profiles-bundles: $(PROFILES_TARGETS) |
|
349 test-bundles: $(TEST_TARGETS) |
316 test-bundles: $(TEST_TARGETS) |
350 docs-bundles: $(DOCS_TARGETS) |
317 docs-bundles: $(DOCS_TARGETS) |
351 |
318 |
352 .PHONY: all default product-bundles profiles-bundles test-bundles docs-bundles |
319 .PHONY: all default product-bundles test-bundles docs-bundles |