make/Bundles.gmk

rev 59383 : [mq]: final

*** 99,118 ****
          else ifeq ($$($1_SUBDIR)-$$($1_TYPE)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \
              .-tar.gz-false-1)
            # If no subdir is specified and only one BASE_DIR, tar.gz can be done
            # directly from BASE_DIR.
            $(CD) $$($1_BASE_DIRS) \
!               && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
                    -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
                    $(TAR_IGNORE_EXIT_VALUE) ) \
                | $(GZIP) > $$@
          else ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \
              tar.gz-true-false-1)
            # If only one BASE_DIR, but with a SUBDIR set, tar.gz can use the
            # transform option to create bundle directly from the BASE_DIR.
            $(CD) $$($1_BASE_DIRS) \
!               && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
                    -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
                    $$(if $$($1_SUBDIR), --transform 's|^|$$($1_SUBDIR)/|S') \
                    $(TAR_IGNORE_EXIT_VALUE) ) \
                | $(GZIP) > $$@
          else
--- 99,118 ----
          else ifeq ($$($1_SUBDIR)-$$($1_TYPE)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \
              .-tar.gz-false-1)
            # If no subdir is specified and only one BASE_DIR, tar.gz can be done
            # directly from BASE_DIR.
            $(CD) $$($1_BASE_DIRS) \
!               && ( $(TAR) cf - \
                    -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
                    $(TAR_IGNORE_EXIT_VALUE) ) \
                | $(GZIP) > $$@
          else ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \
              tar.gz-true-false-1)
            # If only one BASE_DIR, but with a SUBDIR set, tar.gz can use the
            # transform option to create bundle directly from the BASE_DIR.
            $(CD) $$($1_BASE_DIRS) \
!               && ( $(TAR) cf - \
                    -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
                    $$(if $$($1_SUBDIR), --transform 's|^|$$($1_SUBDIR)/|S') \
                    $(TAR_IGNORE_EXIT_VALUE) ) \
                | $(GZIP) > $$@
          else
*** 138,148 ****
                $(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \
              done
            endif
            ifeq ($$($1_TYPE), tar.gz)
              $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \
!             ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
                  $$(if $$($1_SUBDIR), $$($1_SUBDIR), .) $(TAR_IGNORE_EXIT_VALUE) ) \
              | $(GZIP) > $$@
            else ifeq ($$($1_TYPE), zip)
              $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIPEXE) -qr $$@ .
            endif
--- 138,148 ----
                $(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \
              done
            endif
            ifeq ($$($1_TYPE), tar.gz)
              $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \
!             ( $(TAR) cf - \
                  $$(if $$($1_SUBDIR), $$($1_SUBDIR), .) $(TAR_IGNORE_EXIT_VALUE) ) \
              | $(GZIP) > $$@
            else ifeq ($$($1_TYPE), zip)
              $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIPEXE) -qr $$@ .
            endif