Make mail build

30 files changed, 76 insertions, 1075 deletions

diff --git a/apps/mail/Makefile.in b/apps/mail/Makefile.in
index aff768e05..9bc4c0e57 100644
--- a/apps/mail/Makefile.in
+++ b/apps/mail/Makefile.in
@@ -11,7 +11,7 @@ ifdef MAKENSISU
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
-	$(MAKE) -C installer/windows uninstaller
+	$(MAKE) -C installer uninstaller
 endif
 
 
diff --git a/apps/mail/app.mozbuild b/apps/mail/app.mozbuild
index 079b5f717..56ad461b3 100644
--- a/apps/mail/app.mozbuild
+++ b/apps/mail/app.mozbuild
@@ -6,10 +6,10 @@
 include('/xpfe/xpfe.mozbuild')
 
 if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    DIRS += ['/mail/components']
+    DIRS += ['/apps/mail/components']
 
 DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
 # Never add tier dirs after mail because they apparently won't get
 # packaged properly on Mac.
-DIRS += ['/mail']
\ No newline at end of file
+DIRS += ['/apps/mail']
\ No newline at end of file
diff --git a/apps/mail/app/moz.build b/apps/mail/app/moz.build
index c71a8696c..4c2798eb7 100644
--- a/apps/mail/app/moz.build
+++ b/apps/mail/app/moz.build
@@ -13,31 +13,15 @@ USE_LIBS += ['mozglue']
 SOURCES += ['nsMailApp.cpp']
 LOCAL_INCLUDES += [
     '!/build',
-    '/platform/system/runtime',
-    '/platform/xpcom/base',
-    '/platform/xpcom/build',
+    '/system/runtime',
+    '/xpcom/base',
+    '/xpcom/build',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     RCINCLUDE = 'splash.rc'
     DEFINES['MOZ_THUNDERBIRD'] = True
 
-if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
-    # For sandbox includes and the include dependencies those have
-    LOCAL_INCLUDES += [
-        '/platform/security/sandbox/chromium',
-        '/platform/security/sandbox/chromium-shim',
-    ]
-
-    USE_LIBS += [
-        'sandbox_s',
-    ]
-
-    DELAYLOAD_DLLS += [
-        'winmm.dll',
-        'user32.dll',
-    ]
-
 if CONFIG['_MSC_VER']:
     # Always enter a Windows program through wmain, whether or not we're
     # a console application.
diff --git a/apps/mail/app/profile/mimeTypes.rdf b/apps/mail/app/profile/mimeTypes.rdf
deleted file mode 100644
index 10edce3ce..000000000
--- a/apps/mail/app/profile/mimeTypes.rdf
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.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/. -->
-
-
-<!--
- This file is used as a persistent data store for helper application
- information about both MIME type and protocol scheme helpers.
-
- The root of the data are the two containers
- <RDF:Seq about="urn:mimetypes:root"/> and <RDF:Seq about="urn:schemes:root"/>.
-
- These contain one <RDF:li/> entry per MIME type/protocol.  Each <RDF:li/> entry
- corresponds to a "urn:<class>:<type>" resource, where <class> is either
- "mimetype" or "scheme" and <type> is either a MIME type in "major/minor" format
- or a scheme.  For example, for HTML we would have "urn:mimetype:text/html",
- while for mailto: we would have "urn:scheme:mailto".
-
- Typically, this resource will be in the <RDF:Description/> node which has the
- corresponding "about" attribute.
-
- Each "urn:<class>:<type>" resource can have the following properties:
-
-   NC:Value - the MIME type or scheme string
-   NC:editable - a "true" or "false" depending on whether this entry is
-                 editable
-   NC:description - a description of the type ("HTML Document" for text/html)
-   NC:fileExtensions - for MIME types, there will be one of these properties
-                       per extension that corresponds to this MIME type,
-                       each one having a single extension as its value.
-   NC:handlerProp - the way the type should be handled.  This corresponds to a
-                    "urn:<class>:handler:<type>" resource.  Eg, the way HTML is
-                    handled would be stored in the
-                    "urn:mimetype:handler:text/html" resource.
-
- Each "urn:<class>:handler:<type>" resource can have the following properties:
-
-   NC:useSystemDefault - "true" if we should handle per default OS setting,
-                          "false" or not set otherwise
-   NC:saveToDisk - "true" if the data should be saved to disk, "false" or not
-                   set otherwise.
-     (Note - if both of these are false, that means "open in helper app")
-   NC:alwaysAsk - "true" if the user should always be prompted before handling
-                  data of this type, false otherwise.
-   NC:externalApplication - the preferred helper application to use for this
-                            type.  This corresponds to a
-                            "urn:<class>:externalApplication:<type>" resource.
-   NC:possibleApplication - a helper application that can be used for this type.
-                            Since there can be multiple possible applications,
-                            there can be multiple assertions in the graph with
-                            this property for a given handler resource.
-
- Each "urn:<class>:externalApplication:<type>" resource, and each resource
- that represents a possible application, can have the following property:
-
-   NC:prettyName - the "pretty name" of the application ("Acrobat Reader" for
-                   /usr/bin/acroread, eg).
-
- If the resource represents a local application, then it can have the following
- property:
-
-   NC:path - the path to the application on the local filesystem, for example
-             /usr/bin/test or C:\windows\system32\cmd.exe.
-
- If the resource represents a web application, then it can have the following
- property:
-
-   NC:uriTemplate - a URI pointing to the web application to which the type
-                    should be handed off, with %s in the template representing
-                    the place where the content should be inserted. For example,
-                    here is a URI template for a service that lets you email
-                    an address in a mailto: link:
-                      http://www.example.com/sendmail?link=%s
--->
-			
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:NC="http://home.netscape.com/NC-rdf#">
-
-  <RDF:Description about="urn:mimetypes"> 
-    <NC:MIME-types> 
-      <RDF:Seq about="urn:mimetypes:root"> 
-      </RDF:Seq>
-    </NC:MIME-types> 
-  </RDF:Description> 
-</RDF:RDF>
diff --git a/apps/mail/app/profile/moz.build b/apps/mail/app/profile/moz.build
index dbf9ad573..c3f0f02f7 100644
--- a/apps/mail/app/profile/moz.build
+++ b/apps/mail/app/profile/moz.build
@@ -14,6 +14,3 @@ JS_PREFERENCE_PP_FILES += [
     'application.js',
 ]
 
-FINAL_TARGET_FILES.defaults.profile += [
-    'mimeTypes.rdf',
-]
diff --git a/apps/mail/app/splash.rc b/apps/mail/app/splash.rc
index 17e00900c..8f6a29cb8 100644
--- a/apps/mail/app/splash.rc
+++ b/apps/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  "../../../platform/mailnews/build/newmail.ico"
+IDI_MAILBIFF  ICON  "../../../mailnews/build/newmail.ico"
 
 // Windows taskbar icons
 #define IDI_WRITE_MESSAGE 32577
diff --git a/apps/mail/build.mk b/apps/mail/build.mk
index f62405ad4..1b2de44ee 100644
--- a/apps/mail/build.mk
+++ b/apps/mail/build.mk
@@ -2,18 +2,31 @@
 # 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/.
 
+MAKE_INSTALLER_TARGET = $(MAKE) -C apps/mail/installer
+
 installer:
-	@$(MAKE) -C mail/installer installer
+	@$(MAKE_INSTALLER_TARGET) $@
+
+install:
+	@$(MAKE_INSTALLER_TARGET) $@
 
 package:
-	@$(MAKE) -C mail/installer make-archive
+	@$(MAKE_INSTALLER_TARGET) archive
 
-mozpackage:
-	@$(MAKE) -C mail/installer make-package
+buildsymbols:
+	@$(MAKE_INSTALLER_TARGET) symbols
 
-stage-package:
-	@$(MAKE) -C mail/installer stage-package make-buildinfo-file
+mar-package:
+	@$(MAKE_INSTALLER_TARGET) update
 
-install::
-	@$(MAKE) -C mail/installer install
+mar-package-bz2:
+	@$(MAKE_INSTALLER_TARGET) update-bz2
 
+l10n-package:
+	@$(MAKE_INSTALLER_TARGET) locale
+
+theme-package:
+	@$(MAKE_INSTALLER_TARGET) skin
+
+stage-package:
+	@$(MAKE_INSTALLER_TARGET) $@
diff --git a/apps/mail/components/smime/jar.mn b/apps/mail/components/smime/jar.mn
index 6685e42f7..051bd1461 100644
--- a/apps/mail/components/smime/jar.mn
+++ b/apps/mail/components/smime/jar.mn
@@ -14,16 +14,16 @@ messenger.jar:
    content/messenger-smime/msgCompSMIMEOverlay.js                   (content/msgCompSMIMEOverlay.js)
    content/messenger-smime/msgHdrViewSMIMEOverlay.js                (content/msgHdrViewSMIMEOverlay.js)
    content/messenger-smime/msgHdrViewSMIMEOverlay.xul               (content/msgHdrViewSMIMEOverlay.xul)
-   content/messenger/am-smime.xul                                   (/platform/mailnews/extensions/smime/content/am-smime.xul)
-   content/messenger/am-smime.js                                    (/platform/mailnews/extensions/smime/content/am-smime.js)
-   content/messenger/am-smimeIdentityEditOverlay.xul                (/platform/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul)
-   content/messenger/am-smimeOverlay.xul                            (/platform/mailnews/extensions/smime/content/am-smimeOverlay.xul)
-   content/messenger/certpicker.js                                  (/platform/mailnews/extensions/smime/content/certpicker.js)
-   content/messenger/certpicker.xul                                 (/platform/mailnews/extensions/smime/content/certpicker.xul)
-   content/messenger-smime/msgReadSMIMEOverlay.js                   (/platform/mailnews/extensions/smime/content/msgReadSMIMEOverlay.js)
-   content/messenger-smime/msgCompSecurityInfo.js                   (/platform/mailnews/extensions/smime/content/msgCompSecurityInfo.js)
-   content/messenger-smime/msgCompSecurityInfo.xul                  (/platform/mailnews/extensions/smime/content/msgCompSecurityInfo.xul)
-   content/messenger-smime/msgReadSecurityInfo.xul                  (/platform/mailnews/extensions/smime/content/msgReadSecurityInfo.xul)
-   content/messenger-smime/msgReadSecurityInfo.js                   (/platform/mailnews/extensions/smime/content/msgReadSecurityInfo.js)
-   content/messenger-smime/certFetchingStatus.xul                   (/platform/mailnews/extensions/smime/content/certFetchingStatus.xul)
-   content/messenger-smime/certFetchingStatus.js                    (/platform/mailnews/extensions/smime/content/certFetchingStatus.js)
+   content/messenger/am-smime.xul                                   (/mailnews/extensions/smime/content/am-smime.xul)
+   content/messenger/am-smime.js                                    (/mailnews/extensions/smime/content/am-smime.js)
+   content/messenger/am-smimeIdentityEditOverlay.xul                (/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul)
+   content/messenger/am-smimeOverlay.xul                            (/mailnews/extensions/smime/content/am-smimeOverlay.xul)
+   content/messenger/certpicker.js                                  (/mailnews/extensions/smime/content/certpicker.js)
+   content/messenger/certpicker.xul                                 (/mailnews/extensions/smime/content/certpicker.xul)
+   content/messenger-smime/msgReadSMIMEOverlay.js                   (/mailnews/extensions/smime/content/msgReadSMIMEOverlay.js)
+   content/messenger-smime/msgCompSecurityInfo.js                   (/mailnews/extensions/smime/content/msgCompSecurityInfo.js)
+   content/messenger-smime/msgCompSecurityInfo.xul                  (/mailnews/extensions/smime/content/msgCompSecurityInfo.xul)
+   content/messenger-smime/msgReadSecurityInfo.xul                  (/mailnews/extensions/smime/content/msgReadSecurityInfo.xul)
+   content/messenger-smime/msgReadSecurityInfo.js                   (/mailnews/extensions/smime/content/msgReadSecurityInfo.js)
+   content/messenger-smime/certFetchingStatus.xul                   (/mailnews/extensions/smime/content/certFetchingStatus.xul)
+   content/messenger-smime/certFetchingStatus.js                    (/mailnews/extensions/smime/content/certFetchingStatus.js)
diff --git a/apps/mail/components/steel/steelApplication.js b/apps/mail/components/steel/steelApplication.js
index 60333d81e..9c0fa29f9 100644
--- a/apps/mail/components/steel/steelApplication.js
+++ b/apps/mail/components/steel/steelApplication.js
@@ -30,7 +30,7 @@ var ApplicationFactory = {
   }
 };
 
-#include ../../../platform/components/exthelper/extApplication.js
+#include ../../../../components/exthelper/extApplication.js
 
 function Application() {
   Deprecated.warning("STEEL is deprecated, you should use AppConstants.jsm or Services.jsm.",
diff --git a/apps/mail/confvars.sh b/apps/mail/confvars.sh
index 2eb93fcb7..f1087e432 100644
--- a/apps/mail/confvars.sh
+++ b/apps/mail/confvars.sh
@@ -10,7 +10,7 @@ MOZ_APP_BASENAME=Interlink
 MOZ_APP_DISPLAYNAME=$MOZ_APP_BASENAME
 MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 MOZ_APP_STATIC_INI=1
-MOZ_APP_VERSION=`$PYTHON ${_topsrcdir}/../build/version2k.py --version ${_topsrcdir}/../mail/config/version.txt`
+MOZ_APP_VERSION=`$PYTHON ${_topsrcdir}/build/version2k.py --version ${_topsrcdir}/apps/mail/config/version.txt`
 MOZ_APP_VERSION_DISPLAY=$MOZ_APP_VERSION
 MOZ_BRANDING_DIRECTORY=mail/branding
 MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/interlink/release
diff --git a/apps/mail/installer/Makefile.in b/apps/mail/installer/Makefile.in
index b4de2ef7c..a5b1d6e9d 100644
--- a/apps/mail/installer/Makefile.in
+++ b/apps/mail/installer/Makefile.in
@@ -3,194 +3,43 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 STANDALONE_MAKEFILE := 1
-# DIST_SUBDIR := mail  # Not sure why TB is not using this
 
 include $(topsrcdir)/config/rules.mk
 
+# MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
+NO_PKG_DEFAULT_FILES = 1
+NON_OMNIJAR_FILES = defaults/profile/panels.rdf
 
-MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
-# Some files have been already bundled with xulrunner
-ifndef SYSTEM_LIBXUL
-MOZ_PKG_FATAL_WARNINGS = 1
-endif
-MOZ_PKG_DUPEFLAGS = \
-	-f $(srcdir)/allowed-dupes.mn \
-	-f $(MOZILLA_DIR)/browser/installer/allowed-dupes.mn \
-	$(NULL)
-
-MOZ_NONLOCALIZED_PKG_LIST = \
-	xpcom \
-	mail \
-	newsblog \
-	offline \
-	$(NULL)
-
-MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
-
-DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
-
-ifdef NIGHTLY_BUILD
-DEFINES += -DNIGHTLY_BUILD=1
-endif
-
-ifdef MOZ_CALENDAR
-DEFINES += -DMOZ_CALENDAR=1
-endif
-
-ifdef MOZ_DEBUG
-DEFINES += -DMOZ_DEBUG=1
-endif
-
-ifdef MOZ_ENABLE_GNOME_COMPONENT
-DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
-endif
-
-ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
-DEFINES += -DMOZ_GTK=1
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
-DEFINES += -DMOZ_GTK3=1
-endif
-endif
-
-ifdef _MSC_VER
-DEFINES += -D_MSC_VER=$(_MSC_VER)
-endif
-
-ifdef MOZ_SYSTEM_NSPR
-DEFINES += -DMOZ_SYSTEM_NSPR=1
-endif
-
-ifdef MOZ_SYSTEM_NSS
-DEFINES += -DMOZ_SYSTEM_NSS=1
-endif
-
-ifdef NSS_DISABLE_DBM
-DEFINES += -DNSS_DISABLE_DBM=1
-endif
-
-DEFINES += -DJAREXT=
-
-ifdef MOZ_ANGLE_RENDERER
-DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
-ifdef MOZ_D3DCOMPILER_VISTA_DLL
-DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
-endif
-ifdef MOZ_D3DCOMPILER_XP_DLL
-DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
-endif
-endif
-
-ifdef MOZ_UPDATER
-DEFINES += -DMOZ_UPDATER=1
-endif
-
-DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
-
-# Set MSVC dlls version to package, if any.
-ifdef MOZ_NO_DEBUG_RTL
-ifdef WIN32_REDIST_DIR
-DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
-DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
-DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
-endif
-ifdef WIN_UCRT_REDIST_DIR
-DEFINES += -DMOZ_PACKAGE_WIN_UCRT_DLLS=1
-endif
-endif
-
-ifneq (,$(filter WINNT Android,$(OS_TARGET)))
-DEFINES += -DMOZ_SHARED_MOZGLUE=1
-endif
-
-ifdef NECKO_WIFI
-DEFINES += -DNECKO_WIFI
-endif
-
-ifdef GKMEDIAS_SHARED_LIBRARY
-DEFINES += -DGKMEDIAS_SHARED_LIBRARY
-endif
+include $(MOZILLA_SRCDIR)/system/packager/base.mk
+include $(MOZILLA_SRCDIR)/system/packager/packager.mk
 
+ifeq ($(OS_ARCH),WINNT)
 ifdef MAKENSISU
-DEFINES += -DHAVE_MAKENSISU=1
-endif
-
-ifdef MOZ_PKG_MANIFEST_P
-MOZ_PKG_MANIFEST = package-manifest
-
-$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
-	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
-endif
-
-NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
 
-INSTALL_SDK = 1
-
-include $(MOZILLA_SRCDIR)/system/installer/signing.mk
-include $(MOZILLA_SRCDIR)/system/installer/packager-uxp.mk
-
-ifeq (bundle, $(MOZ_FS_LAYOUT))
-BINPATH = $(_BINPATH)
-DEFINES += -DAPPNAME=$(_APPNAME)
-else
-# Every platform just winds up in dist/bin
-BINPATH = bin
-endif
-DEFINES += -DBINPATH=$(BINPATH)
-
-RESPATH = $(BINPATH)
-
-LPROJ_ROOT = $(firstword $(subst -, ,$(AB_CD)))
-DEFINES += -DLPROJ_ROOT=$(LPROJ_ROOT)
-
-DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
-ifdef MOZ_SYSTEM_ICU
-DEFINES += -DMOZ_SYSTEM_ICU
-endif
-ifdef MOZ_ICU_DATA_ARCHIVE
-DEFINES += -DMOZ_ICU_DATA_ARCHIVE
-endif
-DEFINES += -DMOZ_ICU_DBG_SUFFIX=$(MOZ_ICU_DBG_SUFFIX)
-DEFINES += -DICU_DATA_FILE=$(ICU_DATA_FILE)
-ifdef CLANG_CXX
-DEFINES += -DCLANG_CXX
-endif
-ifdef CLANG_CL
-DEFINES += -DCLANG_CL
-endif
-ifeq (x86,$(CPU_ARCH))
-ifdef _MSC_VER
-ifndef CLANG_CL
-DEFINES += -DWOW_HELPER
-endif
-endif
-endif
-
-libs::
-	$(MAKE) -C $(DEPTH)/mail/locales langpack
+INSTALLER_FILES += \
+	app.tag \
+	src/installer.nsi \
+	src/uninstaller.nsi \
+	src/shared.nsh \
+	$(NULL)
 
-ifeq (WINNT,$(OS_ARCH))
-PKGCOMP_FIND_OPTS =
-else
-PKGCOMP_FIND_OPTS = -L
-endif
-FINDPATH=bin
+INSTALLER_DEFINES = src/defines.nsi.in
 
-package-compare:: $(MOZ_PKG_MANIFEST)
-ifdef MOZ_PKG_MANIFEST_P
-	cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt
-	grep '^$(BINPATH)' $(MOZ_PKG_MANIFEST) | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
-	-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
-	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
-endif
+BRANDING_FILES += \
+	branding.nsi \
+	wizHeader.bmp \
+	wizHeaderRTL.bmp \
+	wizWatermark.bmp \
+	$(NULL)
 
-installer::
-ifdef INSTALLER_DIR
-	$(MAKE) -C $(INSTALLER_DIR)
-endif
+$(CONFIG_DIR)/setup.exe::
+	$(PYTHON) $(MOZINST_PATH)/nsis/preprocess-locale.py \
+	  --preprocess-locale $(MOZILLA_SRCDIR) \
+	  $(topsrcdir)/apps/mail/installer/locale $(AB_CD) $(CONFIG_DIR)
+	$(PYTHON) $(MOZINST_PATH)/nsis/preprocess-locale.py \
+	  --convert-utf8-utf16le $(DIST)/branding/license.txt $(CONFIG_DIR)/license.txt
 
-# The comm-* source stamp is already there.
-PLATFORM_SOURCE_STAMP = $(firstword $(shell hg -R "$(MOZILLA_SRCDIR)" parent --template="{node}\n" 2>/dev/null))
-PLATFORM_SOURCE_REPO = $(shell hg -R "$(MOZILLA_SRCDIR)" showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/https:/")
-make-sourcestamp-file::
-	@echo "$(PLATFORM_SOURCE_REPO)/rev/$(PLATFORM_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)
+include $(MOZILLA_SRCDIR)/system/packager/installer.mk
+endif # MAKENSISU
+endif
\ No newline at end of file
diff --git a/apps/mail/installer/allowed-dupes.mn b/apps/mail/installer/allowed-dupes.mn
deleted file mode 100644
index e9995391a..000000000
--- a/apps/mail/installer/allowed-dupes.mn
+++ /dev/null
@@ -1,85 +0,0 @@
-# Known duplicate files
-# This file is ideally removed, but some existing files will be grandfathered in
-# See bug 1303184, bug 1313670
-#
-# PLEASE DO NOT ADD MORE EXCEPTIONS TO THIS LIST
-#
-
-# mail
-chrome/classic/skin/classic/messenger/icons/new-mail-alert.png
-chrome/messenger/content/branding/icon48.png
-chrome/messenger/content/messenger/cloudfile/Box/management.js
-chrome/messenger/content/messenger/cloudfile/Hightail/management.js
-chrome/devtools/modules/devtools/client/themes/splitters.css
-chrome/devtools/skin/splitters.css
-chrome/icons/default/default48.png
-# calendar addon
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/imip.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/lightning/imip.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-invitations-dialog.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-invitations-dialog.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/lightning-widgets.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/lightning/lightning-widgets.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/lightning/accountCentral.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/lightning/accountCentral.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-daypicker.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-daypicker.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-alarm-dialog.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-alarm-dialog.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/calendar-management.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-management.css
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFilter.js
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calFilter.js
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calUtils.js
-distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calUtils.js
-
-# Variants of paths in mozilla/browser/installer/allowed-dupes.mn:
-# bug 658850
-thunderbird
-thunderbird-bin
-# devtools reduction is bug 1311178
-chrome/devtools/content/dom/content/dom-view.css
-chrome/devtools/content/dom/dom.html
-chrome/devtools/content/dom/main.js
-chrome/devtools/content/framework/toolbox-options.js
-chrome/devtools/content/inspector/fonts/fonts.js
-chrome/devtools/content/inspector/inspector.xhtml
-chrome/devtools/content/memory/initializer.js
-chrome/devtools/content/projecteditor/lib/helpers/readdir.js
-chrome/devtools/content/shared/frame-script-utils.js
-chrome/devtools/content/shared/theme-switching.js
-chrome/devtools/modules/devtools/client/dom/content/dom-view.css
-chrome/devtools/modules/devtools/client/dom/dom.html
-chrome/devtools/modules/devtools/client/dom/main.js
-chrome/devtools/modules/devtools/client/framework/toolbox-options.js
-chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js
-chrome/devtools/modules/devtools/client/inspector/inspector.xhtml
-chrome/devtools/modules/devtools/client/jsonview/css/controls.png
-chrome/devtools/modules/devtools/client/jsonview/css/controls@2x.png
-chrome/devtools/modules/devtools/client/memory/initializer.js
-chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/readdir.js
-chrome/devtools/modules/devtools/client/shared/frame-script-utils.js
-chrome/devtools/modules/devtools/client/shared/theme-switching.js
-chrome/devtools/modules/devtools/client/themes/common.css
-chrome/devtools/modules/devtools/client/themes/toolbars.css
-chrome/devtools/modules/devtools/client/themes/variables.css
-chrome/devtools/skin/common.css
-chrome/devtools/skin/toolbars.css
-chrome/devtools/skin/images/command-scratchpad.svg
-chrome/devtools/skin/images/controls.png
-chrome/devtools/skin/images/controls@2x.png
-chrome/devtools/skin/images/debugger-blackbox.svg
-chrome/devtools/skin/images/debugger-prettyprint.svg
-chrome/devtools/skin/images/filetypes/store.svg
-chrome/devtools/skin/images/itemToggle.svg
-chrome/devtools/skin/images/security-state-broken.svg
-chrome/devtools/skin/images/security-state-local.svg
-chrome/devtools/skin/images/security-state-secure.svg
-chrome/devtools/skin/images/tabs-icon.svg
-chrome/devtools/skin/images/tool-scratchpad.svg
-chrome/devtools/skin/images/tool-storage.svg
-chrome/devtools/skin/images/tool-styleeditor.svg
-chrome/devtools/skin/promisedebugger.css
-chrome/devtools/skin/variables.css
-modules/devtools/client/framework/gDevTools.jsm
-modules/devtools/gDevTools.jsm
diff --git a/apps/mail/installer/app.tag b/apps/mail/installer/app.tag
new file mode 100644
index 000000000..22c6f1af5
--- /dev/null
+++ b/apps/mail/installer/app.tag
@@ -0,0 +1,4 @@
+;!@Install@!UTF-8!
+Title="Setup"
+RunProgram="setup.exe"
+;!@InstallEnd@!
\ No newline at end of file
diff --git a/apps/mail/locales/en-US/installer/custom.properties b/apps/mail/installer/locale/custom.properties
index 3927f604a..3927f604a 100644
--- a/apps/mail/locales/en-US/installer/custom.properties
+++ b/apps/mail/installer/locale/custom.properties
diff --git a/apps/mail/locales/en-US/installer/mui.properties b/apps/mail/installer/locale/mui.properties
index 68841d5e3..68841d5e3 100644
--- a/apps/mail/locales/en-US/installer/mui.properties
+++ b/apps/mail/installer/locale/mui.properties
diff --git a/apps/mail/locales/en-US/installer/override.properties b/apps/mail/installer/locale/override.properties
index bb8cac738..bb8cac738 100644
--- a/apps/mail/locales/en-US/installer/override.properties
+++ b/apps/mail/installer/locale/override.properties
diff --git a/apps/mail/installer/moz.build b/apps/mail/installer/moz.build
deleted file mode 100644
index 89251dc39..000000000
--- a/apps/mail/installer/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: set filetype=python:
-# 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/.
diff --git a/apps/mail/installer/package-manifest.in b/apps/mail/installer/package-manifest.in
deleted file mode 100644
index 6f9624795..000000000
--- a/apps/mail/installer/package-manifest.in
+++ /dev/null
@@ -1,297 +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/.
-
-; Package file for the MailNews build.
-;
-; Packaging manifest is used to copy files from dist/bin
-; to the staging directory.
-; Some other files are built in the staging directory directly,
-; so they will be implicitly packaged too.
-;
-; File format:
-;
-; [] designates a toplevel component. Example: [xpcom]
-; * wildcard support to recursively copy the entire directory
-; ; file comment
-;
-
-#filter substitution
-
-[@AB_CD@]
-@BINPATH@/chrome/@AB_CD@@JAREXT@
-@BINPATH@/chrome/@AB_CD@.manifest
-@BINPATH@/dictionaries/*
-@BINPATH@/searchplugins/*
-@BINPATH@/fonts/*
-@BINPATH@/hyphenation/*
-#ifdef HAVE_MAKENSISU
-@BINPATH@/uninstall/helper.exe
-#endif
-#ifdef MOZ_UPDATER
-@BINPATH@/updater.ini
-#endif
-@BINPATH@/license.txt
-
-[xpcom]
-@BINPATH@/dependentlibs.list
-#ifdef MOZ_SHARED_MOZGLUE
-@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
-#endif
-#ifndef MOZ_STATIC_JS
-@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
-#endif
-#ifdef GKMEDIAS_SHARED_LIBRARY
-@BINPATH@/@DLL_PREFIX@gremedia@DLL_SUFFIX@
-#endif
-#ifdef MOZ_DMD
-@BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@
-#endif
-#ifndef MOZ_SYSTEM_NSPR
-#ifndef MOZ_FOLD_LIBS
-@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-#endif
-#endif
-@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
-@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
-#ifdef XP_WIN32
-@BINPATH@/plugin-hang-ui@BIN_SUFFIX@
-#if MOZ_PACKAGE_MSVC_DLLS
-@BINPATH@/@MSVC_C_RUNTIME_DLL@
-@BINPATH@/@MSVC_CXX_RUNTIME_DLL@
-#endif
-#if MOZ_PACKAGE_WIN_UCRT_DLLS
-@BINPATH@/api-ms-win-*.dll
-@BINPATH@/ucrtbase.dll
-#endif
-#endif
-#ifdef MOZ_ICU_DATA_ARCHIVE
-@BINPATH@/@ICU_DATA_FILE@
-#endif
-#ifdef MOZ_GTK3
-@BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
-@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
-#endif
-
-; Optional RSS extension
-[newsblog]
-@BINPATH@/chrome/newsblog@JAREXT@
-@BINPATH@/chrome/newsblog.manifest
-
-[mail]
-#ifndef XP_UNIX
-@BINPATH@/@MOZ_APP_NAME@.exe
-@BINPATH@/thunderbird.VisualElementsManifest.xml
-@BINPATH@/VisualElements/VisualElements_150.png
-@BINPATH@/VisualElements/VisualElements_70.png
-#else
-@BINPATH@/@MOZ_APP_NAME@-bin
-@BINPATH@/@MOZ_APP_NAME@
-#endif
-@BINPATH@/application.ini
-#ifdef MOZ_UPDATER
-@BINPATH@/update-settings.ini
-#endif
-@BINPATH@/@DLL_PREFIX@lgplmedia@DLL_SUFFIX@
-@BINPATH@/blocklist.xml
-@BINPATH@/platform.ini
-#ifndef MOZ_SYSTEM_SQLITE
-@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-#endif
-#ifdef XP_UNIX
-@BINPATH@/run-mozilla.sh
-#ifdef MOZ_UPDATER
-@BINPATH@/icons/*.png
-#endif
-#endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Mail Specific Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-@BINPATH@/defaults/messenger/mailViews.dat
-@BINPATH@/defaults/profile/prefs.js
-@BINPATH@/defaults/profile/mimeTypes.rdf
-
-@BINPATH@/isp/*
-
-@BINPATH@/components/*
-@BINPATH@/chrome/toolkit@JAREXT@
-@BINPATH@/chrome/toolkit.manifest
-@BINPATH@/chrome/comm@JAREXT@
-@BINPATH@/chrome/comm.manifest
-@BINPATH@/chrome/messenger@JAREXT@
-@BINPATH@/chrome/messenger.manifest
-#ifndef XP_UNIX
-@BINPATH@/chrome/icons/default/abcardWindow.ico
-@BINPATH@/chrome/icons/default/addressbookWindow.ico
-@BINPATH@/chrome/icons/default/messengerWindow.ico
-@BINPATH@/chrome/icons/default/msgcomposeWindow.ico
-#else
-@BINPATH@/chrome/icons/default/*.png
-#endif
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-;@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
-;@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon64.png
-@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
-#ifdef MOZ_CALENDAR
-@BINPATH@/extensions/*.xpi
-#endif
-
-; Gloda
-@BINPATH@/chrome/gloda@JAREXT@
-@BINPATH@/chrome/gloda.manifest
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Mail Extensions (smime, etc.)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-#ifdef MOZ_MAPI_SUPPORT
-@BINPATH@/MapiProxy.dll
-@BINPATH@/mozMapi32.dll
-#endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Chrome Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-@BINPATH@/chrome/classic@JAREXT@
-@BINPATH@/chrome/classic.manifest
-
-; DevTools
-#ifdef MOZ_DEVTOOLS
-@BINPATH@/chrome/devtools@JAREXT@
-@BINPATH@/chrome/devtools.manifest
-#endif
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Default Profile Settings
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; default pref files
-@BINPATH@/defaults/pref/*
-@BINPATH@/goanna.js
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; App extensions to Mail
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; LDAP components
-@BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@
-
-; misson control, autoconfig
-@BINPATH@/defaults/autoconfig/prefcalls.js
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Base Package Files
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; accessibility (out of process API support)
-#ifdef ACCESSIBILITY
-#ifdef XP_WIN32
-@BINPATH@/AccessibleMarshal.dll
-#endif
-#endif
-
-#ifdef MOZ_CALENDAR
-[calendar]
-@BINPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
-#endif
-
-; Phishing Protection
-; Modules
-@BINPATH@/modules/*
-
-; ANGLE GLES-on-D3D rendering library
-#ifdef MOZ_ANGLE_RENDERER
-@BINPATH@/libEGL.dll
-@BINPATH@/libGLESv2.dll
-
-#ifdef MOZ_D3DCOMPILER_VISTA_DLL
-@BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@
-#endif
-
-#ifdef MOZ_D3DCOMPILER_XP_DLL
-@BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@
-#endif
-#endif # MOZ_ANGLE_RENDERER
-
-; editor resource files
-@BINPATH@/res/EditorOverride.css
-@BINPATH@/res/contenteditable.css
-@BINPATH@/res/designmode.css
-@BINPATH@/res/ImageDocument.css
-@BINPATH@/res/TopLevelImageDocument.css
-@BINPATH@/res/TopLevelVideoDocument.css
-@BINPATH@/res/table-add-column-after-active.gif
-@BINPATH@/res/table-add-column-after-hover.gif
-@BINPATH@/res/table-add-column-after.gif
-@BINPATH@/res/table-add-column-before-active.gif
-@BINPATH@/res/table-add-column-before-hover.gif
-@BINPATH@/res/table-add-column-before.gif
-@BINPATH@/res/table-add-row-after-active.gif
-@BINPATH@/res/table-add-row-after-hover.gif
-@BINPATH@/res/table-add-row-after.gif
-@BINPATH@/res/table-add-row-before-active.gif
-@BINPATH@/res/table-add-row-before-hover.gif
-@BINPATH@/res/table-add-row-before.gif
-@BINPATH@/res/table-remove-column-active.gif
-@BINPATH@/res/table-remove-column-hover.gif
-@BINPATH@/res/table-remove-column.gif
-@BINPATH@/res/table-remove-row-active.gif
-@BINPATH@/res/table-remove-row-hover.gif
-@BINPATH@/res/table-remove-row.gif
-@BINPATH@/res/grabber.gif
-@BINPATH@/res/fonts/*
-@BINPATH@/res/dtd/*
-@BINPATH@/res/html/*
-#ifdef XP_WIN
-; For SafariProfileMigrator.js.
-@BINPATH@/res/langGroups.properties
-#endif
-@BINPATH@/res/language.properties
-@BINPATH@/res/entityTables/*
-
-; svg
-@BINPATH@/res/svg.css
-@BINPATH@/components/dom_svg.xpt
-@BINPATH@/components/dom_smil.xpt
-
-; [Personal Security Manager]
-;
-; NSS libraries are signed in the staging directory,
-; meaning their .chk files are created there directly.
-;
-#ifndef MOZ_SYSTEM_NSS
-#if defined(XP_LINUX) && !defined(ANDROID)
-@BINPATH@/@DLL_PREFIX@freeblpriv3@DLL_SUFFIX@
-#else
-@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
-#endif
-@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#ifndef MOZ_FOLD_LIBS
-@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
-#endif
-@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
-#endif
-@BINPATH@/chrome/pippki@JAREXT@
-@BINPATH@/chrome/pippki.manifest
-
-; for Solaris SPARC
-#ifdef SOLARIS
-@BINPATH@/@DLL_PREFIX@freebl_32fpu_3@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@freebl_32int_3@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@freebl_32int64_3@DLL_SUFFIX@
-#endif
-
-; [Updater]
-;
-#ifdef MOZ_UPDATER
-@BINPATH@/updater@BIN_SUFFIX@
-#endif
-
diff --git a/apps/mail/installer/windows/nsis/defines.nsi.in b/apps/mail/installer/src/defines.nsi.in
index 981976bab..8fb7aa507 100644
--- a/apps/mail/installer/windows/nsis/defines.nsi.in
+++ b/apps/mail/installer/src/defines.nsi.in
@@ -7,7 +7,7 @@
 !define AppName               "Interlink"
 !define AppVersion            "@MOZ_APP_VERSION@"
 
-!define GREVersion            @MOZILLA_VERSION@
+!define GREVersion            "@MOZILLA_VERSION@"
 !define AB_CD                 "@AB_CD@"
 
 !define FileMainEXE           "@MOZ_APP_NAME@.exe"
diff --git a/apps/mail/installer/windows/nsis/installer.nsi b/apps/mail/installer/src/installer.nsi
index 7a360e935..7a360e935 100644
--- a/apps/mail/installer/windows/nsis/installer.nsi
+++ b/apps/mail/installer/src/installer.nsi
diff --git a/apps/mail/installer/windows/nsis/shared.nsh b/apps/mail/installer/src/shared.nsh
index 5e96c61da..5e96c61da 100644
--- a/apps/mail/installer/windows/nsis/shared.nsh
+++ b/apps/mail/installer/src/shared.nsh
diff --git a/apps/mail/installer/windows/nsis/uninstaller.nsi b/apps/mail/installer/src/uninstaller.nsi
index ac53fed1a..ac53fed1a 100644
--- a/apps/mail/installer/windows/nsis/uninstaller.nsi
+++ b/apps/mail/installer/src/uninstaller.nsi
diff --git a/apps/mail/installer/windows/nsis/updater_append.ini b/apps/mail/installer/src/updater_append.ini
index 1b4bc1be7..1b4bc1be7 100644
--- a/apps/mail/installer/windows/nsis/updater_append.ini
+++ b/apps/mail/installer/src/updater_append.ini
diff --git a/apps/mail/installer/windows/Makefile.in b/apps/mail/installer/windows/Makefile.in
deleted file mode 100644
index 047159d84..000000000
--- a/apps/mail/installer/windows/Makefile.in
+++ /dev/null
@@ -1,79 +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/.
-
-include $(MOZILLA_SRCDIR)/system/installer/package-name.mk
-
-CONFIG_DIR = instgen
-
-ifdef MOZ_OFFICIAL_BRANDING
-BRANDED_SFX = 1
-else
-ifneq (,$(findstring unstable,$(MOZ_BRANDING_DIRECTORY)))
-BRANDED_SFX = 1
-endif
-endif
-
-ifdef BRANDED_SFX
-SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/binoc/7zSD.sfx
-else
-SFX_MODULE = $(MOZILLA_SRCDIR)/other-licenses/7zstub/uxp/7zSD.sfx
-endif
-
-INSTALLER_FILES = \
-	app.tag \
-	nsis/installer.nsi \
-	nsis/uninstaller.nsi \
-	nsis/shared.nsh \
-	$(NULL)
-
-BRANDING_FILES = \
-	branding.nsi \
-	wizHeader.bmp \
-	wizHeaderRTL.bmp \
-	wizWatermark.bmp \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-ifdef LOCALE_MERGEDIR
-PPL_LOCALE_ARGS = \
-  --l10n-dir=$(LOCALE_MERGEDIR)/mail/installer \
-  --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer \
-  --l10n-dir=$(topsrcdir)/mail/locales/en-US/installer \
-  $(NULL)
-else
-PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer
-endif
-
-OVERRIDE_DEFAULT_GOAL := installer
-installer::
-	$(MAKE) -C .. installer-stage
-	$(MAKE) $(CONFIG_DIR)/setup.exe
-
-# For building the uninstaller during the application build so it can be
-# included for mar file generation.
-uninstaller::
-	$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
-	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
-	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
-	$(PYTHON) $(MOZILLA_SRCDIR)/system/installer/windows/nsis/preprocess-locale.py \
-	  --preprocess-locale $(MOZILLA_SRCDIR) \
-	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
-
-$(CONFIG_DIR)/setup.exe::
-	$(RM) -r $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
-	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
-	$(PYTHON) $(MOZILLA_SRCDIR)/system/installer/windows/nsis/preprocess-locale.py \
-    --convert-utf8-utf16le $(DIST)/branding/license.txt $(CONFIG_DIR)/license.txt
-	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
-	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
-	$(PYTHON) $(MOZILLA_SRCDIR)/system/installer/windows/nsis/preprocess-locale.py \
-	  --preprocess-locale $(MOZILLA_SRCDIR) \
-	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
-
-include $(topsrcdir)/config/rules.mk
-include $(MOZILLA_SRCDIR)/system/installer/windows/nsis/makensis.mk
diff --git a/apps/mail/installer/windows/app.tag b/apps/mail/installer/windows/app.tag
deleted file mode 100644
index 324c2c72b..000000000
--- a/apps/mail/installer/windows/app.tag
+++ /dev/null
@@ -1,4 +0,0 @@
-;!@Install@!UTF-8!
-Title="Mozilla Thunderbird"
-RunProgram="setup.exe"
-;!@InstallEnd@!
\ No newline at end of file
diff --git a/apps/mail/installer/windows/moz.build b/apps/mail/installer/windows/moz.build
deleted file mode 100644
index b34412cc5..000000000
--- a/apps/mail/installer/windows/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# vim: set filetype=python:
-# 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/.
-
-DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
-DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
-DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
-DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION']
diff --git a/apps/mail/installer/windows/msi/thunderbird.mm b/apps/mail/installer/windows/msi/thunderbird.mm
deleted file mode 100644
index 94979bc17..000000000
--- a/apps/mail/installer/windows/msi/thunderbird.mm
+++ /dev/null
@@ -1,38 +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/. */
-
-;--- Include MAKEMSI support ------------------------------------------------
-#include "thunderbird.mmh"
-
-<$AbortIf Condition=^not VersionNT OR (VersionNT < 400)^ Message=^Can only be installed on WinNT, Windows 2000, XP or greater.^>
-
-<$DirectoryTree Key="INSTALLDIR" DIR="[ProgramFilesFolder]\Mozilla Thunderbird Installer" CHANGE="\" PrimaryFolder="Y">
-
-<$Feature "F_ThunderbirdMain" Title="Browser" Description="Thunderbird installer files" Attributes="FavorLocal">
-        
-    <$Icon KEY="@Thunderbirdicon" "..\branding\thunderbird.ico">
-
-    <$Files "..\install\setup\*.*" SubDir="TREE" DestDir="INSTALLDIR" EXLIST="NotThese">
-    <$Files "..\install\xpi\*.*" SubDir="TREE" DestDir="INSTALLDIR" EXLIST="NotThese">
-       
-    #(
-        <$ExeCA
-	    EXE="[INSTALLDIR]setup.exe"
-	    Args="-ms -nosplash -setDefaultBrowser"
-	    Seq="6401" ;; Run this between PublishProduct and InstallFinalize
-	    Type="AnyRC"
-	>
-    #)
-<$/Feature>
-
-; fix dialog picture and make it pretty
-<$Table "Control">
-    #(
-        <$Row
-                   @Where="Control = 'Bitmap'"
-                    @OK="=8"
-               Attributes="1048577"
-        >
-    #)
-<$/Table>
diff --git a/apps/mail/installer/windows/msi/thunderbird.ver b/apps/mail/installer/windows/msi/thunderbird.ver
deleted file mode 100644
index d36e177d0..000000000
--- a/apps/mail/installer/windows/msi/thunderbird.ver
+++ /dev/null
@@ -1,11 +0,0 @@
-;----------------------------------------------------------------------------

-; ProductName = Mozilla Thunderbird Installer

-; Description = Mozilla Thunderbird Installer is a delivery vehicle for Mozilla

-;             = Thunderbird for easy, large-scale deployment.

-; Installed   = WINDOWS_ALL

-; MsiName     = thunderbird

-; Guid.UpgradeCode = {06863EB1-787F-462D-89BD-D7A82A276303}

-

-VERSION : 1.0

-DATE    : 07 Jan 2005

-CHANGES : Initial version.

diff --git a/apps/mail/locales/Makefile.in b/apps/mail/locales/Makefile.in
deleted file mode 100644
index dad1300a6..000000000
--- a/apps/mail/locales/Makefile.in
+++ /dev/null
@@ -1,230 +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/.
-
-include $(topsrcdir)/config/config.mk
-
-_ABS_SRCDIR := $(abspath $(topsrcdir))
-
-SUBMAKEFILES += \
-	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
-	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
-	$(NULL)
-
-# This makefile uses variable overrides from the libs-% target to
-# build non-default locales to non-default dist/ locations. Be aware!
-
-PWD := $(CURDIR)
-
-# These are defaulted to be compatible with the files the wget-en-US target
-# pulls. You may override them if you provide your own files. You _must_
-# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
-# work in that case.
-ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
-WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
-RETRIEVE_WINDOWS_INSTALLER = 1
-
-MOZ_LANGPACK_EID=langpack-$(AB_CD)@thunderbird.mozilla.org
-
-L10N_PREF_JS_EXPORTS = $(call MERGE_FILE,all-l10n.js)
-L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR)
-L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warnings
-PP_TARGETS += L10N_PREF_JS_EXPORTS
-
-ifeq (WINNT,$(OS_ARCH))
-UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
-    $(NSINSTALL) -D $(STAGEDIST)/uninstall; \
-    cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
-    $(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
-    cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
-    $(NULL)
-endif
-
-NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
-
-# Required for l10n.mk - defines a list of app sub dirs that should
-# be included in langpack xpis.
-DIST_SUBDIRS = $(DIST_SUBDIR)
-
-include $(topsrcdir)/config/rules.mk
-
-include $(topsrcdir)/platform/system/locales/l10n.mk
-
-$(STAGEDIST): $(DIST)/branding
-
-$(DIST)/branding:
-	$(NSINSTALL) -D $@
-
-libs-%:
-	$(NSINSTALL) -D $(DIST)/install
-	@$(MAKE) -C $(DEPTH)/system/locales libs-$*  XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
-ifdef MOZ_DEVTOOLS
-	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
-endif
-	@$(MAKE) -C $(DEPTH)/editor/ui/locales AB_CD=$* XPI_NAME=locale-$*
-	@$(MAKE) -C $(DEPTH)/system/intl/hyphenation/locales AB_CD=$* XPI_NAME=locale-$*
-	@$(MAKE) -C $(DEPTH)/system/intl/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
-	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
-	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
-
-
-# Note the funny extra '../' in SFX_HEADER is because the repackage-zip command
-# is actually run effectively from within the mozilla/ part of the objdir, so
-# topsrcdir points to the wrong place and we have to go one directory higher.
-repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
-repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
-	@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
-	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
-	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
-	$(MAKE) repackage-zip \
-	  AB_CD=$(AB_CD) \
-	  MOZ_PKG_FORMAT=SFX7Z \
-	  ZIP_IN='$(WIN32_INSTALLER_IN)' \
-	  ZIP_OUT='$(WIN32_INSTALLER_OUT)' \
-	  SFX_HEADER='$(PWD)/../installer/windows/l10ngen/7zSD.sfx \
-	              $(_ABS_SRCDIR)/mail/installer/windows/app.tag'
-
-ifeq (WINNT,$(OS_ARCH))
-repackage-win32-installer-%: $(STAGEDIST)
-	@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN='$(WIN32_INSTALLER_IN)'
-
-repackage-zip-%: repackage-win32-installer-%
-else
-repackage-win32-installer-%: ;
-endif
-
-clobber-zip:
-	$(RM) $(STAGEDIST)/chrome/$(AB_CD).jar \
-	  $(STAGEDIST)/chrome/$(AB_CD).manifest \
-	  $(STAGEDIST)/defaults/pref/all-l10n.js
-	  $(STAGEDIST)/dictionaries \
-	  $(STAGEDIST)/hyphenation/$(AB_CD) \
-	  $(STAGEDIST)/isp/$(AB_CD) \
-	  $(STAGEDIST)/chrome/$(AB_CD)
-
-langpack: langpack-$(AB_CD)
-
-ifdef MOZ_UPDATER
-libs:: $(call MERGE_FILE,updater/updater.ini) $(call mkdir_deps,$(DIST)/bin)
-ifeq ($(OS_ARCH),WINNT)
-	cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
-	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
-	  sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
-	  $(FINAL_TARGET)/updater.ini
-else
-	cat $< | \
-	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
-	  sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
-	  $(FINAL_TARGET)/updater.ini
-endif
-endif
-
-ident:
-	@printf 'comm_revision '
-	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
-	    $(STAGEDIST)/application.ini App SourceStamp
-	@printf 'moz_revision '
-	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
-	    $(STAGEDIST)/platform.ini Build SourceStamp
-	@printf 'buildid '
-	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
-	    $(STAGEDIST)/application.ini App BuildID
-
-#These make targets call prepare-repackages by setting different UPLOAD_DIR
-prepare-upload-latest-%:
-	@$(MAKE) prepare-repackages-$* UPLOAD_DIR=$(DIST)/upload/latest
-
-prepare-upload-dated-%:
-	@$(MAKE) prepare-repackages-$* UPLOAD_DIR=$(DIST)/upload/`date "+%Y-%m-%d-%H"`-$(MOZ_PKG_APPNAME)$(MOZ_APP_VERSION)-l10n
-
-# This target will generate a UPLOAD_DIR folder with
-# l10n repackages in the way that we offer l10n nightlies
-#  1) the package/binary
-#  2) the langpack xpi
-#  3) the installer (on windows)
-# To set the paths those packages should end up, override the following vars:
-# PKG_PATH, PKG_LANGPACK_PATH, PKG_INST_PATH
-prepare-repackages-%:
-ifndef UPLOAD_DIR
-	$(error UPLOAD_DIR not defined)
-endif
-	$(NSINSTALL) -D $(UPLOAD_DIR)
-	$(NSINSTALL) -D $(UPLOAD_DIR)/$(PKG_LANGPACK_PATH)
-# Move the langpack
-	mv $(DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi \
-	   $(UPLOAD_DIR)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
-# Move the repackage
-	mv "$(DIST)/$(PACKAGE)" \
-	   "$(UPLOAD_DIR)/$(PACKAGE)"
-# Move the windows installer
-ifeq (WINNT, $(OS_ARCH))
-	mv "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" \
-	   "$(UPLOAD_DIR)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
-endif
-# Set the permissions that the folders will have in ftp once uploaded
-	chmod -vR 775 $(UPLOAD_DIR)
-
-merge-%:
-ifdef LOCALE_MERGEDIR
-	$(RM) -rf $(LOCALE_MERGEDIR)
-	$(MOZILLA_SRCDIR)/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) --l10n-ini $(srcdir)/l10n.ini $*
-endif
-	@echo
-
-# test target, depends on make package
-# try to repack x-test, with just toolkit/defines.inc being there
-l10n-check::
-	$(RM) -rf x-test
-	$(NSINSTALL) -D x-test/toolkit
-	echo '#define MOZ_LANG_TITLE Just testing' > x-test/toolkit/defines.inc
-	$(MAKE) installers-x-test L10NBASEDIR='$(PWD)' LOCALE_MERGEDIR='$(PWD)/mergedir'
-
-ifdef MOZ_CALENDAR
-LIGHTNING_PATH=$(DEPTH)/calendar/lightning
-GDATA_PATH=$(DEPTH)/calendar/providers/gdata
-
-define run-calendar-rule
-$(MAKE) -C $(LIGHTNING_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
-$(MAKE) -C $(GDATA_PATH) LOCALE_MERGEDIR=$(LOCALE_MERGEDIR) $(subst calendar-,,$@)
-endef
-
-# Add calendar targets for pattern rules. Unfortunately multiple pattern rules
-# on the left hand side do something different with make, therefore we need to
-# write a line for each target.
-calendar-merge-%:
-	$(run-calendar-rule)
-calendar-clobber-%:
-	$(run-calendar-rule)
-calendar-langpack-%:
-	$(run-calendar-rule)
-calendar-repackage-zip-%:
-	$(run-calendar-rule)
-calendar-wget-en-US:
-	$(run-calendar-rule)
-calendar-unpack:
-	$(run-calendar-rule)
-calendar-upload:
-	$(MAKE) -C $(LIGHTNING_PATH) upload AB_CD=$(AB_CD)
-
-# Hook into l10n.mk, providing extra arguments to l10n-repack.py
-ifdef NIGHTLY_BUILD
-MOZ_PKG_EXTRAL10N += extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
-else
-MOZ_PKG_EXTRAL10N += distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}=$(DIST)/xpi-stage/lightning-$(AB_CD)
-endif
-
-# Hook calendar targets to the mail non-pattern rules
-wget-en-US: calendar-wget-en-US
-unpack: calendar-unpack
-upload: calendar-upload
-
-# Hook into the pattern rules, this will be used later on in the installers-% target.
-CALENDAR_INSTALLERS_TARGETS = calendar-merge-% calendar-clobber-% calendar-langpack-% calendar-repackage-zip-%
-endif
-
-# This is a generic target that will make a langpack, repack ZIP (+tarball)
-# builds, and repack and installer if applicable. It is called from the
-# tinderbox scripts. Alter it with caution.
-INSTALLERS_TARGETS = clobber-% $(CALENDAR_INSTALLERS_TARGETS) langpack-% repackage-win32-installer-% repackage-zip-%
-installers-%: $(INSTALLERS_TARGETS)
-	@echo 'repackaging done'
diff --git a/apps/mail/moz.build b/apps/mail/moz.build
index ed3158472..123a95b18 100644
--- a/apps/mail/moz.build
+++ b/apps/mail/moz.build
@@ -16,9 +16,6 @@ DIRS += [
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     DIRS += ['components']
 
-if CONFIG['MAKENSISU']:
-    DIRS += ['installer/windows']
-
 # app is always last as it packages up the built files on mac.
 DIRS += ['app']