Bug 1582967 - Rename brower-prefs.js file and pref files to suite/app/profile. r=frg a=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sat, 28 Sep 2019 18:13:17 +0200
changeset 32312 9c857eef5a5b1ce89a6da3442b7fffd369879168
parent 32311 1aa55d01c39693487899ccc544ea94c401b892e0
child 32313 0def45bb7f5de5ae0262c11f228d93bd79d9424a
push id219
push userfrgrahl@gmx.net
push dateSat, 28 Sep 2019 16:19:15 +0000
treeherdercomm-esr60@5c0d3f86a9a6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1582967
Bug 1582967 - Rename brower-prefs.js file and pref files to suite/app/profile. r=frg a=frg
suite/app/Makefile.in
suite/app/moz.build
suite/app/profile/channel-prefs.js
suite/app/profile/suite-prefs.js
suite/browser/Makefile.in
suite/browser/browser-prefs.js
suite/browser/channel-prefs.js
suite/browser/moz.build
suite/installer/package-manifest.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -36,16 +36,22 @@ ifeq ($(OS_ARCH),WINNT)
 # (this dependency should really be just for seamonkey.exe, not other targets)
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
 EXTRA_DEPS += seamonkey.exe.manifest
 endif
 
 include $(topsrcdir)/config/rules.mk
 
+# 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:: $(LICENSE_TXT_FILE)
 ifeq ($(OS_ARCH),WINNT)
 	$(EXIT_ON_ERROR) \
 	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $^ > $(DIST)/bin/license.txt
 else
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/
 endif
 
@@ -64,17 +70,17 @@ ifneq (,$(filter-out WINNT Darwin,$(OS_A
 		-e "s|\@MOZ_APP_DISPLAYNAME\@|$(MOZ_APP_DISPLAYNAME)|g" \
 		-e "s|\@MOZ_APP_NAME\@|$(MOZ_APP_NAME)|g" \
 		-e "s|\@MOZ_APP_VERSION\@|${MOZ_APP_VERSION}|g" < $< > $@
 
 libs:: $(MOZ_APP_NAME).1
 	$(INSTALL) $< $(DIST)/man/man1
 
 GARBAGE += $(MOZ_APP_NAME).1
-GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, browser-prefs.js)
+GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, all.js mailnews.js suite-prefs.js)
 endif
 
 # Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
 # Extensions that appear in dist/bin/extensions will get bundled with the
 # application, ones that appear in dist/bin/distribution/extensions will be
 # copied to the profile in installed builds.
 # NOTE: This is a hack to run this at the end of compilation, would be nicer
 # if this was done right away for built-in extensions in omnijar mode.
--- a/suite/app/moz.build
+++ b/suite/app/moz.build
@@ -86,11 +86,15 @@ if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERR
 # For splash.rc
 DEFINES['SEAMONKEY_ICO'] = '"%s/%s/icons/windows/main-window.ico"' % (
     TOPSRCDIR, CONFIG['MOZ_BRANDING_DIRECTORY'])
 DEFINES['HTML_FILE_ICO'] = '"%s/%s/icons/windows/html-file.ico"' % (
     TOPSRCDIR, CONFIG['MOZ_BRANDING_DIRECTORY'])
 
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
+JS_PREFERENCE_PP_FILES += [
+    'profile/suite-prefs.js',
+]
+
 FINAL_TARGET_FILES += ['blocklist.xml']
 FINAL_TARGET_FILES.defaults += ['permissions']
 
rename from suite/browser/channel-prefs.js
rename to suite/app/profile/channel-prefs.js
rename from suite/browser/browser-prefs.js
rename to suite/app/profile/suite-prefs.js
deleted file mode 100644
--- a/suite/browser/Makefile.in
+++ /dev/null
@@ -1,10 +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/rules.mk
-
-# channel-prefs.js is handled separate from other prefs due to bug 756325.
-libs:: $(srcdir)/channel-prefs.js
-	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
--- a/suite/browser/moz.build
+++ b/suite/browser/moz.build
@@ -15,13 +15,8 @@ EXTRA_COMPONENTS += [
 
 JAR_MANIFESTS += ['jar.mn']
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_DISPLAYNAME', 'MOZ_APP_VERSION'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
 if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['OFFICIAL_BUILD'] = 1
-
-JS_PREFERENCE_PP_FILES += [
-    'browser-prefs.js',
-]
-
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -594,17 +594,17 @@
 @RESPATH@/chrome/icons/default/places.ico
 @RESPATH@/chrome/icons/default/script-file.ico
 @RESPATH@/chrome/icons/default/xml-file.ico
 @RESPATH@/chrome/icons/default/xul-file.ico
 #endif
 
 ; [Default Preferences]
 ; All the browser/general pref files must be part of base to prevent migration bugs
-@RESPATH@/@PREF_DIR@/browser-prefs.js
+@RESPATH@/@PREF_DIR@/suite-prefs.js
 @RESPATH@/@PREF_DIR@/composer.js
 @RESPATH@/greprefs.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/defaults/permissions
 @RESPATH@/defaults/blocklists
 @RESPATH@/defaults/pinning
 ; Warning: changing the path to channel-prefs.js can cause bugs. (Bug 756325)
 @RESPATH@/defaults/pref/channel-prefs.js