equal
deleted
inserted
replaced
50 # BASE_DIR : Base directory for the root dir in the bundle. |
50 # BASE_DIR : Base directory for the root dir in the bundle. |
51 # SUBDIR : Optional name of root dir in bundle. |
51 # SUBDIR : Optional name of root dir in bundle. |
52 SetupBundleFile = $(NamedParamsMacroTemplate) |
52 SetupBundleFile = $(NamedParamsMacroTemplate) |
53 define SetupBundleFileBody |
53 define SetupBundleFileBody |
54 |
54 |
55 $1_RELATIVE_FILES := $$(patsubst $$($1_BASE_DIR)/%, ./%, $$($1_FILES)) |
55 $1_RELATIVE_FILES := $$(patsubst $$($1_BASE_DIR)/%, %, $$($1_FILES)) |
56 |
56 |
57 ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), ) |
57 ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), ) |
58 $1_TYPE := tar.gz |
58 $1_TYPE := tar.gz |
59 else ifneq ($$(filter %.zip, $$($1_BUNDLE_NAME)), ) |
59 else ifneq ($$(filter %.zip, $$($1_BUNDLE_NAME)), ) |
60 $1_TYPE := zip |
60 $1_TYPE := zip |
69 $1_RELATIVE_FILES, \ |
69 $1_RELATIVE_FILES, \ |
70 $(SUPPORT_OUTPUTDIR)/bundles/_$1_files)) |
70 $(SUPPORT_OUTPUTDIR)/bundles/_$1_files)) |
71 $$(call MakeDir, $$(@D)) |
71 $$(call MakeDir, $$(@D)) |
72 ifneq ($$($1_SPECIAL_INCLUDES), ) |
72 ifneq ($$($1_SPECIAL_INCLUDES), ) |
73 $$(foreach i, $$($1_SPECIAL_INCLUDES), \ |
73 $$(foreach i, $$($1_SPECIAL_INCLUDES), \ |
74 ($(CD) $$($1_BASE_DIR) && $(FIND) ./$$i \ |
74 ($(CD) $$($1_BASE_DIR) && $(FIND) $$i \ |
75 >> $(SUPPORT_OUTPUTDIR)/bundles/_$1_files ) ; ) |
75 >> $(SUPPORT_OUTPUTDIR)/bundles/_$1_files ) ; ) |
76 endif |
76 endif |
77 ifneq ($$($1_SUBDIR), ) |
77 ifneq ($$($1_SUBDIR), ) |
78 ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO), tar.gz-true-false) |
78 ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO), tar.gz-true-false) |
79 $(CD) $$($1_BASE_DIR) \ |
79 $(CD) $$($1_BASE_DIR) \ |