make/copy/Copy-java.desktop.gmk
author hseigel
Thu, 05 Apr 2018 13:19:25 -0400
changeset 49677 a1a7456dd8b9
parent 49234 3375a8039fde
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
#
48300
8a5edac3d5a2 8190484: Move jvm.h, jmm.h et al to hotspot/*/include
ihse
parents: 48032
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
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    27
47314
743814386712 8188814: Simplify IncludeCustomExtension
ihse
parents: 47217
diff changeset
    28
$(eval $(call IncludeCustomExtension, copy/Copy-java.desktop.gmk))
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    29
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    30
################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    31
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    32
$(CONF_DST_DIR)/sound.properties: $(TOPDIR)/src/java.desktop/share/conf/sound.properties
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    33
	$(call install-file)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    34
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 27293
diff changeset
    35
TARGETS += $(CONF_DST_DIR)/sound.properties
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    36
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    37
################################################################################
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    38
#
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25859
diff changeset
    39
# Copy property files from sun/print to LIB_DST_DIR
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    40
#
47217
72e3ae9a25eb 8187444: Forest Consolidation: Make build work
erikj
parents: 47216
diff changeset
    41
PSFONTPROPFILE_SRC_DIR := $(TOPDIR)/src/java.desktop/share/conf
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    42
PSFONTPROPFILE_SRCS := $(wildcard $(PSFONTPROPFILE_SRC_DIR)/psfont*.properties*)
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25859
diff changeset
    43
PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIB_DST_DIR),$(PSFONTPROPFILE_SRCS))
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    44
26191
a0ff4b39d34b 8055188: General cleanup of minor issues from source restructure
erikj
parents: 25859
diff changeset
    45
$(LIB_DST_DIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    46
	$(call install-file)
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    47
27565
729f9700483a 8049367: Modular Run-Time Images
chegar
parents: 27293
diff changeset
    48
TARGETS += $(PSFONTPROPFILE_TARGET_FILES)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    49
3317bb8137f4 8054834: Modular Source Code
chegar
parents:
diff changeset
    50
################################################################################