jdk/make/CopyIntoClasses.gmk
author pchelko
Wed, 23 Apr 2014 17:56:05 +0400
changeset 24529 c580bcb3aabc
parent 23886 6cb6ad1e208f
child 24556 848deff023c7
permissions -rw-r--r--
8027148: SystemFlavorMap.getNativesForFlavor returns list of native formats in incorrect order Reviewed-by: anthony, serb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
23010
6dadb192ad81 8029235: Update copyright year to match last edit in jdk8 jdk repository for 2013
lana
parents: 21805
diff changeset
     2
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    26
# Copy icu and _dict files used by the text break iterator
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
23236
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    28
COPY_PATTERNS := .icu _dict .dat _options .js aliasmap .spp .wav .css \
23886
6cb6ad1e208f 8039362: Read content-types.properties as a resource
chegar
parents: 23236
diff changeset
    29
    .png .gif .xml .dtd .txt oqlhelp.html content-types.properties
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
23236
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    31
# These directories should not be copied at all
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    32
EXCLUDES += \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    33
    com/sun/org/apache/xml/internal/security/resource/schema \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    34
    java/awt/doc-files \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    35
    java/lang/doc-files \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    36
    javax/swing/doc-files \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    37
    javax/swing/text/doc-files \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    38
    javax/swing/plaf/synth/doc-files \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    39
    javax/swing/undo/doc-files \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    40
    sun/awt/X11/doc-files \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    41
    sun/util/cldr/resources \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    42
    #
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
23236
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    44
# These files should never be included
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    45
EXFILES += build.xml README.txt version.txt
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    46
23236
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    47
# These icons are handled in GensrcIcons.gmk
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    48
EXFILES += \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    49
    sun/awt/X11/java-icon16.png \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    50
    sun/awt/X11/java-icon24.png \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    51
    sun/awt/X11/java-icon32.png \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    52
    sun/awt/X11/java-icon48.png \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    53
    $(wildcard $(JDK_TOPDIR)/src/share/classes/sun/awt/resources/*.png) \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    54
    #
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    55
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    56
ifndef OPENJDK
23236
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    57
  # Theses icons have closed replacements
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    58
  SWING_PLAF_MOTIF_RESOURCES_DIR := $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    59
  EXFILES += \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    60
      $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    61
      $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    62
      $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    63
      $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png) \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    64
      #
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    65
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    66
  EXFILES += mib_core.txt
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    67
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    68
20892
e8eeec1da3d9 8019540: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated.
erikj
parents: 20547
diff changeset
    69
ifeq ($(ENABLE_JFR), true)
23236
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    70
  JFR_CONFIGURATION_DIR_CLOSED := $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
18030
2d12a524f3cc 8005008: Add Java Flight Recorder Phase II
sla
parents: 17460
diff changeset
    71
  COPY_FILES += \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
    72
      $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
18030
2d12a524f3cc 8005008: Add Java Flight Recorder Phase II
sla
parents: 17460
diff changeset
    73
endif
2d12a524f3cc 8005008: Add Java Flight Recorder Phase II
sla
parents: 17460
diff changeset
    74
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 20892
diff changeset
    75
SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/data/swingbeaninfo/images
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    76
SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
    77
OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
    78
    $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
    79
    $(SWING_BEANINFO_RESOURCES_SRC))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    80
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    81
COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    82
23236
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    83
# The exception handling of swing beaninfo
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    84
# These resources violates the convention of having code and resources together under
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    85
# $(JDK_TOPDIR)/src/.../classes directories
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    86
$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    87
    $(JDK_TOPDIR)/make/data/swingbeaninfo/images/%.gif
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
    88
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    89
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    90
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    91
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    92
# Copy the META-INF/services configuration files that are scattered around the source tree
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    93
# into classes/META-INF/services. Be aware that META-INF directories that are located at a
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    94
# source root (.../classes/META-INF) are automatically copied verbatim by the
18030
2d12a524f3cc 8005008: Add Java Flight Recorder Phase II
sla
parents: 17460
diff changeset
    95
# SetupJavaCompilation macro.
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    96
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    97
# Any other META-INF/services configuration file is found here and platform specific comments
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    98
# are uncommented and the configuration file is stored in the output META-INF directory.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    99
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   100
# Make sure the output directory is created.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   101
$(eval $(call MakeDir, $(JDK_OUTPUTDIR)/classes/META-INF/services))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   102
# Find all META-INF/services/* files
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   103
ALL_META-INF_DIRS_share := $(shell $(FIND) $(JDK_TOPDIR)/src/share/classes -type d -a -name META-INF)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   104
ALL_META-INF_DIRS_targetapi := $(shell $(FIND) $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes -type d -a -name META-INF)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   105
# Platform specific overrides shared
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   106
ifneq ($(ALL_META-INF_DIRS_targetapi), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   107
  ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_targetapi) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   108
      $(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes%,%,$(ALL_META-INF_DIRS_targetapi)), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   109
      $(ALL_META-INF_DIRS_share))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   110
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   111
  ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   112
endif
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   113
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   114
ifndef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   115
  ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   116
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   117
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   118
SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   119
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   120
ifdef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   121
  SRC_SERVICES_FILES := $(filter-out %sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   122
  SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   123
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   124
  SRC_SERVICES_FILES := $(filter-out %sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine, $(SRC_SERVICES_FILES))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   125
  SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   126
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   127
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   128
# The number of services files are relatively few. If the increase in numbers, then
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   129
# we have to use ListPathsSafelyNow here.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   130
# Change $(JDK_TOPDIR)/src/.../META-INF/services/yyyy into $(JDK_OUTPUTDIR)/classes/META-INF/services/yyyy
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   131
# The \n in the printf command is needed to make sed work on Solaris.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   132
OUT_SERVICES_FILES := $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   133
    $(shell $(PRINTF) "$(SRC_SERVICES_FILES)\n" | $(SED) -e 's|/[^ ]*/META-INF/services/||g'))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   134
OUT_SERVICES_FILES_COLON := $(addsuffix :, $(OUT_SERVICES_FILES))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   135
# Exception handling for print services with no META-INF directory
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   136
SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/*)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   137
OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   138
    $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%, %, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   139
    $(SRC_SERVICES_FILES_PRINT)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   140
OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :, $(OUT_SERVICES_FILES_PRINT))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   141
RULES_SERVICES_PRINT = $(join $(OUT_SERVICES_FILES_PRINT_COLON), $(SRC_SERVICES_FILES_PRINT))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   142
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   143
# Now setup the dependency rules to generate a META-INF/services/... from the correct source.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   144
META-INF_RULES_SERVICES := $(RULES_SERVICES_PRINT) $(join $(OUT_SERVICES_FILES_COLON), $(SRC_SERVICES_FILES))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   145
# Eval the newly created rules to incorporate them into the make tree.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   146
define addto_meta-inf_services
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   147
  $1
18030
2d12a524f3cc 8005008: Add Java Flight Recorder Phase II
sla
parents: 17460
diff changeset
   148
	echo $(LOG_INFO) Installing META-INF/services/$$(@F)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   149
	$(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   150
endef
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   151
$(foreach i, $(META-INF_RULES_SERVICES), $(eval $(call addto_meta-inf_services, $i)))
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   152
# Here is the generic rule, whose receipt the above rules will trigger.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   153
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   154
COPY_EXTRA += $(OUT_SERVICES_FILES)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   155
COPY_EXTRA += $(OUT_SERVICES_FILES_PRINT)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   156
23236
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   157
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   158
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   159
JAVAX_SOUND_SRC := $(JDK_TOPDIR)/src/share/classes/com/sun/media/sound/services
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   160
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   161
JAVAX_SOUND_SRC_FILES := \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   162
    javax.sound.midi.spi.MidiDeviceProvider \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   163
    javax.sound.midi.spi.MidiFileReader \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   164
    javax.sound.midi.spi.MidiFileWriter \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   165
    javax.sound.midi.spi.SoundbankReader \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   166
    javax.sound.sampled.spi.AudioFileReader \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   167
    javax.sound.sampled.spi.AudioFileWriter \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   168
    javax.sound.sampled.spi.FormatConversionProvider \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   169
    javax.sound.sampled.spi.MixerProvider
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   170
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   171
COPY_EXTRA += $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, $(JAVAX_SOUND_SRC_FILES))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   172
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   173
JAVAX_SOUND_RULES := $(foreach F, $(JAVAX_SOUND_SRC_FILES), $(JDK_OUTPUTDIR)/classes/META-INF/services/$(notdir $F):$(JAVAX_SOUND_SRC)/$F)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   174
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 18030
diff changeset
   175
$(foreach R, $(JAVAX_SOUND_RULES), $(eval $(call addto_meta-inf_services, $R)))
23236
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   176
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   177
################################################################################
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   178
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   179
CLEAN_FILES := $(wildcard \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   180
    $(JDK_TOPDIR)/src/share/classes/com/sun/imageio/plugins/common/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   181
    $(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   182
    $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   183
    $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   184
    $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   185
    $(JDK_TOPDIR)/src/share/classes/com/sun/rowset/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   186
    $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   187
    $(JDK_TOPDIR)/src/share/classes/javax/sql/rowset/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   188
    $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   189
    $(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   190
    $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   191
    $(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   192
    $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   193
    $(JDK_TOPDIR)/src/share/classes/sun/tools/serialver/resources/*.properties \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   194
    )
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   195
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   196
# Copy zh_HK files from zh_TW
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   197
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   198
$(JDK_OUTPUTDIR)/classes/%_zh_HK.properties: $(JDK_OUTPUTDIR)/classes/%_zh_TW.properties
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   199
	$(install-file)
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   200
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   201
COPY_EXTRA += $(patsubst $(JDK_TOPDIR)/src/share/classes/%, $(JDK_OUTPUTDIR)/classes/%, \
7c5997f59e20 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 23010
diff changeset
   202
    $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $(CLEAN_FILES))))