author | eosterlund |
Wed, 14 Jun 2017 01:30:11 -0700 | |
changeset 46539 | c23c825bcfc2 |
parent 42136 | f872c8278074 |
child 47253 | 92fd0e04e0e1 |
permissions | -rw-r--r-- |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
2 |
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
4 |
# |
6ec26f6cc53e
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 |
6ec26f6cc53e
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 |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
10 |
# |
6ec26f6cc53e
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 |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
6ec26f6cc53e
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 |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
15 |
# accompanied this code). |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
16 |
# |
6ec26f6cc53e
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 |
6ec26f6cc53e
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, |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
20 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
6ec26f6cc53e
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 |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
23 |
# questions. |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
24 |
# |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
25 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
26 |
ifndef _ZIP_ARCHIVE_GMK |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
27 |
_ZIP_ARCHIVE_GMK := 1 |
25854 | 28 |
|
20363 | 29 |
ifeq (,$(_MAKEBASE_GMK)) |
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
30 |
$(error You must include MakeBase.gmk prior to including ZipArchive.gmk) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
31 |
endif |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
32 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
33 |
# Setup make rules for creating a zip archive. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
34 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
35 |
# Parameter 1 is the name of the rule. This name is used as variable prefix, |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
36 |
# and the targets generated are listed in a variable by that name. |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
37 |
# |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
38 |
# Remaining parameters are named arguments. These include: |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
39 |
# SRC |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
40 |
# ZIP |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
41 |
# INCLUDES |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
42 |
# INCLUDE_FILES |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
43 |
# EXCLUDES |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
44 |
# EXCLUDE_FILES |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
45 |
# SUFFIXES |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
46 |
# EXTRA_DEPS |
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
47 |
# ZIP_OPTIONS extra options to pass to zip |
29312
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
27602
diff
changeset
|
48 |
SetupZipArchive = $(NamedParamsMacroTemplate) |
f3f859137ce6
8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents:
27602
diff
changeset
|
49 |
define SetupZipArchiveBody |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
50 |
|
20363 | 51 |
# To avoid running find over too large sets of files, which causes make to crash |
52 |
# on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set |
|
53 |
# of directories to run find in, if available. |
|
54 |
ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),) |
|
55 |
$1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \ |
|
56 |
$$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES)))) |
|
57 |
else |
|
58 |
$1_FIND_LIST := $$($1_SRC) |
|
59 |
endif |
|
18422 | 60 |
|
20363 | 61 |
# Find all files in the source tree. |
20645
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
62 |
$1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST))) |
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
63 |
|
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
64 |
# Filter on suffixes if set |
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
65 |
ifneq ($$($1_SUFFIXES),) |
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
66 |
$1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS)) |
6170a286f879
8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents:
20364
diff
changeset
|
67 |
endif |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
68 |
|
20363 | 69 |
ifneq ($$($1_INCLUDES),) |
70 |
ifneq ($$($1_SUFFIXES),) |
|
71 |
$1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \ |
|
72 |
$$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES)))) |
|
73 |
else |
|
74 |
$1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES))) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
75 |
endif |
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
29312
diff
changeset
|
76 |
else |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
29312
diff
changeset
|
77 |
ifneq ($$($1_SUFFIXES),) |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
29312
diff
changeset
|
78 |
$1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \ |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
29312
diff
changeset
|
79 |
$$(addprefix -i$(SPACE)$(DQUOTE),*$$s$(DQUOTE))) |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
29312
diff
changeset
|
80 |
endif |
20363 | 81 |
endif |
82 |
ifneq ($$($1_INCLUDE_FILES),) |
|
83 |
$1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES)) |
|
84 |
endif |
|
85 |
ifneq ($$($1_EXCLUDES),) |
|
27560 | 86 |
$1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES))) |
20363 | 87 |
$1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES)))) |
88 |
$1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS)) |
|
89 |
endif |
|
27560 | 90 |
ifneq ($$($1_EXCLUDE_FILES),) |
91 |
# Cannot precompute ZIP_EXCLUDE_FILES as it is dependent on which src root is being |
|
92 |
# zipped at the moment. |
|
93 |
$1_SRC_EXCLUDE_FILES := $$(addprefix %, $$($1_EXCLUDE_FILES)) $$($1_EXCLUDE_FILES) |
|
94 |
$1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDE_FILES), $$($1_ALL_SRCS)) |
|
95 |
endif |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
96 |
|
20363 | 97 |
# Use a slightly shorter name for logging, but with enough path to identify this zip. |
98 |
$1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP)) |
|
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
99 |
|
20363 | 100 |
# Now $1_ALL_SRCS should contain all sources that are going to be put into the zip. |
101 |
# I.e. the zip -i and -x options should match the filtering done in the makefile. |
|
102 |
# Explicitly excluded files can be given with absolute path. The patsubst solution |
|
103 |
# isn't perfect but the likelyhood of an absolute path to match something in a src |
|
104 |
# dir is very small. |
|
105 |
# If zip has nothing to do, it returns 12 and would fail the build. Check for 12 |
|
106 |
# and only fail if it's not. |
|
107 |
$$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS) |
|
108 |
$(MKDIR) -p $$(@D) |
|
109 |
$(ECHO) Updating $$($1_NAME) |
|
42136
f872c8278074
8168037: Use ZIPEXE instead of ZIP to avoid clash with options for zip
ihse
parents:
41658
diff
changeset
|
110 |
$$(foreach i,$$($1_SRC),(cd $$i && $(ZIPEXE) -qru $$($1_ZIP_OPTIONS) $$@ . $$($1_ZIP_INCLUDES) \ |
27560 | 111 |
$$($1_ZIP_EXCLUDES) -x \*_the.\* \ |
112 |
$$(addprefix -x$(SPACE), $$(patsubst $$i/%,%, $$($1_EXCLUDE_FILES))) \ |
|
113 |
|| test "$$$$?" = "12" )$$(NEWLINE)) true |
|
20363 | 114 |
$(TOUCH) $$@ |
22480
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
115 |
|
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
116 |
# Add zip to target list |
d1be923b168a
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
22469
diff
changeset
|
117 |
$1 += $$($1_ZIP) |
12258
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
118 |
endef |
6ec26f6cc53e
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
119 |
|
27592
af7df0dd5ff7
8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents:
27591
diff
changeset
|
120 |
endif # _ZIP_ARCHIVE_GMK |