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