Bug 1608322 - Stop shipping empty mail/app/profile/prefs.js; r=mkmelin
authorGeoff Lankow <geoff@darktrojan.net>
Fri, 10 Jan 2020 15:33:04 +1300
changeset 37939 26ba40858d2f3ec7e1fdd44d1901d0f7ac79d4ce
parent 37938 c0dbb574bf5fc6ce7c0269387a3afce918a4edf8
child 37940 5cdb1cd8047a095f8dc5e05f6987d4e7b89fb67b
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewersmkmelin
bugs1608322
Bug 1608322 - Stop shipping empty mail/app/profile/prefs.js; r=mkmelin
.eslintignore
mail/app/Makefile.in
mail/app/moz.build
mail/app/profile/moz.build
mail/app/profile/prefs.js
--- a/.eslintignore
+++ b/.eslintignore
@@ -64,17 +64,16 @@ editor/ui/texzilla/**
 mailnews/mailnews.js
 mailnews/extensions/dsn/content/dsn.js
 mailnews/extensions/mdn/content/mdn.js
 mailnews/extensions/smime/content/smime.js
 
 # mail exclusions
 mail/app/profile/all-thunderbird.js
 mail/app/profile/channel-prefs.js
-mail/app/profile/prefs.js
 mail/base/content/protovis-r2.6-modded.js
 mail/branding/nightly/thunderbird-branding.js
 mail/branding/thunderbird/thunderbird-branding.js
 # This file is split into two in order to keep it as a valid json file
 # for documentation purposes (policies.json) but to be accessed by the
 # code as a .jsm (schema.jsm)
 mail/components/enterprisepolicies/schemas/schema.jsm
 mail/components/im/all-im.js
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -101,19 +101,16 @@ BRANDED_ICON_FILES = $(addsuffix $(ICON_
 
 libs:: $(addprefix $(srcdir)/icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES))
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
 
 libs:: $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/messengerWindow.ico
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
 endif
 
-libs:: $(srcdir)/profile/prefs.js
-	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
-
 # channel-prefs.js is handled separate from other prefs due to bug 756325
 libs:: $(srcdir)/profile/channel-prefs.js
 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
 	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
 
 libs:: $(srcdir)/blocklist.xml
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
--- a/mail/app/moz.build
+++ b/mail/app/moz.build
@@ -1,15 +1,13 @@
 # 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/.
 
-DIRS += ['profile']
-
 if CONFIG['MOZ_NO_PIE_COMPAT']:
     GeckoProgram(CONFIG['MOZ_APP_NAME'] + '-bin')
 
     DIRS += ['no-pie']
 else:
     GeckoProgram(CONFIG['MOZ_APP_NAME'])
 
 USE_LIBS += ['mozglue']
deleted file mode 100644
--- a/mail/app/profile/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/.
deleted file mode 100644
--- a/mail/app/profile/prefs.js
+++ /dev/null
@@ -1,14 +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/. */
-
-# Mozilla User Preferences
-
-/* Do not edit this file.
- *
- * If you make changes to this file while the browser is running,
- * the changes will be overwritten when the browser exits.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
- */