Bug 916537 - Lightning not working, many files are missing in the .xpi package. r=philipp a=RyanVM
☠☠ backed out by 6eca8327662c ☠ ☠
authorRichard Marti <richard.marti@gmail.com>
Tue, 17 Sep 2013 09:00:21 +0200
changeset 14737 452390823d77e524ac37b18d8b012a9da3b8ef12
parent 14736 24c9b80011a2838b4c3d731769156b255ff4d16c
child 14738 0e477e31bb2d4a3cadddb75066d56d71472203ba
push id1061
push userbugzilla@standard8.plus.com
push dateTue, 17 Sep 2013 17:45:46 +0000
treeherdercomm-aurora@a5a311c8696f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp, RyanVM
bugs916537
Bug 916537 - Lightning not working, many files are missing in the .xpi package. r=philipp a=RyanVM
calendar/base/Makefile.in
calendar/base/backend/icaljs/Makefile.in
calendar/base/backend/libical/build/Makefile.in
calendar/base/src/Makefile.in
calendar/import-export/Makefile.in
calendar/lightning/Makefile.in
calendar/providers/caldav/Makefile.in
calendar/providers/gdata/components/Makefile.in
calendar/providers/wcap/Makefile.in
calendar/timezones/Makefile.in
--- a/calendar/base/Makefile.in
+++ b/calendar/base/Makefile.in
@@ -41,12 +41,12 @@ ifneq (,$(filter windows os2 gtk gtk2,$(
 # Set up the icon suffix to differ between windows and linux
 ifneq (,$(filter windows os2,$(MOZ_WIDGET_TOOLKIT)))
 ICON_SUFFIX = .ico
 else
 ICON_SUFFIX = .png
 endif
 
 # Copy the window icons into the correct directory
-libs:: $(addprefix themes/windows/icons/, $(addsuffix $(ICON_SUFFIX), $(WINDOW_ICONS)))
+tools:: $(addprefix themes/windows/icons/, $(addsuffix $(ICON_SUFFIX), $(WINDOW_ICONS)))
 	$(INSTALL) $^ $(FINAL_TARGET)/chrome/icons/default
 
 endif
--- a/calendar/base/backend/icaljs/Makefile.in
+++ b/calendar/base/backend/icaljs/Makefile.in
@@ -20,21 +20,21 @@ EXTRA_SCRIPTS = \
 	calDuration.js \
 	calICSService-worker.js \
 	calICSService.js \
 	calPeriod.js \
 	calRecurrenceRule.js \
 	$(NULL)
 
 # Use NSINSTALL to make the directory, as there's no mtime to preserve.
-libs:: $(EXTRA_SCRIPTS)
+tools:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
-libs:: $(BACKEND_MANIFESTS)
+tools:: $(BACKEND_MANIFESTS)
 	$(EXIT_ON_ERROR) \
 	$(NSINSTALL) -D $(FINAL_TARGET)/components; \
 	for i in $^; do \
 	  fname=`basename $$i`; \
 	  dest=$(FINAL_TARGET)/components/$${fname}; \
 	  $(RM) -f $$dest; \
 	  $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \
 	done
--- a/calendar/base/backend/libical/build/Makefile.in
+++ b/calendar/base/backend/libical/build/Makefile.in
@@ -45,17 +45,17 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 # Ensure that we don't embed a manifest referencing the CRT
 EMBED_MANIFEST_AT =
 
 BACKEND_MANIFESTS = libical.manifest
 DEFINES += -DSHARED_LIBRARY=$(SHARED_LIBRARY) -DXPIDL_MODULE=$(XPIDL_MODULE)
 
-libs:: $(BACKEND_MANIFESTS)
+tools:: $(BACKEND_MANIFESTS)
 	$(EXIT_ON_ERROR) \
 	$(NSINSTALL) -D $(FINAL_TARGET)/components; \
 	for i in $^; do \
 	  fname=`basename $$i`; \
 	  dest=$(FINAL_TARGET)/components/$${fname}; \
 	  $(RM) -f $$dest; \
 	  $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $$i > $$dest; \
 	done
--- a/calendar/base/src/Makefile.in
+++ b/calendar/base/src/Makefile.in
@@ -36,17 +36,17 @@ EXTRA_SCRIPTS = \
     calUtils.js \
     calWeekInfoService.js \
     calTransactionManager.js \
     calFreeBusyService.js \
     calCalendarSearchService.js \
     $(NULL)
 
 # Use NSINSTALL to make the directory, as there's no mtime to preserve.
-libs:: $(EXTRA_SCRIPTS)
+tools:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
 # The install target must use SYSINSTALL, which is NSINSTALL in copy mode.
 install:: $(EXTRA_SCRIPTS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/calendar-js
 
 include $(topsrcdir)/config/rules.mk
--- a/calendar/import-export/Makefile.in
+++ b/calendar/import-export/Makefile.in
@@ -14,17 +14,17 @@ EXTRA_SCRIPTS = \
     calIcsImportExport.js \
     calListFormatter.js \
     calMonthGridPrinter.js \
     calOutlookCSVImportExport.js \
     calWeekPrinter.js \
     $(NULL)
 
 # Use NSINSTALL to make the directory, as there's no mtime to preserve.
-libs:: $(EXTRA_SCRIPTS)
+tools:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
 # The install target must use SYSINSTALL, which is NSINSTALL in copy mode.
 install:: $(EXTRA_SCRIPTS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/calendar-js
 
 include $(topsrcdir)/config/rules.mk
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -111,32 +111,32 @@ DEFINES += -DTHUNDERBIRD_VERSION=$(THUND
            -DXPI_EM_ID=$(XPI_EM_ID) \
            -DTHEME=$(THEME) \
            $(NULL)
 
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
 
 # xxx todo: unless our packaging story is revised (bug 406579) we package up timezones.sqlite
-libs::
+tools::
 	$(NSINSTALL) -m 0644 $(srcdir)/../timezones/timezones.sqlite $(FINAL_TARGET)
 
 include $(topsrcdir)/config/rules.mk
 include $(srcdir)/lightning-packager.mk
 
 # For Lightning, we also need to preprocess the l10n prefs
 repack-process-extrafiles: lightning-extrafiles
 lightning-extrafiles: LOCALE_BASEDIR=$(call EXPAND_LOCALE_SRCDIR,calendar/locales)
 lightning-extrafiles:
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(LOCALE_BASEDIR)/lightning-l10n.js  > $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(L10N_XPI_NAME)/$(PREF_DIR)/lightning-l10n.js
 
 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::
+tools::
 	[ -d $(DIST)/$(MOZ_MACBUNDLE_NAME) ] && rsync -aL $(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 "
--- a/calendar/providers/caldav/Makefile.in
+++ b/calendar/providers/caldav/Makefile.in
@@ -6,17 +6,17 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_SCRIPTS = calDavRequestHandlers.js
 
-libs:: $(EXTRA_SCRIPTS)
+tools:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
 # The install target must use SYSINSTALL, which is NSINSTALL in copy mode.
 install:: $(EXTRA_SCRIPTS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/calendar-js
 
 include $(topsrcdir)/config/rules.mk
--- a/calendar/providers/gdata/components/Makefile.in
+++ b/calendar/providers/gdata/components/Makefile.in
@@ -12,17 +12,17 @@ include $(DEPTH)/config/autoconf.mk
 EXTRA_SCRIPTS = \
     calGoogleCalendar.js \
     calGoogleRequest.js \
     calGoogleSession.js \
     calGoogleUtils.js \
     $(NULL)
 
 # Use NSINSTALL to make the directory, as there's no mtime to preserve.
-libs:: $(EXTRA_SCRIPTS)
+tools:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/js; then $(NSINSTALL) -D $(FINAL_TARGET)/js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/js
 
 # The install target must use SYSINSTALL, which is NSINSTALL in copy mode.
 install:: $(EXTRA_SCRIPTS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/js
 
 include $(topsrcdir)/config/rules.mk
--- a/calendar/providers/wcap/Makefile.in
+++ b/calendar/providers/wcap/Makefile.in
@@ -13,17 +13,17 @@ EXTRA_SCRIPTS = \
                 calWcapUtils.js \
                 calWcapRequest.js \
                 calWcapErrors.js \
                 calWcapSession.js \
                 calWcapCalendarItems.js \
                 calWcapCalendar.js \
                 $(NULL)
 
-libs:: $(EXTRA_SCRIPTS)
+tools:: $(EXTRA_SCRIPTS)
 	if test ! -d $(FINAL_TARGET)/calendar-js; then $(NSINSTALL) -D $(FINAL_TARGET)/calendar-js; fi
 	$(INSTALL) $^ $(FINAL_TARGET)/calendar-js
 
 # using SYSINSTALL (i.e. NSINSTALL in copy mode):
 install:: $(EXTRA_SCRIPTS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/calendar-js
 
 include $(topsrcdir)/config/rules.mk
--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@@ -50,21 +50,21 @@ DEFINES += -DAB_CD=$(AB_CD) \
            -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
            -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
            -DTIMEZONES_VERSION=$(TIMEZONES_VERSION) \
            $(NULL)
 
 TIMEZONES_SQLITE =  $(srcdir)/timezones.sqlite
 
 ifneq ($(strip $(update)),)
-libs::
+tools::
 	echo 'SELECT * FROM tz_data ORDER BY tzid;' | sqlite3 $(TIMEZONES_SQLITE) > $(srcdir)/timezones_before_update.dump
 	$(DIST)/bin/run-mozilla.sh $(LIBXUL_DIST)/bin/xpcshell -s -w $(srcdir)/update.js $(update) $(srcdir)/$(DEPTH) $(TIMEZONES_VERSION)
 	echo 'SELECT * FROM tz_data ORDER BY tzid;' | sqlite3 $(TIMEZONES_SQLITE) > $(srcdir)/timezones.dump
 endif
 
-libs::
+tools::
 	$(NSINSTALL) -m 0644 $(TIMEZONES_SQLITE) $(FINAL_TARGET)
 
 libs-%:
 	$(MAKE) -C locales libs AB_CD=$* XPI_NAME=calendar-timezones USE_EXTENSION_MANIFEST=1
 
 include $(topsrcdir)/config/rules.mk