make/copy/Copy-java.base.gmk
author hseigel
Thu, 05 Apr 2018 13:19:25 -0400
changeset 49677 a1a7456dd8b9
parent 48355 4944950606ef
child 49537 149dc554808c
permissions -rw-r--r--
8200261: Regression with JVM anonymous class Summary: Restore resolved anonymous class when creating a new constantpool because of overpass methods Reviewed-by: coleenp, lfoltan
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     1
#
44117
7108a2c20885 8170884: Clean up post-jlink file copying to the images
ihse
parents: 42759
diff changeset
     2
# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     4
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    10
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    15
# accompanied this code).
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    16
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    20
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    23
# questions.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    24
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    25
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    26
include CopyCommon.gmk
48355
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
    27
include TextFileProcessing.gmk
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    28
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47253
diff changeset
    29
$(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk))
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    30
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    31
################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    32
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    33
ifneq ($(findstring $(OPENJDK_TARGET_OS), windows aix),)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    34
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    35
  TZMAPPINGS_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    36
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25859
diff changeset
    37
  $(LIB_DST_DIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    38
	$(call install-file)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    39
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 27286
diff changeset
    40
  TARGETS += $(LIB_DST_DIR)/tzmappings
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    41
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    42
endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    43
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    44
################################################################################
28984
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    45
# Copy the microsoft runtime libraries on windows
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    46
ifeq ($(OPENJDK_TARGET_OS), windows)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    47
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    48
  # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
28984
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    49
  define copy-and-chmod
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    50
	$(install-file)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    51
	$(CHMOD) a+rx $@
28984
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    52
  endef
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 27286
diff changeset
    53
28984
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    54
  # Use separate macro calls in case the source files are not in the same
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    55
  # directory.
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    56
  $(eval $(call SetupCopyFiles,COPY_MSVCR, \
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    57
      DEST := $(LIB_DST_DIR), \
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    58
      FILES := $(MSVCR_DLL), \
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    59
      MACRO := copy-and-chmod))
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    60
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    61
  $(eval $(call SetupCopyFiles,COPY_MSVCP, \
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    62
      DEST := $(LIB_DST_DIR), \
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    63
      FILES := $(MSVCP_DLL), \
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    64
      MACRO := copy-and-chmod))
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    65
12031ba2dc38 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27799
diff changeset
    66
  TARGETS += $(COPY_MSVCR) $(COPY_MSVCP)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    67
endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    68
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    69
################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    70
#
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    71
# How to install jvm.cfg.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    72
#
47687
fb290fd1f9d4 8171853: Remove Shark compiler
rkennke
parents: 47355
diff changeset
    73
ifeq ($(call check-jvm-variant, zero), true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    74
  JVMCFG_ARCH := zero
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    75
else
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    76
  JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    77
endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    78
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    79
ifeq ($(OPENJDK_TARGET_OS), macosx)
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    80
  JVMCFG_SRC := $(TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    81
else
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    82
  JVMCFG_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
29718
d0e9a4ece867 8072740: move closed jvm.cfg files out of open repo
dholmes
parents: 28984
diff changeset
    83
  # Allow override by ALT_JVMCFG_SRC if it exists
37525
4f8679a3077d 8152666: The new Hotspot Build System
erikj
parents: 36511
diff changeset
    84
  JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    85
endif
42753
40f61533b93d 8066474: Remove the lib/ directory from Linux and Solaris images
erikj
parents: 41833
diff changeset
    86
JVMCFG := $(LIB_DST_DIR)/jvm.cfg
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    87
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    88
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    89
  COPY_JVM_CFG_FILE := true
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    90
else
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    91
  # On 32-bit machines we have three potential VMs: client, server and minimal.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    92
  # Historically we usually have both client and server and so that is what the
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    93
  # committed jvm.cfg expects (including platform specific ergonomics switches
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    94
  # to decide whether to use client or server by default). So when we have anything
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    95
  # other than client and server we need to define a new jvm.cfg file.
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    96
  # The main problem is deciding whether to use aliases for the VMs that are not
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    97
  # present and the current position is that we add aliases for client and server, but
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    98
  # not for minimal.
37525
4f8679a3077d 8152666: The new Hotspot Build System
erikj
parents: 36511
diff changeset
    99
  CLIENT_AND_SERVER := $(call check-jvm-variant, client)+$(call check-jvm-variant, server)
4f8679a3077d 8152666: The new Hotspot Build System
erikj
parents: 36511
diff changeset
   100
  ifeq ($(CLIENT_AND_SERVER), true+true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   101
    COPY_JVM_CFG_FILE := true
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   102
  else
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   103
    # For zero, the default jvm.cfg file is sufficient
47687
fb290fd1f9d4 8171853: Remove Shark compiler
rkennke
parents: 47355
diff changeset
   104
    ifeq ($(call check-jvm-variant, zero), true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   105
      COPY_JVM_CFG_FILE := true
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   106
    endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   107
  endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   108
endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   109
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   110
ifeq ($(COPY_JVM_CFG_FILE), true)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   111
  $(JVMCFG): $(JVMCFG_SRC)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   112
	$(call install-file)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   113
else
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   114
  $(JVMCFG):
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   115
	$(MKDIR) -p $(@D)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   116
	$(RM) $(@)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   117
        # Now check for other permutations
37525
4f8679a3077d 8152666: The new Hotspot Build System
erikj
parents: 36511
diff changeset
   118
        ifeq ($(call check-jvm-variant, server), true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   119
	  $(PRINTF) "-server KNOWN\n">>$(@)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   120
	  $(PRINTF) "-client ALIASED_TO -server\n">>$(@)
37525
4f8679a3077d 8152666: The new Hotspot Build System
erikj
parents: 36511
diff changeset
   121
          ifeq ($(call check-jvm-variant, minimal), true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   122
	    $(PRINTF) "-minimal KNOWN\n">>$(@)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   123
          endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   124
        else
37525
4f8679a3077d 8152666: The new Hotspot Build System
erikj
parents: 36511
diff changeset
   125
          ifeq ($(call check-jvm-variant, client), true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   126
	    $(PRINTF) "-client KNOWN\n">>$(@)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   127
	    $(PRINTF) "-server ALIASED_TO -client\n">>$(@)
37525
4f8679a3077d 8152666: The new Hotspot Build System
erikj
parents: 36511
diff changeset
   128
            ifeq ($(call check-jvm-variant, minimal), true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   129
	      $(PRINTF) "-minimal KNOWN\n">>$(@)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   130
            endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   131
          else
37525
4f8679a3077d 8152666: The new Hotspot Build System
erikj
parents: 36511
diff changeset
   132
            ifeq ($(call check-jvm-variant, minimal), true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   133
	      $(PRINTF) "-minimal KNOWN\n">>$(@)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   134
	      $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   135
	      $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   136
            endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   137
          endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   138
        endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   139
endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   140
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 27286
diff changeset
   141
TARGETS += $(JVMCFG)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   142
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   143
################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   144
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   145
POLICY_SRC := $(TOPDIR)/src/java.base/share/conf/security/java.policy
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 27286
diff changeset
   146
POLICY_DST := $(CONF_DST_DIR)/security/java.policy
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   147
39884
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   148
POLICY_SRC_LIST := $(POLICY_SRC)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   149
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   150
$(POLICY_DST): $(POLICY_SRC_LIST)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   151
	$(MKDIR) -p $(@D)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   152
	$(RM) $@ $@.tmp
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   153
	$(foreach f,$(POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   154
	$(MV) $@.tmp $@
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   155
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 27286
diff changeset
   156
TARGETS += $(POLICY_DST)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   157
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   158
################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   159
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   160
DEF_POLICY_SRC := $(TOPDIR)/src/java.base/share/lib/security/default.policy
39884
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   161
DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   162
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   163
DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC)
42230
8b75662a3762 8170242: jdk.desktop needs package access to sun.awt.
prr
parents: 41833
diff changeset
   164
DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST)
39884
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   165
40401
47a0de15f8b6 8164071: Default.policy file missing content for solaris
mullan
parents: 40253
diff changeset
   166
ifneq ($(filter $(OPENJDK_TARGET_OS), windows solaris), )
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   167
  DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
39884
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   168
endif
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   169
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   170
# Allow imported modules to modify the java.policy
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   171
ifneq ($(IMPORT_MODULES_CONF), )
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   172
  DEF_POLICY_SRC_LIST += $(wildcard $(IMPORT_MODULES_CONF)/java.base/security/java.policy.extra)
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   173
endif
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   174
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   175
$(DEF_POLICY_DST): $(DEF_POLICY_SRC_LIST)
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   176
	$(MKDIR) -p $(@D)
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   177
	$(RM) $@ $@.tmp
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   178
	$(foreach f,$(DEF_POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;)
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   179
	$(MV) $@.tmp $@
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   180
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   181
TARGETS += $(DEF_POLICY_DST)
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   182
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   183
################################################################################
9a543219d0bb 8159752: Grant de-privileged module permissions by default with java.security.policy override option
mullan
parents: 37525
diff changeset
   184
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   185
ifeq ($(CACERTS_FILE), )
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   186
  CACERTS_FILE := $(TOPDIR)/src/java.base/share/lib/security/cacerts
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   187
endif
35241
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 29887
diff changeset
   188
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 27286
diff changeset
   189
CACERTS_DST := $(LIB_DST_DIR)/security/cacerts
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   190
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   191
$(CACERTS_DST): $(CACERTS_FILE)
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47217
diff changeset
   192
	$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%, %, $@))
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   193
	$(call install-file)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   194
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 27286
diff changeset
   195
TARGETS += $(CACERTS_DST)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   196
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   197
################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   198
35241
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 29887
diff changeset
   199
$(eval $(call SetupCopyFiles, COPY_NET_PROPERTIES, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   200
    FILES := $(TOPDIR)/src/java.base/share/conf/net.properties, \
35241
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 29887
diff changeset
   201
    DEST := $(CONF_DST_DIR), \
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 29887
diff changeset
   202
))
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   203
35241
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 29887
diff changeset
   204
TARGETS += $(COPY_NET_PROPERTIES)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   205
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   206
ifeq ($(OPENJDK_TARGET_OS), solaris)
35241
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 29887
diff changeset
   207
  $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
   208
      FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
35241
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 29887
diff changeset
   209
      DEST := $(CONF_DST_DIR)/sdp, \
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 29887
diff changeset
   210
  ))
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   211
35241
075bbb8f2423 8146403: Windows build can be faster
erikj
parents: 29887
diff changeset
   212
  TARGETS += $(COPY_SDP_CONF)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   213
endif
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   214
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
   215
################################################################################
42670
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   216
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   217
# JDK license and assembly exception files to be packaged in JMOD
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   218
44264
8ff59e9e832c 8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION
erikj
parents: 44117
diff changeset
   219
# The license files may not be present if the source has been obtained using a
8ff59e9e832c 8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION
erikj
parents: 44117
diff changeset
   220
# different license.
8ff59e9e832c 8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION
erikj
parents: 44117
diff changeset
   221
JDK_LICENSE ?= $(wildcard $(TOPDIR)/LICENSE)
8ff59e9e832c 8176849: jdk9 BCL builds fail after cleaning up temporary file ASSEMBLY_EXCEPTION
erikj
parents: 44117
diff changeset
   222
JDK_NOTICE  ?= $(wildcard $(TOPDIR)/ASSEMBLY_EXCEPTION)
48338
a3c7d963c952 8193208: Add additional licensing file for the JDK
erikj
parents: 48300
diff changeset
   223
JDK_ADDITIONAL_LICENSE_INFO  ?= $(wildcard $(TOPDIR)/ADDITIONAL_LICENSE_INFO)
42670
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   224
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   225
$(eval $(call SetupCopyFiles, COPY_JDK_NOTICES, \
48338
a3c7d963c952 8193208: Add additional licensing file for the JDK
erikj
parents: 48300
diff changeset
   226
    FILES := $(JDK_LICENSE) $(JDK_NOTICE) $(JDK_ADDITIONAL_LICENSE_INFO), \
42670
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   227
    DEST := $(LEGAL_DST_DIR), \
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   228
    FLATTEN := true, \
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   229
))
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   230
d833113eb7d7 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42230
diff changeset
   231
TARGETS += $(COPY_JDK_NOTICES)
47355
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   232
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   233
################################################################################
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   234
# Optionally copy libffi.so.? into the the image
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   235
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   236
ifeq ($(ENABLE_LIBFFI_BUNDLING), true)
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   237
  $(eval $(call SetupCopyFiles, COPY_LIBFFI, \
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   238
      FILES := $(LIBFFI_LIB_FILE), \
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   239
      DEST := $(call FindLibDirForModule, $(MODULE)), \
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   240
      FLATTEN := true, \
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   241
      MACRO := install-file-nolink, \
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   242
  ))
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   243
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   244
  TARGETS += $(COPY_LIBFFI)
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   245
endif
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   246
8cf060fad8a8 8189430: make/hotspot/copy/Copy-java.base.gmk in wrong location after consolidation
erikj
parents: 47314
diff changeset
   247
################################################################################
48355
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   248
# Generate classfile_constants.h
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   249
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   250
$(eval $(call SetupTextFileProcessing, CREATE_CLASSFILE_CONSTANTS_H, \
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   251
    SOURCE_FILES := $(TOPDIR)/src/java.base/share/native/include/classfile_constants.h.template, \
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   252
    OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/modules_include/java.base/classfile_constants.h, \
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   253
    REPLACEMENTS := \
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   254
        @@VERSION_CLASSFILE_MAJOR@@ => $(VERSION_CLASSFILE_MAJOR) ; \
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   255
        @@VERSION_CLASSFILE_MINOR@@ => $(VERSION_CLASSFILE_MINOR) ; , \
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   256
))
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   257
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   258
TARGETS += $(CREATE_CLASSFILE_CONSTANTS_H)
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   259
4944950606ef 8191913: Bump classfile version number to 55
psandoz
parents: 48338
diff changeset
   260
################################################################################