Fix bug 882334 - [Mac] Lightning 2.5, 2.6 & 2.7 not working [TypeError: Components.classes[cid] is undefined] (regression). r=ssitter a=bustage CLOSED TREE
authorPhilipp Kewisch <mozilla@kewis.ch>
Tue, 02 Jul 2013 12:17:19 +0200
changeset 15819 0f58049a758d72d27d83be367008649172275a1a
parent 15818 a7b8008b37c7410c84f22ec51ecf03e0f017ce4f
child 15820 d8edf862ddae000587660891e04dbb79905bb555
push idunknown
push userunknown
push dateunknown
reviewersssitter, bustage
bugs882334
Fix bug 882334 - [Mac] Lightning 2.5, 2.6 & 2.7 not working [TypeError: Components.classes[cid] is undefined] (regression). r=ssitter a=bustage CLOSED TREE
calendar/lightning/build/universal.mk
--- a/calendar/lightning/build/universal.mk
+++ b/calendar/lightning/build/universal.mk
@@ -21,17 +21,18 @@ LIGHTNING_VERSION := $(shell cat $(topsr
 XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
 
 include $(TOPSRCDIR)/config/config.mk
 
 postflight_all:
 	mkdir -p $(DIST_UNI)/xpi-stage
 	rm -rf $(DIST_UNI)/xpi-stage/lightning*
 	cp -R $(DIST_ARCH_1)/xpi-stage/lightning $(DIST_UNI)/xpi-stage
-	rm -f $(DIST_UNI)/xpi-stage/lightning/components/libical.manifest
+	grep -v binary-component $(DIST_ARCH_1)/xpi-stage/lightning/components/libical.manifest > \
+	    $(DIST_UNI)/xpi-stage/lightning/components/libical.manifest
 	platform=`$(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/get-platform.py \
 		$(DIST_ARCH_1)/xpi-stage/lightning`; \
 	mkdir -p $(DIST_UNI)/xpi-stage/lightning/components/$$platform; \
 	mv $(DIST_UNI)/xpi-stage/lightning/components/*.dylib \
 		$(DIST_UNI)/xpi-stage/lightning/components/$$platform; \
 	$(foreach dylib,$(wildcard $(DIST_ARCH_1)/xpi-stage/lightning/components/*.dylib),echo binary-component $$platform/$(notdir $(dylib)) ABI=$$platform >> $(DIST_UNI)/xpi-stage/lightning/components/libical.manifest)
 	platform=`$(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/get-platform.py \
 		$(DIST_ARCH_2)/xpi-stage/lightning`; \