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) \ |
80 && ( $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \ |
80 && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \ |
|
81 -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \ |
81 --transform 's|^|$$($1_SUBDIR)/|' $(TAR_IGNORE_EXIT_VALUE) ) \ |
82 --transform 's|^|$$($1_SUBDIR)/|' $(TAR_IGNORE_EXIT_VALUE) ) \ |
82 | $(GZIP) > $$@ |
83 | $(GZIP) > $$@ |
83 else |
84 else |
84 # If a subdir has been specified, copy all files into a temporary |
85 # If a subdir has been specified, copy all files into a temporary |
85 # location with this subdir before creating the tar file |
86 # location with this subdir before creating the tar file |
95 $(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \ |
96 $(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \ |
96 done |
97 done |
97 endif |
98 endif |
98 ifeq ($$($1_TYPE), tar.gz) |
99 ifeq ($$($1_TYPE), tar.gz) |
99 $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \ |
100 $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \ |
100 ( $(TAR) cf - $$($1_SUBDIR) $(TAR_IGNORE_EXIT_VALUE) ) | $(GZIP) > $$@ |
101 ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) $$($1_SUBDIR) $(TAR_IGNORE_EXIT_VALUE) ) \ |
|
102 | $(GZIP) > $$@ |
101 else ifeq ($$($1_TYPE), zip) |
103 else ifeq ($$($1_TYPE), zip) |
102 $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIP) -qr $$@ . |
104 $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIP) -qr $$@ . |
103 endif |
105 endif |
104 endif |
106 endif |
105 else |
107 else |
106 ifeq ($$($1_TYPE), tar.gz) |
108 ifeq ($$($1_TYPE), tar.gz) |
107 $(CD) $$($1_BASE_DIR) \ |
109 $(CD) $$($1_BASE_DIR) \ |
108 && ( $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \ |
110 && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \ |
|
111 -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \ |
109 $(TAR_IGNORE_EXIT_VALUE) ) \ |
112 $(TAR_IGNORE_EXIT_VALUE) ) \ |
110 | $(GZIP) > $$@ |
113 | $(GZIP) > $$@ |
111 else ifeq ($$($1_TYPE), zip) |
114 else ifeq ($$($1_TYPE), zip) |
112 $(CD) $$($1_BASE_DIR) \ |
115 $(CD) $$($1_BASE_DIR) \ |
113 && $(ZIP) -qr $$@ . -i@$(SUPPORT_OUTPUTDIR)/bundles/_$1_files |
116 && $(ZIP) -qr $$@ . -i@$(SUPPORT_OUTPUTDIR)/bundles/_$1_files |