Bug 460263 - merge lightning install.rdf for preinstallation in thunderbird universal builds
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -87,14 +87,32 @@ postflight_all:
# about:buildconfig page. Fix it up.
$(TOPSRCDIR)/mozilla/build/macosx/universal/fix-buildconfig \
$(DIST_PPC)/$(MOZ_PKG_APPNAME)/$(APPNAME)/$(BUILDCONFIG_JAR) \
$(DIST_X86)/$(MOZ_PKG_APPNAME)/$(APPNAME)/$(BUILDCONFIG_JAR)
mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
rm -f $(DIST_X86)/universal
ln -s $(DIST_UNI) $(DIST_X86)/universal
rm -rf $(DIST_UNI)/$(MOZ_PKG_APPNAME)/$(APPNAME)
+ifdef MOZ_CALENDAR
+ifndef DISABLE_LIGHTNING_INSTALL
+ifndef MOZ_SUNBIRD
+# workaround for different platforms in lightning installrdf
+ $(PYTHON) $(TOPSRCDIR)/build/merge-installrdf.py $(DIST_PPC)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\} $(DIST_X86)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\} > $(DIST_PPC)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/install.rdf_
+ mv $(DIST_PPC)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/install.rdf_ $(DIST_PPC)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/install.rdf
+ cp $(DIST_PPC)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/install.rdf $(DIST_X86)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/install.rdf
+endif
+endif
+endif
$(TOPSRCDIR)/mozilla/build/macosx/universal/unify \
$(DIST_PPC)/$(MOZ_PKG_APPNAME)/$(APPNAME) \
$(DIST_X86)/$(MOZ_PKG_APPNAME)/$(APPNAME) \
$(DIST_UNI)/$(MOZ_PKG_APPNAME)/$(APPNAME)
+ifdef MOZ_CALENDAR
+ifndef DISABLE_LIGHTNING_INSTALL
+ifndef MOZ_SUNBIRD
+ rm $(DIST_PPC)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/install.rdf \
+ $(DIST_X86)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/install.rdf
+endif
+endif
+endif
# A universal .dmg can now be produced by making in either architecture's
# INSTALLER_DIR.
rename from calendar/lightning/build/merge-installrdf.py
rename to build/merge-installrdf.py
--- a/calendar/lightning/build/universal.mk
+++ b/calendar/lightning/build/universal.mk
@@ -55,13 +55,13 @@ postflight_all:
mkdir -p $(DIST_UNI)/xpi-stage/lightning/platform/$$platform/components; \
mv $(DIST_UNI)/xpi-stage/lightning/components/*.dylib \
$(DIST_UNI)/xpi-stage/lightning/platform/$$platform/components
platform=`$(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/get-platform.py \
$(DIST_X86)/xpi-stage/lightning`; \
mkdir -p $(DIST_UNI)/xpi-stage/lightning/platform/$$platform/components; \
cp $(DIST_X86)/xpi-stage/lightning/components/*.dylib \
$(DIST_UNI)/xpi-stage/lightning/platform/$$platform/components
- $(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/merge-installrdf.py \
+ $(PYTHON) $(TOPSRCDIR)/build/merge-installrdf.py \
$(DIST_PPC)/xpi-stage/lightning \
$(DIST_X86)/xpi-stage/lightning \
> $(DIST_UNI)/xpi-stage/lightning/install.rdf
cd $(DIST_UNI)/xpi-stage/lightning && $(ZIP) -qr ../lightning.xpi *