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

8159628: Bundles contain extra /./ path element for all files

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2016-06-21 20:00:20 +02:00
parent f8e1100161
commit 7be41495c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/Bundles.gmk
View File

@ -52,7 +52,7 @@ $(eval $(call IncludeCustomExtension, , Bundles-pre.gmk))
SetupBundleFile = $(NamedParamsMacroTemplate) SetupBundleFile = $(NamedParamsMacroTemplate)
define SetupBundleFileBody define SetupBundleFileBody
$1_RELATIVE_FILES := $$(patsubst $$($1_BASE_DIR)/%, ./%, $$($1_FILES)) $1_RELATIVE_FILES := $$(patsubst $$($1_BASE_DIR)/%, %, $$($1_FILES))
ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), ) ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), )
$1_TYPE := tar.gz $1_TYPE := tar.gz
@ -71,7 +71,7 @@ define SetupBundleFileBody
$$(call MakeDir, $$(@D)) $$(call MakeDir, $$(@D))
ifneq ($$($1_SPECIAL_INCLUDES), ) ifneq ($$($1_SPECIAL_INCLUDES), )
$$(foreach i, $$($1_SPECIAL_INCLUDES), \ $$(foreach i, $$($1_SPECIAL_INCLUDES), \
($(CD) $$($1_BASE_DIR) && $(FIND) ./$$i \ ($(CD) $$($1_BASE_DIR) && $(FIND) $$i \
>> $(SUPPORT_OUTPUTDIR)/bundles/_$1_files ) ; ) >> $(SUPPORT_OUTPUTDIR)/bundles/_$1_files ) ; )
endif endif
ifneq ($$($1_SUBDIR), ) ifneq ($$($1_SUBDIR), )