[MAIL] Move to projects/

calendar/lightning/build/universal.mk

@@ -17,7 +17,7 @@ DEPTH = $(OBJDIR)
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/mozilla/toolkit/mozapps/installer/package-name.mk
 
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/projects/mail/config/version.txt)
 LIGHTNING_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
 XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
 

calendar/lightning/versions.mk

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Lighting version number
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/projects/mail/config/version.txt)
 SEAMONKEY_VERSION := "2.49"
 
 ifdef MOZ_SUITE

calendar/timezones/Makefile.in

@@ -4,7 +4,7 @@
 
 XPI_PKGNAME = calendar-timezones-$(TIMEZONES_VERSION)
 
-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/projects/mail/config/version.txt)
 SEAMONKEY_VERSION := "2.49"
 CALENDAR_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
 TIMEZONES_VERSION := $(shell $(PYTHON) $(srcdir)/version.py)

mail/build.mk

@@ -1,43 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifndef COMM_BUILD
-installer:
-	@$(MAKE) -C mail/installer installer
-
-package:
-	@$(MAKE) -C mail/installer
-
-package-compare:
-	@$(MAKE) -C mail/installer package-compare
-
-stage-package:
-	@$(MAKE) -C mail/installer stage-package
-
-install::
-	@$(MAKE) -C mail/installer install
-
-source-package::
-	@$(MAKE) -C mail/installer source-package
-
-upload::
-	@$(MAKE) -C mail/installer upload
-ifdef MOZ_CALENDAR
-	@$(MAKE) -C calendar/lightning upload
-	@$(MAKE) -C calendar/providers/gdata upload
-endif
-
-source-upload::
-	@$(MAKE) -C mail/installer source-upload
-
-hg-bundle::
-	@$(MAKE) -C mail/installer hg-bundle
-
-l10n-check::
-	@$(MAKE) -C mail/locales l10n-check
-
-ifdef ENABLE_TESTS
-include $(topsrcdir)/../mail/testsuite-targets.mk
-endif
-endif

projects/mail/app.mozbuild

@@ -6,7 +6,7 @@
 include('/communicator/communicator.mozbuild')
 
 if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    DIRS += ['/mail/components']
+    DIRS += ['/projects/mail/components']
 
 include('/toolkit/toolkit.mozbuild')
 
@@ -17,4 +17,4 @@ DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
 # Never add tier dirs after mail because they apparently won't get
 # packaged properly on Mac.
-DIRS += ['/mail']
+DIRS += ['/projects/mail']

projects/mail/app/splash.rc

@@ -17,7 +17,7 @@ IDI_APPLICATION ICON THUNDERBIRD_ICO
 
 // For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
 #define IDI_MAILBIFF 32576
-IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
+IDI_MAILBIFF  ICON  "../../../mailnews/build/newmail.ico"
 
 // Windows taskbar icons
 #define IDI_WRITE_MESSAGE 32577

projects/mail/base/content/mailWindowOverlay.xul

@@ -2935,7 +2935,7 @@
 
 #ifdef XP_MACOSX
 <!-- Mac window menu -->
-#include ../../../mozilla/toolkit/content/macWindowMenu.inc
+#include ../../../../mozilla/toolkit/content/macWindowMenu.inc
 #endif
 
     <!-- Help -->