Merge "package-modules: use && instead of ; between copy commands"

      $(eval my_copy_pairs += $(bui):$(my_staging_dir)/$(my_copy_dest)))\

  ))

define copy-tests-in-batch

$(hide) $(foreach p, $(1),\

  $(eval pair := $(subst :,$(space),$(p)))\

  mkdir -p $(dir $(word 2,$(pair)));\

  cp -Rf $(word 1,$(pair)) $(word 2,$(pair));)

endef

my_package_zip := $(my_staging_dir)/$(my_package_name).zip

$(my_package_zip): PRIVATE_COPY_PAIRS := $(my_copy_pairs)

$(my_package_zip): PRIVATE_PICKUP_FILES := $(my_pickup_files)

$(my_package_zip) : $(my_built_modules)

	@echo "Package $@"

	@rm -rf $(dir $@) && mkdir -p $(dir $@)

	$(call copy-tests-in-batch,$(wordlist 1,200,$(PRIVATE_COPY_PAIRS)))

	$(call copy-tests-in-batch,$(wordlist 201,400,$(PRIVATE_COPY_PAIRS)))

	$(call copy-tests-in-batch,$(wordlist 401,600,$(PRIVATE_COPY_PAIRS)))

	$(call copy-tests-in-batch,$(wordlist 601,800,$(PRIVATE_COPY_PAIRS)))

	$(call copy-tests-in-batch,$(wordlist 801,1000,$(PRIVATE_COPY_PAIRS)))

	$(call copy-tests-in-batch,$(wordlist 1001,1200,$(PRIVATE_COPY_PAIRS)))

	$(call copy-tests-in-batch,$(wordlist 1201,9999,$(PRIVATE_COPY_PAIRS)))

	$(foreach p, $(PRIVATE_COPY_PAIRS),\

	  $(eval pair := $(subst :,$(space),$(p)))\

	  mkdir -p $(dir $(word 2,$(pair))) && \

	  cp -Rf $(word 1,$(pair)) $(word 2,$(pair)) && ) true

	$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\

	  cp -RfL $(f) $(dir $@);)

	  cp -RfL $(f) $(dir $@) && ) true

	$(hide) cd $(dir $@) && zip -rqX $(notdir $@) *