< prev index next >

make/copy/Copy-java.base.gmk

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2018, 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

@@ -29,11 +29,11 @@
 
 $(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk))
 
 ################################################################################
 
-ifeq ($(call isTargetOs, aix), true)
+ifeq ($(OPENJDK_TARGET_OS), aix)
 
   TZMAPPINGS_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
 
   $(LIB_DST_DIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
         $(call install-file)

@@ -42,11 +42,11 @@
 
 endif
 
 ################################################################################
 # Copy the microsoft runtime libraries on windows
-ifeq ($(call isTargetOs, windows), true)
+ifeq ($(OPENJDK_TARGET_OS), windows)
 
   # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
   define copy-and-chmod
         $(install-file)
         $(CHMOD) a+rx $@

@@ -79,11 +79,11 @@
 endif
 
 ################################################################################
 # In jvm.cfg, the first listed KNOWN variant is the default. On most build
 # configurations, that is the server variant.
-ifeq ($(call And, $(call isTargetOs, windows) $(call isTargetCpu, x86)), true)
+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86)
   DEFAULT_CFG_VARIANT ?= client
 endif
 DEFAULT_CFG_VARIANT ?= server
 
 # Any variant other than server, client or minimal is represented as server in

@@ -141,11 +141,11 @@
 DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy
 
 DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC)
 DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST)
 
-ifeq ($(call isTargetOs, windows solaris), true)
+ifneq ($(filter $(OPENJDK_TARGET_OS), windows solaris), )
   DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
 endif
 
 # Allow imported modules to modify the java.policy
 ifneq ($(IMPORT_MODULES_CONF), )

@@ -160,32 +160,32 @@
 
 TARGETS += $(DEF_POLICY_DST)
 
 ################################################################################
 
-# CACERTS_FILE is optionally set in configure to override the default cacerts
-# which is otherwise generated in Gendata-java.base.gmk
+ifeq ($(CACERTS_FILE), )
+  CACERTS_FILE := $(TOPDIR)/src/java.base/share/lib/security/cacerts
+endif
+
 CACERTS_DST := $(LIB_DST_DIR)/security/cacerts
 
 $(CACERTS_DST): $(CACERTS_FILE)
         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%, %, $@))
         $(call install-file)
 
-ifneq ($(CACERTS_FILE), )
-  TARGETS += $(CACERTS_DST)
-endif
+TARGETS += $(CACERTS_DST)
 
 ################################################################################
 
 $(eval $(call SetupCopyFiles, COPY_NET_PROPERTIES, \
     FILES := $(TOPDIR)/src/java.base/share/conf/net.properties, \
     DEST := $(CONF_DST_DIR), \
 ))
 
 TARGETS += $(COPY_NET_PROPERTIES)
 
-ifeq ($(call isTargetOs, solaris linux), true)
+ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux), )
   $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
       FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
       DEST := $(CONF_DST_DIR)/sdp, \
   ))
 
< prev index next >