make/common/ZipArchive.gmk

*** 40,49 ****
--- 40,53 ----
  #   ZIP
  #   INCLUDES
  #   INCLUDE_FILES
  #   EXCLUDES
  #   EXCLUDE_FILES
+ #   EXCLUDE_PATTERNS - Patterns with at most one % wildcard matching filenames
+ #                      and not directories.
+ #   EXCLUDE_PATTERNS_$dir - Exclude patterns just like above but specific to one
+ #                           src dir
  #   SUFFIXES
  #   EXTRA_DEPS
  #   ZIP_OPTIONS extra options to pass to zip
  SetupZipArchive = $(NamedParamsMacroTemplate)
  define SetupZipArchiveBody
*** 86,100 ****
      $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
      $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
      $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
    endif
    ifneq ($$($1_EXCLUDE_FILES),)
-     # Cannot precompute ZIP_EXCLUDE_FILES as it is dependent on which src root is being
-     # zipped at the moment.
      $1_SRC_EXCLUDE_FILES := $$(addprefix %, $$($1_EXCLUDE_FILES)) $$($1_EXCLUDE_FILES)
      $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDE_FILES), $$($1_ALL_SRCS))
!   endif
  
    # Use a slightly shorter name for logging, but with enough path to identify this zip.
    $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_ZIP))
  
    # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
--- 90,119 ----
      $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
      $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
      $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
    endif
    ifneq ($$($1_EXCLUDE_FILES),)
      $1_SRC_EXCLUDE_FILES := $$(addprefix %, $$($1_EXCLUDE_FILES)) $$($1_EXCLUDE_FILES)
      $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDE_FILES), $$($1_ALL_SRCS))
!     $$(foreach s, $$($1_SRC), \
!       $$(eval $1_ZIP_EXCLUDES_$$s += \
!           $$(addprefix -x$$(SPACE), $$(patsubst $$s/%,%, $$($1_EXCLUDE_FILES))) \
!       ) \
!     )
!   endif
!   ifneq ($$($1_EXCLUDE_PATTERNS), )
!     $1_ALL_SRCS := $$(filter-out $$($1_EXCLUDE_PATTERNS), $$($1_ALL_SRCS))
!     $1_ZIP_EXCLUDES += $$(addprefix -x$(SPACE), $$(subst %,\*,$$($1_EXCLUDE_PATTERNS)))
!   endif
!   # Rewrite src dir specific exclude patterns to zip excludes
!   $$(foreach s, $$($1_SRC), \
!     $$(if $$($1_EXCLUDE_PATTERNS_$$s), \
!       $$(eval $1_ZIP_EXCLUDES_$$s += \
!           $$(addprefix -x$$(SPACE), $$(subst %,\*,$$($1_EXCLUDE_PATTERNS_$$s))) \
!       ) \
!     ) \
!   )
  
    # Use a slightly shorter name for logging, but with enough path to identify this zip.
    $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_ZIP))
  
    # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
*** 105,117 ****
    # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
    # and only fail if it's not.
    $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
          $(MKDIR) -p $$(@D)
          $(ECHO) Updating $$($1_NAME)
!         $$(foreach i,$$($1_SRC),(cd $$i && $(ZIPEXE) -qru $$($1_ZIP_OPTIONS) $$@ . $$($1_ZIP_INCLUDES) \
!             $$($1_ZIP_EXCLUDES) -x \*_the.\* \
!             $$(addprefix -x$(SPACE), $$(patsubst $$i/%,%, $$($1_EXCLUDE_FILES))) \
              || test "$$$$?" = "12" )$$(NEWLINE)) true
          $(TOUCH) $$@
  
    # Add zip to target list
    $1 += $$($1_ZIP)
--- 124,136 ----
    # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
    # and only fail if it's not.
    $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
          $(MKDIR) -p $$(@D)
          $(ECHO) Updating $$($1_NAME)
!         $$(foreach s,$$($1_SRC),(cd $$s && $(ZIPEXE) -qru $$($1_ZIP_OPTIONS) $$@ . \
!             $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* \
!             $$($1_ZIP_EXCLUDES_$$s) \
              || test "$$$$?" = "12" )$$(NEWLINE)) true
          $(TOUCH) $$@
  
    # Add zip to target list
    $1 += $$($1_ZIP)