stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8232572: Add hooks for custom output dir in Bundles.gmk

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2019-10-21 09:26:14 -07:00
parent a1894385b3
commit 0192c5a02f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/Bundles.gmk
View File

@ -50,6 +50,7 @@ $(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
# files or directories may contain spaces. # files or directories may contain spaces.
# BASE_DIRS : Base directories for the root dir in the bundle. # BASE_DIRS : Base directories for the root dir in the bundle.
# SUBDIR : Optional name of root dir in bundle. # SUBDIR : Optional name of root dir in bundle.
# OUTPUTDIR : Optionally override output dir
SetupBundleFile = $(NamedParamsMacroTemplate) SetupBundleFile = $(NamedParamsMacroTemplate)
define SetupBundleFileBody define SetupBundleFileBody
@ -70,8 +71,11 @@ define SetupBundleFileBody
$$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
$(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) $$(call SetIfEmpty, $1_OUTPUTDIR, $$(BUNDLES_OUTPUTDIR))
$$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
$$(call MakeTargetDir) $$(call MakeTargetDir)
$$(call LogWarn, Creating $$($1_BUNDLE_NAME))
# If any of the files contain a space in the file name, FindFiles # If any of the files contain a space in the file name, FindFiles
# will have replaced it with ?. Tar does not accept that so need to # will have replaced it with ?. Tar does not accept that so need to
# switch it back. # switch it back.
@ -137,7 +141,7 @@ define SetupBundleFileBody
endif endif
endif endif
$1 += $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME) $1 += $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME)
endef endef
@ -165,7 +169,7 @@ endif
################################################################################ ################################################################################
ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), ) ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map