equal
deleted
inserted
replaced
29 |
29 |
30 $(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk)) |
30 $(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk)) |
31 |
31 |
32 ################################################################################ |
32 ################################################################################ |
33 |
33 |
34 ifeq ($(OPENJDK_TARGET_OS), aix) |
34 ifeq ($(call isTargetOs, aix), true) |
35 |
35 |
36 TZMAPPINGS_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf |
36 TZMAPPINGS_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf |
37 |
37 |
38 $(LIB_DST_DIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings |
38 $(LIB_DST_DIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings |
39 $(call install-file) |
39 $(call install-file) |
42 |
42 |
43 endif |
43 endif |
44 |
44 |
45 ################################################################################ |
45 ################################################################################ |
46 # Copy the microsoft runtime libraries on windows |
46 # Copy the microsoft runtime libraries on windows |
47 ifeq ($(OPENJDK_TARGET_OS), windows) |
47 ifeq ($(call isTargetOs, windows), true) |
48 |
48 |
49 # Chmod to avoid permission issues if bundles are unpacked on unix platforms. |
49 # Chmod to avoid permission issues if bundles are unpacked on unix platforms. |
50 define copy-and-chmod |
50 define copy-and-chmod |
51 $(install-file) |
51 $(install-file) |
52 $(CHMOD) a+rx $@ |
52 $(CHMOD) a+rx $@ |
79 endif |
79 endif |
80 |
80 |
81 ################################################################################ |
81 ################################################################################ |
82 # In jvm.cfg, the first listed KNOWN variant is the default. On most build |
82 # In jvm.cfg, the first listed KNOWN variant is the default. On most build |
83 # configurations, that is the server variant. |
83 # configurations, that is the server variant. |
84 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86) |
84 ifeq ($(call isTargetOs, windows)+$(call isTargetCpu, x86), true+true) |
85 DEFAULT_CFG_VARIANT ?= client |
85 DEFAULT_CFG_VARIANT ?= client |
86 endif |
86 endif |
87 DEFAULT_CFG_VARIANT ?= server |
87 DEFAULT_CFG_VARIANT ?= server |
88 |
88 |
89 # Any variant other than server, client or minimal is represented as server in |
89 # Any variant other than server, client or minimal is represented as server in |
141 DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy |
141 DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy |
142 |
142 |
143 DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC) |
143 DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC) |
144 DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST) |
144 DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST) |
145 |
145 |
146 ifneq ($(filter $(OPENJDK_TARGET_OS), windows solaris), ) |
146 ifeq ($(call isTargetOs, windows solaris), true) |
147 DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy |
147 DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy |
148 endif |
148 endif |
149 |
149 |
150 # Allow imported modules to modify the java.policy |
150 # Allow imported modules to modify the java.policy |
151 ifneq ($(IMPORT_MODULES_CONF), ) |
151 ifneq ($(IMPORT_MODULES_CONF), ) |
181 DEST := $(CONF_DST_DIR), \ |
181 DEST := $(CONF_DST_DIR), \ |
182 )) |
182 )) |
183 |
183 |
184 TARGETS += $(COPY_NET_PROPERTIES) |
184 TARGETS += $(COPY_NET_PROPERTIES) |
185 |
185 |
186 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux), ) |
186 ifeq ($(call isTargetOs, solaris linux), true) |
187 $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \ |
187 $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \ |
188 FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \ |
188 FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \ |
189 DEST := $(CONF_DST_DIR)/sdp, \ |
189 DEST := $(CONF_DST_DIR)/sdp, \ |
190 )) |
190 )) |
191 |
191 |