jdk/make/Images.gmk
author lagergren
Tue, 14 Oct 2014 15:28:24 +0200
changeset 27102 c64b3468d51d
parent 26860 2bd15d21fb0f
child 27190 d3a9a634cc0b
permissions -rw-r--r--
8012518: Reengineer Parser.java to make it play well with the copy-on-write IR. Summary: Remove the kludges introduced to make the parser work with the copy on write IR. Now everything is done bottom up, finshing node children completely before node parents. The repeated non-functional pattern 'node = node.setSomething(something);' is gone. Resulting code is much more readable, and extensible for future work. The parser is now also consistent with the rest of the stateless copy-on-write world in code generation. Reviewed-by: lagergren, attila, hannesw, shade Contributed-by: andreas.gabrielsson@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
22963
a28e6f0b511b 8034191: Move relevant parts of build system to new closed repo
ihse
parents: 22342
diff changeset
     2
# Copyright (c) 2011, 2014, 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
include $(SPEC)
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
include MakeBase.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
include JavaCompilation.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    30
default: images
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    31
23347
acb1d044a217 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 22963
diff changeset
    32
# Prepare the find cache.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    33
$(eval $(call FillCacheFind, \
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    34
    $(wildcard $(JDK_OUTPUTDIR)/bin \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    35
        $(JDK_OUTPUTDIR)/lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    36
        $(IMAGES_OUTPUTDIR)/lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    37
        $(JDK_OUTPUTDIR)/include \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    38
        $(JDK_OUTPUTDIR)/sample \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    39
        $(JDK_OUTPUTDIR)/demo)))
15126
bceb690ccf35 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14596
diff changeset
    40
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    41
include Tools.gmk
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    42
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    43
include Profiles.gmk
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    44
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    45
# Note: This double-colon rule is intentional, to support
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    46
# custom make file integration.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    47
images:: jre-image jdk-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    48
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    49
overlay-images: jre-overlay-image jdk-overlay-image
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    50
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    51
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    52
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    53
# Processing license files from source area to image area
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    54
# These will be modified to have the platform specific EOL chars.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    55
define process-doc-file
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    56
	$(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    57
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    58
	$(RM) $@
15823
9882cddb33b9 8007387: "sed: RE error: illegal byte sequence" when building images on Mac
erikj
parents: 15693
diff changeset
    59
	LC_ALL=C $(SED) 's/$$//g' $< > $@
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    60
	$(CHMOD) 444 $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    61
endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    62
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    63
define AddFileToCopy
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    64
  # Param 1 - src root dir
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    65
  # Param 2 - dest root dir
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    66
  # Param 3 - src file
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    67
  # Param 4 - variable to add targets to
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    68
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    69
  # Remove src dir root from src file
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    70
  $2_$3_FILE := $$(patsubst $1/%,%,$3)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    71
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    72
  $2/$$($2_$3_FILE): $3
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    73
	$(ECHO) $(LOG_INFO) Copying $$(patsubst $(OUTPUT_ROOT)/%,%,$$@)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    74
	$$(install-file)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    75
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    76
  $4 += $2/$$($2_$3_FILE)
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
    77
endef
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    78
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    79
################################################################################
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
# JRE and JDK build rules
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    82
#
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    83
################################################################################
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    84
#
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    85
# Variable prefixes explained:
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
    86
# JRE_ refers to files in the j2re-*-image.
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    87
# JDK_ refers to files in the j2sdk-image outside of the jre subdir.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    88
# JDKJRE_ refers to files in the j2sdk-image inside the jre subdir.
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
    89
#
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    90
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    91
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    92
# /bin dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    93
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    94
ifeq ($(PROFILE), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    95
  NOT_JRE_BIN_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    96
      appletviewer$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    97
      extcheck$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    98
      idlj$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
    99
      jar$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   100
      jarsigner$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   101
      java-rmi.cgi \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   102
      javac$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   103
      javadoc$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   104
      javah$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   105
      javap$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   106
      jdeps$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   107
      jcmd$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   108
      jdb$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   109
      jps$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   110
      jrunscript$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   111
      jstat$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   112
      jstatd$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   113
      jstack$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   114
      packagebean$(SCRIPT_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   115
      rmic$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   116
      serialver$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   117
      unregbean$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   118
      jconsole$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   119
      jinfo$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   120
      jmap$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   121
      native2ascii$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   122
      xjc$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   123
      wsgen$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   124
      wsimport$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   125
      schemagen$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   126
      jsadebugd$(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   127
      jhat$(EXE_SUFFIX)
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   128
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   129
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   130
WINDOWS_JDK_BIN_FILES = \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   131
    $(EXE_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   132
    $(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   133
    $(notdir $(MSVCR_DLL))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   134
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   135
WINDOWS_JDKJRE_BIN_FILES := \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   136
    $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   137
    $(SALIB_NAME)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   138
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   139
# Find all files in bin dir
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   140
ALL_BIN_LIST := $(call CacheFind, $(JDK_OUTPUTDIR)/bin)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   141
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   142
# Prevent sjavac from entering the images.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   143
ALL_BIN_LIST := $(filter-out %/sjavac, $(ALL_BIN_LIST))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   144
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   145
# For unknown reason the debuginfo files for executables are not put into images
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   146
# e.g filter them out
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   147
ifneq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   148
  ALL_BIN_LIST := $(filter-out %.debuginfo %.diz, $(ALL_BIN_LIST))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   149
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   150
  # On windows, the libraries are in the bin dir, only filter out debuginfo files
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   151
  # for executables. "java" is both a library and executable.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   152
  ALL_BIN_EXEC_FILES := $(filter-out java.exe, $(notdir $(filter %.exe, $(ALL_BIN_LIST))))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   153
  ALL_BIN_DEBUG_FILTER := $(addprefix %, $(patsubst %.exe, %.debuginfo, $(ALL_BIN_EXEC_FILES)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   154
      $(patsubst %.exe, %.diz, $(ALL_BIN_EXEC_FILES))) %.pdb
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   155
  ALL_BIN_LIST := $(filter-out $(ALL_BIN_DEBUG_FILTER), $(ALL_BIN_LIST))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   156
endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   157
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   158
JDKJRE_BIN_LIST := $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   159
JRE_BIN_LIST := $(filter-out $(addprefix %, $(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   160
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   161
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   162
  JDK_BIN_LIST := $(filter $(addprefix %, $(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   163
  # On windows x86, the server jvm is filtered out from the j2re image. This could possibly
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   164
  # be handled by profiles in the future. If no client jvm is built, leave server in.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   165
  ifeq ($(OPENJDK_TARGET_CPU), x86)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   166
    ifeq ($(JVM_VARIANT_CLIENT), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   167
      JRE_BIN_LIST := $(filter-out $(JDK_OUTPUTDIR)/bin/server/%, $(JRE_BIN_LIST))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   168
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   169
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   170
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   171
  JDK_BIN_LIST := $(ALL_BIN_LIST)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   172
endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   173
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   174
ifneq ($(OPENJDK_TARGET_CPU_ISADIR), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   175
  OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   176
endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   177
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   178
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   179
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   180
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   181
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   182
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   183
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   184
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   185
$(foreach f,$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   186
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   187
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   188
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   189
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   190
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   191
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   192
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   193
# /lib dir
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   194
ifneq ($(OPENJDK_TARGET_OS), macosx)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   195
  JDKJRE_LIB_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   196
      $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   197
      $(SALIB_NAME)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   198
endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   199
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   200
ifeq ($(PROFILE), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   201
  NOT_JRE_LIB_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   202
      tools.jar \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   203
      jconsole.jar \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   204
      sa-jdi.jar \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   205
      dt.jar \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   206
      ct.sym
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   207
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   208
  ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   209
    NOT_JRE_LIB_FILES += jawt.lib jvm.lib
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   210
  endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   211
endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   212
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   213
JDK_LIB_FILES := $(NOT_JRE_LIB_FILES)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   214
ifeq ($(OPENJDK_TARGET_OS), linux)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   215
  JDK_LIB_FILES += jexec
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   216
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   217
20812
16a6de786164 8012146: Improve tool support
erikj
parents: 17736
diff changeset
   218
ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),) # If Linux or Solaris
16a6de786164 8012146: Improve tool support
erikj
parents: 17736
diff changeset
   219
    JDK_LIB_FILES += $(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
16a6de786164 8012146: Improve tool support
erikj
parents: 17736
diff changeset
   220
		     $(LIBRARY_PREFIX)jawt$(SHARED_LIBRARY_SUFFIX)
16a6de786164 8012146: Improve tool support
erikj
parents: 17736
diff changeset
   221
endif
16a6de786164 8012146: Improve tool support
erikj
parents: 17736
diff changeset
   222
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   223
# Find all files to copy from $(JDK_OUTPUTDIR)/lib
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14231
diff changeset
   224
# Jar files are not expected to be here
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   225
ALL_JDKOUT_LIB_LIST := $(call not-containing,_the., $(filter-out %.jar, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   226
    $(call CacheFind, $(JDK_OUTPUTDIR)/lib)))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   227
# Find all files to copy from $(IMAGES_OUTPUTDIR)/lib
14596
a1f29d55b5ee 8004281: build-infra: Move all jar creation to images target and put jars in images/lib
erikj
parents: 14231
diff changeset
   228
# This is were the jar files are and might not exist if building overlay-images
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   229
ifneq ($(wildcard $(IMAGES_OUTPUTDIR)/lib), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   230
  ALL_IMAGES_LIB_LIST := $(call not-containing,_the., \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   231
      $(call CacheFind, $(IMAGES_OUTPUTDIR)/lib))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   232
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   233
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   234
# Filter files to copy for each destination
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   235
JRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %, $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   236
    $(ALL_JDKOUT_LIB_LIST))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   237
JDKJRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %, $(NOT_JRE_LIB_FILES)), $(ALL_JDKOUT_LIB_LIST))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   238
JDK_JDKOUT_LIB_LIST := $(filter $(addprefix %, $(JDK_LIB_FILES)), $(ALL_JDKOUT_LIB_LIST))
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   239
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   240
JRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %, $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   241
    $(ALL_IMAGES_LIB_LIST))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   242
JDKJRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %, $(NOT_JRE_LIB_FILES)), $(ALL_IMAGES_LIB_LIST))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   243
JDK_IMAGES_LIB_LIST := $(filter $(addprefix %, $(JDK_LIB_FILES)), $(ALL_IMAGES_LIB_LIST))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   244
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   245
# Iterate over files to copy to create rules for each one
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   246
$(foreach f,$(JRE_JDKOUT_LIB_LIST), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   247
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   248
$(foreach f,$(JDK_JDKOUT_LIB_LIST), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   249
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   250
$(foreach f,$(JDKJRE_JDKOUT_LIB_LIST), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   251
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   252
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   253
$(foreach f,$(JRE_IMAGES_LIB_LIST), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   254
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   255
$(foreach f,$(JDK_IMAGES_LIB_LIST), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   256
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   257
$(foreach f,$(JDKJRE_IMAGES_LIB_LIST), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   258
    $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   259
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   260
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_JDKOUT_LIB_LIST)), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   261
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_OVERLAY_LIB_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   262
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_JDKOUT_LIB_LIST)), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   263
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_OVERLAY_LIB_TARGETS)))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   264
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_JDKOUT_LIB_LIST)), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   265
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_OVERLAY_LIB_TARGETS)))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   266
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   267
ifneq ($(PROFILE), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   268
  # Files in lib$(PROFILE) are excluded from the generic copying routines so
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   269
  # we have to add them back in here
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   270
  $(foreach f,$(CUSTOM_PROFILE_JARS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   271
      $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR)/lib$(PROFILE),$(JRE_IMAGE_DIR)/lib,$f,JRE_LIB_TARGETS)))
15885
1729959f3994 8009695: embedded/GP/RI: This intermittent error happens too often, makes the build unstable, and waste machine
erikj
parents: 15823
diff changeset
   272
endif
1729959f3994 8009695: embedded/GP/RI: This intermittent error happens too often, makes the build unstable, and waste machine
erikj
parents: 15823
diff changeset
   273
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   274
# CTE plugin security change require new empty directory lib/applet
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   275
$(JRE_IMAGE_DIR)/lib/applet:
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   276
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   277
	$(MKDIR) -p $@
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   278
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   279
$(JDK_IMAGE_DIR)/jre/lib/applet:
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   280
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   281
	$(MKDIR) -p $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   282
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   283
$(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   284
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
22307
8860c4df071b 8021266: Better life cycle for objects
coleenp
parents: 20812
diff changeset
   285
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   286
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   287
$(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   288
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
22307
8860c4df071b 8021266: Better life cycle for objects
coleenp
parents: 20812
diff changeset
   289
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   290
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   291
$(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   292
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   293
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   294
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   295
$(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JDKJRE_LIB_TARGETS)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   296
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   297
	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   298
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   299
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   300
# /man dir
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   301
#
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   302
# All variables in this section are assigned with simple =, without :, to enable
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   303
# more selective overriding from the custom version of this file.
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   304
#
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   305
# Avoid evaluating this whole section on windows for speed and stability
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   306
ifneq ($(OPENJDK_TARGET_OS), windows)
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   307
  JRE_MAN_PAGES = \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   308
      java.1 \
23601
d15e005afb07 8031300: No jdeps.1 and jjs.1 man pages in jdk8 b122 build and jvisualvm.1 and jcmd.1 missing on macosx
erikj
parents: 23600
diff changeset
   309
      jjs.1 \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   310
      keytool.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   311
      orbd.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   312
      pack200.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   313
      policytool.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   314
      rmid.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   315
      rmiregistry.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   316
      servertool.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   317
      tnameserv.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   318
      unpack200.1
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   319
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   320
  ifndef OPENJDK
20550
f9e9b021bee7 8026500: [infra] remove extraneous docs in solaris images
ksrini
parents: 20547
diff changeset
   321
    ifneq ($(OPENJDK_TARGET_OS), solaris)
f9e9b021bee7 8026500: [infra] remove extraneous docs in solaris images
ksrini
parents: 20547
diff changeset
   322
      JRE_MAN_PAGES += javaws.1
f9e9b021bee7 8026500: [infra] remove extraneous docs in solaris images
ksrini
parents: 20547
diff changeset
   323
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   324
  endif
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   325
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   326
  JDK_MAN_PAGES = \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   327
      $(JRE_MAN_PAGES) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   328
      appletviewer.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   329
      extcheck.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   330
      idlj.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   331
      jar.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   332
      jarsigner.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   333
      javac.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   334
      javadoc.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   335
      javah.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   336
      javap.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   337
      jconsole.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   338
      jcmd.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   339
      jdb.1 \
23601
d15e005afb07 8031300: No jdeps.1 and jjs.1 man pages in jdk8 b122 build and jvisualvm.1 and jcmd.1 missing on macosx
erikj
parents: 23600
diff changeset
   340
      jdeps.1 \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   341
      jhat.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   342
      jinfo.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   343
      jmap.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   344
      jps.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   345
      jrunscript.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   346
      jsadebugd.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   347
      jstack.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   348
      jstat.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   349
      jstatd.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   350
      native2ascii.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   351
      rmic.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   352
      schemagen.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   353
      serialver.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   354
      wsgen.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   355
      wsimport.1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   356
      xjc.1
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   357
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   358
  # This variable is potentially overridden in the closed makefile.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   359
  MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
17049
a7caf0d4cb98 8013552: Add build support for different man pages for OpenJDK and OracleJDK
erikj
parents: 16511
diff changeset
   360
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   361
  ifeq ($(OPENJDK_TARGET_OS), linux)
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   362
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   363
    MAN1_SUBDIR = man
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   364
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   365
  ifeq ($(OPENJDK_TARGET_OS), solaris)
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   366
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/solaris/doc
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   367
    MAN1_SUBDIR = sun/man/man1
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   368
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   369
  ifeq ($(OPENJDK_TARGET_OS), macosx)
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   370
    MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   371
    MAN1_SUBDIR = man
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   372
  endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   373
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   374
  $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   375
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   376
	$(install-file)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   377
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   378
  $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   379
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   380
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   381
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   382
  $(JRE_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   383
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   384
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   385
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   386
  $(JDK_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   387
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   388
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   389
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   390
  define install-ja-manpage
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   391
	$(MKDIR) -p $(@D)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   392
	$(CAT) $< \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   393
	    | $(NATIVE2ASCII) -encoding eucJP \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   394
	    | $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   395
	    | $(NATIVE2ASCII) -reverse -encoding $1 \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   396
	    > $@
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   397
  endef
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   398
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   399
  $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   400
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   401
	$(call install-ja-manpage, UTF-8)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   402
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   403
  $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   404
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   405
	$(call install-ja-manpage, UTF-8)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   406
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   407
  $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   408
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   409
	$(call install-ja-manpage, PCK)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   410
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   411
  $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   412
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   413
	$(call install-ja-manpage, PCK)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   414
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   415
  ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   416
    $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   417
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   418
	$(install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   419
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   420
    $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   421
	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   422
	$(install-file)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   423
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   424
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   425
  ifeq ($(OPENJDK_TARGET_OS), linux)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   426
    $(JRE_IMAGE_DIR)/man/ja:
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   427
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   428
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   429
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   430
    $(JDK_IMAGE_DIR)/man/ja:
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   431
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   432
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   433
  endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   434
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   435
  ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   436
    $(JRE_IMAGE_DIR)/man/ja:
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   437
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   438
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   439
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   440
    $(JDK_IMAGE_DIR)/man/ja:
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   441
	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   442
	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   443
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   444
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   445
  ifeq ($(OPENJDK_TARGET_OS), linux)
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   446
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   447
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   448
        $(JRE_IMAGE_DIR)/man/ja
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   449
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   450
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   451
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
23601
d15e005afb07 8031300: No jdeps.1 and jjs.1 man pages in jdk8 b122 build and jvisualvm.1 and jcmd.1 missing on macosx
erikj
parents: 23600
diff changeset
   452
        $(JDK_IMAGE_DIR)/man/ja
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   453
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   454
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   455
  ifeq ($(OPENJDK_TARGET_OS), solaris)
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   456
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   457
        $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   458
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   459
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   460
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   461
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   462
        $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   463
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   464
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   465
  endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   466
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   467
  ifeq ($(OPENJDK_TARGET_OS), macosx)
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   468
    JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   469
        $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   470
        $(JRE_IMAGE_DIR)/man/ja
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   471
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   472
    JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   473
        $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   474
        $(JDK_IMAGE_DIR)/man/ja
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   475
  endif
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   476
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   477
endif # Windows
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   478
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   479
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   480
# /demo dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   481
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   482
# FIXME: demo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied.
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   483
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   484
# The db demo contains an empty dir that needs to be copied. The other
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   485
# directories will always trigger the rule for recompile since
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   486
# _the.list_of_packages files are touched.
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   487
$(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   488
	if [ ! -d "$@" ]; then \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   489
	  $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   490
	  $(MKDIR) -p $(@D); \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   491
	  if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   492
	fi
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   493
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   494
# Find all files including directories
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   495
JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/demo/%, $(JDK_IMAGE_DIR)/demo/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   496
    $(shell $(FIND) $(JDK_OUTPUTDIR)/demo ! \( -name "_the*" -o -name "javac_state" \) ))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   497
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   498
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   499
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   500
# Param 1 is source file
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   501
define CreateOverlayDemoRule
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   502
  $1_TARGET := $$(subst $(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   503
      $$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   504
  $$($1_TARGET): $1
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   505
	$(ECHO) $(LOG_INFO) Copying '$$(patsubst $(OUTPUT_ROOT)/%,%,$$@)'
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   506
	$$(call install-file)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   507
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   508
  JDK_OVERLAY_DEMO_TARGETS += $$($1_TARGET)
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   509
endef
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   510
JDK_OVERLAY_DEMO_SOURCES := $(filter %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(JDK_OUTPUTDIR)/demo))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   511
$(foreach lib, $(JDK_OVERLAY_DEMO_SOURCES), $(eval $(call CreateOverlayDemoRule, $(lib))))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   512
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   513
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   514
# /sample dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   515
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   516
$(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/sample), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   517
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_SAMPLE_TARGETS)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   518
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   519
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   520
# /db dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   521
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   522
ifndef OPENJDK
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   523
  DB_ZIP_DIR := $(wildcard $(JDK_TOPDIR)/src/closed/db)
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   524
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   525
  $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(DB_ZIP_DIR)/%
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   526
	$(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   527
	$(RM) -r $(JDK_IMAGE_DIR)/db
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   528
	$(MKDIR) -p $(JDK_IMAGE_DIR)/db
17428
5c68e5cbfde0 8013403: Update JDK8 with Java DB 10.10.1.1.
dwanvik
parents: 16511
diff changeset
   529
	cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -q -o $< -x */index.html */KEYS */test/* *javadoc/* */docs/* */demo/* 2> /dev/null
5c68e5cbfde0 8013403: Update JDK8 with Java DB 10.10.1.1.
dwanvik
parents: 16511
diff changeset
   530
	cd $(JDK_IMAGE_DIR)/db && $(MV) db-derby-*-bin/* . && $(RM) -r db-derby-*-bin
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   531
	$(MKDIR) -p $(@D)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   532
	$(TOUCH) $@
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   533
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   534
  $(JDK_IMAGE_DIR)/db/README-JDK.html: $(DB_ZIP_DIR)/README-JDK.html
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   535
	$(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
20544
636a866d26f0 8026144: Missing mkdir in Images.gmk
erikj
parents: 20201
diff changeset
   536
	$(MKDIR) -p $(@D)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   537
	$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(DB_ZIP_DIR)/COPYRIGHTYEAR)/" > $@
17428
5c68e5cbfde0 8013403: Update JDK8 with Java DB 10.10.1.1.
dwanvik
parents: 16511
diff changeset
   538
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   539
  $(JDK_IMAGE_DIR)/db/3RDPARTY: $(DB_ZIP_DIR)/3RDPARTY
17428
5c68e5cbfde0 8013403: Update JDK8 with Java DB 10.10.1.1.
dwanvik
parents: 16511
diff changeset
   540
	$(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
20544
636a866d26f0 8026144: Missing mkdir in Images.gmk
erikj
parents: 20201
diff changeset
   541
	$(MKDIR) -p $(@D)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   542
	$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(DB_ZIP_DIR)/COPYRIGHTYEAR)/" > $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   543
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   544
  JDK_DB_TARGETS := $(patsubst $(DB_ZIP_DIR)/%, $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped, \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   545
      $(wildcard $(DB_ZIP_DIR)/*.zip)) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   546
      $(JDK_IMAGE_DIR)/db/README-JDK.html $(JDK_IMAGE_DIR)/db/3RDPARTY
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   547
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   548
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   549
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   550
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   551
# /include dir
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   552
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   553
$(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/include), \
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   554
    $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_INCLUDE_TARGETS)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   555
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   556
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   557
# doc files
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   558
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   559
ifdef OPENJDK
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   560
  JRE_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   561
  JDK_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   562
  JRE_DOC_LOCATION := $(JDK_TOPDIR)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   563
  JDK_DOC_LOCATION := $(JDK_TOPDIR)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   564
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   565
  JRE_DOC_FILES := COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   566
  JDK_DOC_FILES := COPYRIGHT README.html LICENSE THIRDPARTYLICENSEREADME.txt
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   567
  ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   568
    JRE_DOC_FILES += README.txt
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   569
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   570
    JRE_DOC_FILES += README
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   571
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   572
  JDK_DOC_FILES += demo/DEMOS_LICENSE sample/SAMPLES_LICENSE
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   573
  JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/doc/jre
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 23602
diff changeset
   574
  JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/doc/jdk
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   575
endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   576
JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   577
JDKJRE_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/jre/, $(JRE_DOC_FILES))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   578
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   579
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   580
$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   581
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   582
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   583
$(JDK_IMAGE_DIR)/jre/%: $(JRE_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   584
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   585
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   586
$(JRE_IMAGE_DIR)/README.txt: $(JRE_DOC_LOCATION)/README
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   587
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   588
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   589
$(JDK_IMAGE_DIR)/jre/README.txt: $(JRE_DOC_LOCATION)/README
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   590
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   591
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   592
$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   593
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   594
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   595
$(JDK_IMAGE_DIR)/demo/%: $(JDK_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   596
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   597
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   598
$(JDK_IMAGE_DIR)/sample/%: $(JDK_DOC_LOCATION)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   599
	$(process-doc-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   600
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   601
JRE_INFO_FILE := $(JRE_IMAGE_DIR)/release
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   602
JDK_INFO_FILE := $(JDK_IMAGE_DIR)/release
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   603
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   604
JRE_OVERLAY_INFO_FILE := $(JRE_OVERLAY_IMAGE_DIR)/release
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   605
JDK_OVERLAY_INFO_FILE := $(JDK_OVERLAY_IMAGE_DIR)/release
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   606
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   607
# Common way to emit a line into the release or info file
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   608
define info-file-item # name value
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   609
	$(PRINTF) '%s="%s"\n' $1 $2 >> $@
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   610
endef
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   611
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   612
define create-info-file
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   613
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   614
	$(RM) $@
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   615
	$(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)")
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   616
	$(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   617
	$(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   618
	$(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)")
16041
b9d38accf302 8005545: Add System property to identify ARCH specific details such as ARM hard-float binaries
vladidan
parents: 15693
diff changeset
   619
	if [ -n "$(JDK_ARCH_ABI_PROP_NAME)" ]; then $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"); fi
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   620
	$(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)")
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   621
endef
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   622
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   623
ALL_SOURCE_TIPS = $(shell \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   624
    if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   625
      $(CAT) $(OUTPUT_ROOT)/source_tips ; \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   626
    fi)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   627
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   628
$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   629
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   630
	$(call create-info-file)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   631
        ifneq ($(PROFILE), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   632
	  $(call info-file-item, "JAVA_PROFILE", "$(call profile_name, $(call profile_number, $(PROFILE)))")
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   633
        endif
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   634
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   635
$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   636
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   637
	$(call create-info-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   638
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   639
$(JRE_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   640
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   641
	$(call create-info-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   642
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   643
$(JDK_OVERLAY_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   644
	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   645
	$(call create-info-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   646
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   647
$(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   648
	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   649
	$(install-file)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   650
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   651
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   652
# Post processing (strip etc)
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   653
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   654
ifneq ($(POST_STRIP_CMD), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   655
  ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   656
    EXEC_LIST_BIN := $(filter-out %$(notdir $(MSVCR_DLL)), $(filter %.exe %.dll, $(ALL_BIN_LIST)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   657
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   658
    # Find all executables in JDK_OUTPUTDIR since they exist when this makefile is parsed
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   659
    EXEC_LIST_BIN := $(shell $(FILE) `$(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*$(EXE_SUFFIX) ! -name \*.debuginfo` \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   660
        | $(EGREP) 'ELF' | $(CUT) -d':' -f1)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   661
    # On mac, the old build searches for static libraries for stripping instead of shared.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   662
    # Not clear if it's intentional.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   663
    ifneq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   664
      EXEC_LIST_LIB := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f -name \*$(SHARED_LIBRARY_SUFFIX))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   665
    endif
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   666
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   667
  # Filter out sjavac
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   668
  EXEC_LIST_BIN := $(filter-out %sjavac$(EXE_SUFFIX), $(EXEC_LIST_BIN))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   669
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   670
  # Filter out the overlay specific bin files
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   671
  EXEC_LIST := $(filter-out $(OVERLAY_FILTER), $(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   672
  EXEC_LIST_OVERLAY := $(filter $(OVERLAY_FILTER), $(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   673
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   674
  # Filter out non JRE files and convert to unique touch files to depend on
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   675
  JRE_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   676
      $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   677
      $(EXEC_LIST)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   678
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   679
  JDKJRE_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   680
      $(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   681
      $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST)))
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   682
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   683
  JDK_BIN_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   684
      $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   685
      $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   686
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   687
  # Do the same for overlay image
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   688
  JRE_OVERLAY_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   689
      $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   690
      $(EXEC_LIST_OVERLAY)))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   691
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   692
  JDKJRE_OVERLAY_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   693
      $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/jre/%.stripped, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   694
      $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST_OVERLAY)))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   695
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   696
  JDK_OVERLAY_BIN_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   697
      $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   698
      $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST_OVERLAY)))
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   699
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   700
  define mcs-file
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   701
	$(if $(POST_MCS_CMD), $(POST_MCS_CMD) $<)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   702
  endef
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   703
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   704
  define strip-file
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   705
	$(ECHO) Stripping $(LOG_INFO) $(patsubst $(OUTPUT_ROOT)/%,%,$<)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   706
	$(CHMOD) u+w $<
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   707
	$(POST_STRIP_CMD) $<
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   708
	$(call mcs-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   709
	$(CHMOD) go-w $<
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   710
	$(MKDIR) -p $(@D)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   711
	$(TOUCH) $@
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   712
  endef
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   713
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   714
  # Setup a rule for stripping files based on touch files
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   715
  $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped: $(JRE_IMAGE_DIR)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   716
	$(call strip-file)
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   717
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   718
  $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   719
	$(call strip-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   720
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   721
  $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped: $(JRE_OVERLAY_IMAGE_DIR)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   722
	$(call strip-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   723
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   724
  $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped: $(JDK_OVERLAY_IMAGE_DIR)/%
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   725
	$(call strip-file)
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   726
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   727
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   728
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   729
################################################################################
23602
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   730
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   731
# Include the custom makefile right here, after all variables have been defined
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   732
# so that they may be overridden, but before the main targets are declared, so 
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   733
# that overriding has an effect.
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   734
$(eval $(call IncludeCustomExtension, jdk, Images.gmk))
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   735
ff671719d44a 8032217: failure in man page processing
erikj
parents: 23601
diff changeset
   736
################################################################################
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   737
# Main targets
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   738
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   739
jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   740
    $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   741
    $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   742
    $(JRE_BIN_ISADIR_LINK_TARGETS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   743
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   744
jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   745
    $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   746
    $(JDK_IMAGE_DIR)/jre/lib/applet \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   747
    $(JDK_DEMO_TARGETS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   748
    $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   749
    $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   750
    $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   751
    $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   752
    $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   753
    $(JDK_IMAGE_DIR)/src.zip \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   754
    $(JDK_BIN_ISADIR_LINK_TARGETS) $(JDKJRE_BIN_ISADIR_LINK_TARGETS)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   755
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   756
jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   757
    $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   758
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   759
jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   760
    $(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   761
    $(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   762
    $(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST)
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13497
diff changeset
   763
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   764
ifneq ($(PROFILE), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   765
  PROFILE_IMAGE_JARS := $(filter %.jar, $(JRE_LIB_TARGETS))
15693
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   766
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   767
  PROFILE_IMAGE_JARS_CHECKED := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_jars_checked
15693
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   768
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   769
  $(PROFILE_IMAGE_JARS_CHECKED) : $(PROFILE_IMAGE_JARS)
15693
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   770
	$(TOOL_CHECKDEPS) $(JRE_IMAGE_DIR) \
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   771
	    $(call profile_name, $(call profile_number, $(PROFILE)))
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   772
	$(TOUCH) $@
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   773
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   774
  profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   775
	$(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
15693
ba31a578f948 8007097: (profiles) Build needs test to ensure that profile definitions are updated
alanb
parents: 15681
diff changeset
   776
	$(JRE_INFO_FILE) $(JRE_STRIP_LIST) $(PROFILE_IMAGE_JARS_CHECKED)
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   777
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20544
diff changeset
   778
  .PHONY: profile-image
15681
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   779
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   780
endif # Profile
8ca785029fe2 8004265: Add build support for Compact Profiles
dholmes
parents: 15140
diff changeset
   781
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   782
################################################################################
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   783
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
   784
.PHONY: default images jre-image jdk-image