Fix bug 725075 - rsync xpi-stage/lightning to dist dir on mac osx. r=Standard8
authorPhilipp Kewisch <mozilla@kewis.ch>
Tue, 21 Feb 2012 15:48:52 +0100
changeset 10892 384af8e0eb95537840ef924033dbf148651b417b
parent 10891 cf85b487f53c04158575758678ed9846f2adf49c
child 10893 a6e02542cfd768518dfa285fd415ccd055f73f7a
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs725075
Fix bug 725075 - rsync xpi-stage/lightning to dist dir on mac osx. r=Standard8
calendar/lightning/Makefile.in
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -151,16 +151,23 @@ DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
 
 # xxx todo: unless our packaging story is revised (bug 406579) we package up timezones.sqlite
 libs::
 	$(NSINSTALL) -m 0644 $(srcdir)/../timezones/timezones.sqlite $(FINAL_TARGET)
 
 include $(topsrcdir)/config/rules.mk
 include $(srcdir)/lightning-packager.mk
 
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+# If the macbundle dist dir was already created, sync lightning here to avoid
+# the need to make -C objdir/mail/app each time
+libs::
+	[ -d $(DIST)/$(MOZ_MACBUNDLE_NAME) ] && rsync -a $(FINAL_TARGET) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/extensions/$(XPI_EM_ID) || true
+endif
+
 ident:
 	@printf "comm_revision "
 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
 	    $(FINAL_TARGET)/application.ini App SourceStamp
 	@printf "moz_revision "
 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
 	    $(FINAL_TARGET)/application.ini Build SourceStamp
 	@printf "buildid "