< prev index next >

make/Bundles.gmk

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 27,44 **** include $(SPEC) include MakeBase.gmk PRODUCT_TARGETS := - LEGACY_TARGETS := TEST_TARGETS := 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 ($(call 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)) --- 27,43 ---- include $(SPEC) include MakeBase.gmk PRODUCT_TARGETS := TEST_TARGETS := 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))
*** 70,80 **** $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) $$(call MakeTargetDir) ! # If any of the files contain a space in the file name, FindFiles # will have replaced it with ?. Tar does not accept that so need to # switch it back. $$(foreach d, $$($1_BASE_DIRS), \ $$(eval $$(call ListPathsSafely, \ $1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \ --- 69,79 ---- $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) $$(call MakeTargetDir) ! # If any of the files contain a space in the file name, CacheFind # will have replaced it with ?. Tar does not accept that so need to # switch it back. $$(foreach d, $$($1_BASE_DIRS), \ $$(eval $$(call ListPathsSafely, \ $1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \
*** 143,183 **** ################################################################################ # 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) - JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR) JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home - JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home JDK_BUNDLE_SUBDIR := - JRE_BUNDLE_SUBDIR := else JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR) - JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR) JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER) - JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER) ifneq ($(DEBUG_LEVEL), release) JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) - JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) endif endif ################################################################################ ! ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), ) SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map ! # There may be files with spaces in the names, so use ShellFindFiles ! # explicitly. ! ALL_JDK_FILES := $(call ShellFindFiles, $(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 --- 142,175 ---- ################################################################################ # 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) JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER) ifneq ($(DEBUG_LEVEL), release) JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) endif endif ################################################################################ ! ifneq ($(filter product-bundles, $(MAKECMDGOALS)), ) ! $(eval $(call FillCacheFind, $(IMAGES_OUTPUTDIR))) SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map ! 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
*** 200,248 **** $(JDK_IMAGE_HOMEDIR)/demo/% \ , \ $(ALL_JDK_FILES) \ ) \ ) \ ! $(call FindFiles, $(SYMBOLS_IMAGE_DIR)) TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES)) - ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_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) - JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \ - $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES)))) - endif - endif - - JRE_BUNDLE_FILES := $(filter-out \ - $(JRE_SYMBOLS_EXCLUDE_PATTERN) \ - $(SYMBOLS_EXCLUDE_PATTERN), \ - $(ALL_JRE_FILES)) - $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \ BUNDLE_NAME := $(JDK_BUNDLE_NAME), \ FILES := $(JDK_BUNDLE_FILES), \ SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \ BASE_DIRS := $(JDK_IMAGE_DIR), \ SUBDIR := $(JDK_BUNDLE_SUBDIR), \ )) PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE) - $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \ - BUNDLE_NAME := $(JRE_BUNDLE_NAME), \ - FILES := $(JRE_BUNDLE_FILES), \ - BASE_DIRS := $(JRE_IMAGE_DIR), \ - SUBDIR := $(JRE_BUNDLE_SUBDIR), \ - )) - - LEGACY_TARGETS += $(BUILD_JRE_BUNDLE) - $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \ BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \ FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \ BASE_DIRS := $(JDK_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \ SUBDIR := $(JDK_BUNDLE_SUBDIR), \ --- 192,215 ---- $(JDK_IMAGE_HOMEDIR)/demo/% \ , \ $(ALL_JDK_FILES) \ ) \ ) \ ! $(call CacheFind, $(SYMBOLS_IMAGE_DIR)) TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES)) $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \ BUNDLE_NAME := $(JDK_BUNDLE_NAME), \ FILES := $(JDK_BUNDLE_FILES), \ SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \ BASE_DIRS := $(JDK_IMAGE_DIR), \ SUBDIR := $(JDK_BUNDLE_SUBDIR), \ )) PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE) $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \ BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \ FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \ BASE_DIRS := $(JDK_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \ SUBDIR := $(JDK_BUNDLE_SUBDIR), \
*** 265,275 **** endif ################################################################################ ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) ! TEST_BUNDLE_FILES := $(call FindFiles, $(TEST_IMAGE_DIR)) $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ FILES := $(TEST_BUNDLE_FILES), \ BASE_DIRS := $(TEST_IMAGE_DIR), \ --- 232,242 ---- endif ################################################################################ ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) ! TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR)) $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ FILES := $(TEST_BUNDLE_FILES), \ BASE_DIRS := $(TEST_IMAGE_DIR), \
*** 279,289 **** endif ################################################################################ ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), ) ! DOCS_BUNDLE_FILES := $(call FindFiles, $(DOCS_IMAGE_DIR)) $(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \ BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \ FILES := $(DOCS_BUNDLE_FILES), \ BASE_DIRS := $(DOCS_IMAGE_DIR), \ --- 246,256 ---- endif ################################################################################ ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), ) ! DOCS_BUNDLE_FILES := $(call CacheFind, $(DOCS_IMAGE_DIR)) $(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \ BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \ FILES := $(DOCS_BUNDLE_FILES), \ BASE_DIRS := $(DOCS_IMAGE_DIR), \
*** 293,324 **** DOCS_TARGETS += $(BUILD_DOCS_BUNDLE) endif ################################################################################ - ifneq ($(filter jcov-bundles, $(MAKECMDGOALS)), ) - JCOV_BUNDLE_FILES := $(call FindFiles, $(JCOV_IMAGE_DIR)) - - $(eval $(call SetupBundleFile, BUILD_JCOV_BUNDLE, \ - BUNDLE_NAME := $(JCOV_BUNDLE_NAME), \ - FILES := $(JCOV_BUNDLE_FILES), \ - BASE_DIRS := $(JCOV_IMAGE_DIR), \ - SUBDIR := $(JDK_BUNDLE_SUBDIR), \ - )) - - JCOV_TARGETS += $(BUILD_JCOV_BUNDLE) - endif - - ################################################################################ - # Hook to include the corresponding custom file, if present. $(eval $(call IncludeCustomExtension, Bundles.gmk)) ################################################################################ product-bundles: $(PRODUCT_TARGETS) - legacy-bundles: $(LEGACY_TARGETS) test-bundles: $(TEST_TARGETS) docs-bundles: $(DOCS_TARGETS) - jcov-bundles: $(JCOV_TARGETS) ! .PHONY: all default product-bundles test-bundles docs-bundles jcov-bundles --- 260,274 ---- DOCS_TARGETS += $(BUILD_DOCS_BUNDLE) endif ################################################################################ # Hook to include the corresponding custom file, if present. $(eval $(call IncludeCustomExtension, Bundles.gmk)) ################################################################################ product-bundles: $(PRODUCT_TARGETS) test-bundles: $(TEST_TARGETS) docs-bundles: $(DOCS_TARGETS) ! .PHONY: all default product-bundles test-bundles docs-bundles
< prev index next >