Move mail back to topsrcdir

2 years ago · df1eab4981
1505 changed files with 35 additions and 35 deletions
--- a/calendar/lightning/build/universal.mk
+++ b/calendar/lightning/build/universal.mk
@ -17,7 +17,7 @@ DEPTH = $(OBJDIR)
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/platform/toolkit/mozapps/installer/package-name.mk

-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/projects/mail/config/version.txt)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/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)

--- a/calendar/lightning/versions.mk
+++ b/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)/projects/mail/config/version.txt)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
 SEAMONKEY_VERSION := "2.49"

 ifdef MOZ_SUITE
--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@ -4,7 +4,7 @@

 XPI_PKGNAME = calendar-timezones-$(TIMEZONES_VERSION)

-THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/projects/mail/config/version.txt)
+THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/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)
--- a/projects/mail/Makefile.in
+++ b/projects/mail/Makefile.in
--- a/projects/mail/README.html
+++ b/projects/mail/README.html
--- a/projects/mail/app.mozbuild
+++ b/projects/mail/app.mozbuild
@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    DIRS += ['/projects/mail/components']
+    DIRS += ['/mail/components']

 include('/communicator/communicator.mozbuild')

@ -15,4 +15,4 @@ DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]

 # Never add tier dirs after mail because they apparently won't get
 # packaged properly on Mac.
-DIRS += ['/projects/mail']
+DIRS += ['/mail']
--- a/projects/mail/app/Makefile.in
+++ b/projects/mail/app/Makefile.in
--- a/projects/mail/app/application.ini
+++ b/projects/mail/app/application.ini
--- a/projects/mail/app/blocklist/Makefile.in
+++ b/projects/mail/app/blocklist/Makefile.in
--- a/projects/mail/app/blocklist/addons.inc.xml
+++ b/projects/mail/app/blocklist/addons.inc.xml
--- a/projects/mail/app/blocklist/blocklist.xml
+++ b/projects/mail/app/blocklist/blocklist.xml
--- a/projects/mail/app/blocklist/graphics.inc.xml
+++ b/projects/mail/app/blocklist/graphics.inc.xml
--- a/projects/mail/app/blocklist/moz.build
+++ b/projects/mail/app/blocklist/moz.build
--- a/projects/mail/app/blocklist/plugins.inc.xml
+++ b/projects/mail/app/blocklist/plugins.inc.xml
--- a/projects/mail/app/icons/windows/abcardWindow.ico
+++ b/projects/mail/app/icons/windows/abcardWindow.ico
--- a/projects/mail/app/icons/windows/addressbookWindow.ico
+++ b/projects/mail/app/icons/windows/addressbookWindow.ico
--- a/projects/mail/app/icons/windows/msgcomposeWindow.ico
+++ b/projects/mail/app/icons/windows/msgcomposeWindow.ico
--- a/projects/mail/app/macbuild/Contents/Info.plist.in
+++ b/projects/mail/app/macbuild/Contents/Info.plist.in
--- a/projects/mail/app/macbuild/Contents/MacOS-files-copy.in
+++ b/projects/mail/app/macbuild/Contents/MacOS-files-copy.in
--- a/projects/mail/app/macbuild/Contents/MacOS-files.in
+++ b/projects/mail/app/macbuild/Contents/MacOS-files.in
--- a/projects/mail/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
+++ b/projects/mail/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
--- a/projects/mail/app/module.ver
+++ b/projects/mail/app/module.ver
--- a/projects/mail/app/moz.build
+++ b/projects/mail/app/moz.build
--- a/projects/mail/app/nsMailApp.cpp
+++ b/projects/mail/app/nsMailApp.cpp
--- a/projects/mail/app/png.py
+++ b/projects/mail/app/png.py
--- a/projects/mail/app/png2ico.py
+++ b/projects/mail/app/png2ico.py
--- a/projects/mail/app/profile/all-thunderbird.js
+++ b/projects/mail/app/profile/all-thunderbird.js
--- a/projects/mail/app/profile/channel-prefs.js
+++ b/projects/mail/app/profile/channel-prefs.js
--- a/projects/mail/app/profile/mimeTypes.rdf
+++ b/projects/mail/app/profile/mimeTypes.rdf
--- a/projects/mail/app/profile/moz.build
+++ b/projects/mail/app/profile/moz.build
--- a/projects/mail/app/profile/prefs.js
+++ b/projects/mail/app/profile/prefs.js
--- a/projects/mail/app/splash.rc
+++ b/projects/mail/app/splash.rc
--- a/projects/mail/app/thunderbird.exe.manifest
+++ b/projects/mail/app/thunderbird.exe.manifest
--- a/projects/mail/base/content/ABSearchDialog.js
+++ b/projects/mail/base/content/ABSearchDialog.js
--- a/projects/mail/base/content/ABSearchDialog.xul
+++ b/projects/mail/base/content/ABSearchDialog.xul
--- a/projects/mail/base/content/EdSpellCheckOverlay.js
+++ b/projects/mail/base/content/EdSpellCheckOverlay.js
--- a/projects/mail/base/content/EdSpellCheckOverlay.xul
+++ b/projects/mail/base/content/EdSpellCheckOverlay.xul
--- a/projects/mail/base/content/FilterListDialog.js
+++ b/projects/mail/base/content/FilterListDialog.js
--- a/projects/mail/base/content/FilterListDialog.xul
+++ b/projects/mail/base/content/FilterListDialog.xul
--- a/projects/mail/base/content/SearchDialog.js
+++ b/projects/mail/base/content/SearchDialog.js
--- a/projects/mail/base/content/SearchDialog.xul
+++ b/projects/mail/base/content/SearchDialog.xul
--- a/projects/mail/base/content/aboutDialog.css
+++ b/projects/mail/base/content/aboutDialog.css
--- a/projects/mail/base/content/aboutDialog.js
+++ b/projects/mail/base/content/aboutDialog.js
--- a/projects/mail/base/content/aboutDialog.xul
+++ b/projects/mail/base/content/aboutDialog.xul
--- a/projects/mail/base/content/aboutRights.xhtml
+++ b/projects/mail/base/content/aboutRights.xhtml
--- a/projects/mail/base/content/baseMenuOverlay.xul
+++ b/projects/mail/base/content/baseMenuOverlay.xul
--- a/projects/mail/base/content/browserRequest.js
+++ b/projects/mail/base/content/browserRequest.js
--- a/projects/mail/base/content/browserRequest.xul
+++ b/projects/mail/base/content/browserRequest.xul
--- a/projects/mail/base/content/charsetOverlay.xul
+++ b/projects/mail/base/content/charsetOverlay.xul
--- a/projects/mail/base/content/commandglue.js
+++ b/projects/mail/base/content/commandglue.js
--- a/projects/mail/base/content/composerOverlay.css
+++ b/projects/mail/base/content/composerOverlay.css
--- a/projects/mail/base/content/configEditorOverlay.xul
+++ b/projects/mail/base/content/configEditorOverlay.xul
--- a/projects/mail/base/content/contentAreaClick.js
+++ b/projects/mail/base/content/contentAreaClick.js
--- a/projects/mail/base/content/customizeToolbarOverlay.xul
+++ b/projects/mail/base/content/customizeToolbarOverlay.xul
--- a/projects/mail/base/content/downloadsOverlay.xul
+++ b/projects/mail/base/content/downloadsOverlay.xul
--- a/projects/mail/base/content/editContactOverlay.js
+++ b/projects/mail/base/content/editContactOverlay.js
--- a/projects/mail/base/content/editContactOverlay.xul
+++ b/projects/mail/base/content/editContactOverlay.xul
--- a/projects/mail/base/content/extensionsOverlay.js
+++ b/projects/mail/base/content/extensionsOverlay.js
--- a/projects/mail/base/content/extensionsOverlay.xul
+++ b/projects/mail/base/content/extensionsOverlay.xul
--- a/projects/mail/base/content/extraCustomizeItems.xul
+++ b/projects/mail/base/content/extraCustomizeItems.xul
--- a/projects/mail/base/content/folderDisplay.js
+++ b/projects/mail/base/content/folderDisplay.js
--- a/projects/mail/base/content/folderPane.js
+++ b/projects/mail/base/content/folderPane.js
--- a/projects/mail/base/content/glodaFacetBindings.css
+++ b/projects/mail/base/content/glodaFacetBindings.css
--- a/projects/mail/base/content/glodaFacetBindings.xml
+++ b/projects/mail/base/content/glodaFacetBindings.xml
--- a/projects/mail/base/content/glodaFacetTab.js
+++ b/projects/mail/base/content/glodaFacetTab.js
--- a/projects/mail/base/content/glodaFacetView.css
+++ b/projects/mail/base/content/glodaFacetView.css
--- a/projects/mail/base/content/glodaFacetView.js
+++ b/projects/mail/base/content/glodaFacetView.js
--- a/projects/mail/base/content/glodaFacetView.xhtml
+++ b/projects/mail/base/content/glodaFacetView.xhtml
--- a/projects/mail/base/content/glodaFacetViewWrapper.xul
+++ b/projects/mail/base/content/glodaFacetViewWrapper.xul
--- a/projects/mail/base/content/glodaFacetVis.js
+++ b/projects/mail/base/content/glodaFacetVis.js
--- a/projects/mail/base/content/hiddenWindow.js
+++ b/projects/mail/base/content/hiddenWindow.js
--- a/projects/mail/base/content/hiddenWindow.xul
+++ b/projects/mail/base/content/hiddenWindow.xul
--- a/projects/mail/base/content/macMenuOverlay.xul
+++ b/projects/mail/base/content/macMenuOverlay.xul
--- a/projects/mail/base/content/macMessengerOverlay.js
+++ b/projects/mail/base/content/macMessengerOverlay.js
--- a/projects/mail/base/content/macMessengerOverlay.xul
+++ b/projects/mail/base/content/macMessengerOverlay.xul
--- a/projects/mail/base/content/mail-offline.js
+++ b/projects/mail/base/content/mail-offline.js
--- a/projects/mail/base/content/mail3PaneWindowCommands.js
+++ b/projects/mail/base/content/mail3PaneWindowCommands.js
--- a/projects/mail/base/content/mailCommands.js
+++ b/projects/mail/base/content/mailCommands.js
--- a/projects/mail/base/content/mailContextMenus.js
+++ b/projects/mail/base/content/mailContextMenus.js
--- a/projects/mail/base/content/mailCore.js
+++ b/projects/mail/base/content/mailCore.js
--- a/projects/mail/base/content/mailOverlay.xul
+++ b/projects/mail/base/content/mailOverlay.xul
--- a/projects/mail/base/content/mailTabs.js
+++ b/projects/mail/base/content/mailTabs.js
--- a/projects/mail/base/content/mailWidgets.xml
+++ b/projects/mail/base/content/mailWidgets.xml
--- a/projects/mail/base/content/mailWindow.js
+++ b/projects/mail/base/content/mailWindow.js
--- a/projects/mail/base/content/mailWindowOverlay.js
+++ b/projects/mail/base/content/mailWindowOverlay.js
--- a/projects/mail/base/content/mailWindowOverlay.xul
+++ b/projects/mail/base/content/mailWindowOverlay.xul
@ -2937,7 +2937,7 @@

 #ifdef XP_MACOSX
 <!-- Mac window menu -->
-#include ../../../../platform/toolkit/content/macWindowMenu.inc
+#include ../../../platform/toolkit/content/macWindowMenu.inc
 #endif

    <!-- Help -->
--- a/projects/mail/base/content/messageDisplay.js
+++ b/projects/mail/base/content/messageDisplay.js
--- a/projects/mail/base/content/messageWindow.js
+++ b/projects/mail/base/content/messageWindow.js
--- a/projects/mail/base/content/messageWindow.xul
+++ b/projects/mail/base/content/messageWindow.xul
--- a/projects/mail/base/content/messenger.css
+++ b/projects/mail/base/content/messenger.css
--- a/projects/mail/base/content/messenger.xul
+++ b/projects/mail/base/content/messenger.xul
--- a/projects/mail/base/content/msgHdrViewOverlay.css
+++ b/projects/mail/base/content/msgHdrViewOverlay.css
--- a/projects/mail/base/content/msgHdrViewOverlay.js
+++ b/projects/mail/base/content/msgHdrViewOverlay.js
--- a/projects/mail/base/content/msgHdrViewOverlay.xul
+++ b/projects/mail/base/content/msgHdrViewOverlay.xul
--- a/projects/mail/base/content/msgMail3PaneWindow.js
+++ b/projects/mail/base/content/msgMail3PaneWindow.js
--- a/projects/mail/base/content/msgPrintEngine.xul
+++ b/projects/mail/base/content/msgPrintEngine.xul
--- a/projects/mail/base/content/msgSelectOffline.xul
+++ b/projects/mail/base/content/msgSelectOffline.xul
--- a/projects/mail/base/content/msgViewNavigation.js
+++ b/projects/mail/base/content/msgViewNavigation.js
--- a/projects/mail/base/content/multimessageview.css
+++ b/projects/mail/base/content/multimessageview.css
--- a/projects/mail/base/content/multimessageview.js
+++ b/projects/mail/base/content/multimessageview.js