http-client-branch: minor cleanup and improve testing for response version and session
# Copyright (c) 2014, 2017, 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# particular file as subject to the "Classpath" exception as provided# by Oracle in the LICENSE file that accompanied this code.## This code is distributed in the hope that it will be useful, but WITHOUT# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License# version 2 for more details (a copy is included in the LICENSE file that# accompanied this code).## You should have received a copy of the GNU General Public License version# 2 along with this work; if not, write to the Free Software Foundation,# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.## Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA# or visit www.oracle.com if you need additional information or have any# questions.#default: allinclude $(SPEC)include MakeBase.gmkinclude Modules.gmkifeq ($(MODULE), ) $(error MODULE must be set when calling CreateJmods.gmk)endif$(eval $(call IncludeCustomExtension, CreateJmods.gmk))################################################################################JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmodsJMODS_TEMPDIR := $(SUPPORT_OUTPUTDIR)/jmodsLIBS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ $(SUPPORT_OUTPUTDIR)/modules_libs $(IMPORT_MODULES_LIBS))))CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ $(SUPPORT_OUTPUTDIR)/modules_cmds $(IMPORT_MODULES_CMDS))))CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF))))CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE))INCLUDE_HEADERS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ $(SUPPORT_OUTPUTDIR)/modules_include $(IMPORT_MODULES_INCLUDE_HEADERS))))MAN_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN))))$(eval $(call FillCacheFind, \ $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \))ifneq ($(LIBS_DIR), ) JMOD_FLAGS += --libs $(LIBS_DIR) DEPS += $(call CacheFind, $(LIBS_DIR))endififneq ($(CMDS_DIR), ) JMOD_FLAGS += --cmds $(CMDS_DIR) DEPS += $(call CacheFind, $(CMDS_DIR))endififneq ($(CONF_DIR), ) JMOD_FLAGS += --config $(CONF_DIR) DEPS += $(call CacheFind, $(CONF_DIR))endififneq ($(CLASSES_DIR), ) JMOD_FLAGS += --class-path $(CLASSES_DIR) DEPS += $(call CacheFind, $(CLASSES_DIR))endififneq ($(INCLUDE_HEADERS_DIR), ) JMOD_FLAGS += --header-files $(INCLUDE_HEADERS_DIR) DEPS += $(call CacheFind, $(INCLUDE_HEADERS_DIR))endififneq ($(MAN_DIR), ) JMOD_FLAGS += --man-pages $(MAN_DIR) DEPS += $(call CacheFind, $(MAN_DIR))endifLEGAL_NOTICES := \ $(call uniq, $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \ $(call FindModuleLegalDirs, $(MODULE))) \ #LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))DEPS += $(call CacheFind, $(LEGAL_NOTICES))JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)ifeq ($(filter-out jdk.incubator.%, $(MODULE)), ) JMOD_FLAGS += --do-not-resolve-by-default JMOD_FLAGS += --warn-if-resolved=incubatingendif# Add dependencies on other jmod files. Only java.base needs access to other# jmods.ifeq ($(MODULE), java.base) # When creating a BUILDJDK, we don't need to add hashes to java.base ifneq ($(CREATING_BUILDJDK), true) # When creating interim versions of jmods, skip hashes ifneq ($(INTERIM_JMOD), true) ALL_UPGRADEABLE_MODULES := $(call FindAllUpgradeableModules) DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \ $(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules))) EXCLUDE_PATTERN := $(strip $(subst $(SPACE),$$|,$(strip $(ALL_UPGRADEABLE_MODULES)))) JMOD_FLAGS += --module-path $(JMODS_DIR) \ --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)' endif endifendif# Changes to the jmod tool itself should also trigger a rebuild of all jmods.# The variable JMOD_CMD could contain an environment variable assignment before# the actual command. Filter that out using wildcard before adding to DEPS.DEPS += $(wildcard $(JMOD_CMD))ifeq ($(EXTERNAL_BUILDJDK), false) DEPS += $(call CacheFind, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod)endif# If creating interim versions of jmods, certain files need to be filtered out# to avoid false incremental rebuilds.ifeq ($(INTERIM_JMOD), true) DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS))endif# Create jmods in a temp dir and then move them into place to keep the# module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.$(JMODS_DIR)/$(MODULE).jmod: $(DEPS) $(call LogWarn, Creating $(patsubst $(OUTPUTDIR)/%, %, $@)) $(call MakeDir, $(JMODS_DIR) $(JMODS_TEMPDIR)) $(RM) $@ $(JMODS_TEMPDIR)/$(notdir $@) $(JMOD) create \ --module-version $(VERSION_SHORT) \ --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \ --module-path $(JMODS_DIR) \ --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@) $(MV) $(JMODS_TEMPDIR)/$(notdir $@) $@TARGETS += $(JMODS_DIR)/$(MODULE).jmod################################################################################all: $(TARGETS)################################################################################