Bug 1168525 - Port |Bug 1166538 - Use mozbuild.jar-based zip tool instead of $(ZIP) for simple cases| to Calendar r=Fallen
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 09 Jun 2015 11:41:03 +0100
changeset 22801 9a0db622167bec9b8c3ec8709cd99ddcc9eaa56c
parent 22800 68e8683c28c63fd94d20a2628c58cc974fdc679b
child 22802 1fafcee93411a4bc9ef99eda31887bf5809887c7
push id1443
push usermbanner@mozilla.com
push dateMon, 10 Aug 2015 18:31:17 +0000
treeherdercomm-beta@8fe07d686c22 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1168525, 1166538
Bug 1168525 - Port |Bug 1166538 - Use mozbuild.jar-based zip tool instead of $(ZIP) for simple cases| to Calendar r=Fallen
calendar/lightning/build/universal.mk
--- a/calendar/lightning/build/universal.mk
+++ b/calendar/lightning/build/universal.mk
@@ -41,17 +41,17 @@ platform=`$(PYTHON) $(TOPSRCDIR)/calenda
 mkdir -p $(DIST_UNI)/$1/$2/components/$$platform; \
 cp $(DIST_ARCH_2)/$1/$2/components/*.dylib \
 	$(DIST_UNI)/$1/$2/components/$$platform; \
 $(foreach dylib,$(wildcard $(DIST_ARCH_2)/$1/$2/components/*.dylib),echo binary-component $$platform/$(notdir $(dylib)) abi=$$platform >> $(DIST_UNI)/$1/$2/components/libical-manifest)
 grep -v em:targetPlatform $(DIST_ARCH_1)/$1/$2/install.rdf > $(DIST_UNI)/$1/$2/install.rdf
 endef
 
 define unify_lightning_repackage
-cd $(DIST_UNI)/$1/$2 && $(ZIP) -qr ../$(XPI_PKGNAME).xpi *
+$(call py_action,zip,-C $(DIST_UNI)/$1/$2 ../$(XPI_PKGNAME).xpi '*')
 endef
 
 postflight_all:
 	$(call unify_lightning,xpi-stage,lightning)
 	$(call unify_lightning_repackage,xpi-stage,lightning)
 ifdef NIGHTLY_BUILD
 	$(call unify_lightning,$(MOZ_APP_DISPLAYNAME).app/Contents/Resources/extensions,{e2fda1a4-762b-4020-b5ad-a41df1933103})
 else