Bug 138009 - Remove unused platform.js, now with packaging goodness, r=mossop
authorMike Kaply <mozilla@kaply.com>
Fri, 24 Apr 2015 14:10:09 -0500
changeset 241038 8135b5939fae190ec02eb7de2f501b1e59812721
parent 241037 e6c0425d3c880d2232705cd970f26e0977d1dce2
child 241039 eafb8c976ae2e109b78dd416ad7cf92f56b6d958
push id28652
push usercbook@mozilla.com
push dateMon, 27 Apr 2015 10:00:58 +0000
treeherdermozilla-central@8aff0d2a7bc7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmossop
bugs138009
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 138009 - Remove unused platform.js, now with packaging goodness, r=mossop
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
extensions/pref/autoconfig/src/Makefile.in
extensions/pref/autoconfig/src/beos/platform.js
extensions/pref/autoconfig/src/mac/platform.js
extensions/pref/autoconfig/src/nsReadConfig.cpp
extensions/pref/autoconfig/src/prefcalls.js
extensions/pref/autoconfig/src/unix/platform.js
extensions/pref/autoconfig/src/win/platform.js
mobile/android/installer/package-manifest.in
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -738,17 +738,16 @@
 ; All the pref files must be part of base to prevent migration bugs
 #ifdef MOZ_MULET
 @RESPATH@/browser/@PREF_DIR@/b2g.js
 #else
 @RESPATH@/@PREF_DIR@/b2g.js
 #endif
 @RESPATH@/@PREF_DIR@/channel-prefs.js
 @RESPATH@/greprefs.js
-@RESPATH@/defaults/autoconfig/platform.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/defaults/profile/prefs.js
 
 ; Services (gre) prefs
 #ifdef MOZ_SERVICES_SYNC
 @RESPATH@/defaults/pref/services-sync.js
 #endif
 
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -693,17 +693,16 @@
 #endif
 #endif
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 @RESPATH@/browser/@PREF_DIR@/firefox.js
 @RESPATH@/browser/@PREF_DIR@/firefox-branding.js
 @RESPATH@/greprefs.js
-@RESPATH@/defaults/autoconfig/platform.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/browser/defaults/profile/prefs.js
 
 #ifndef LIBXUL_SDK
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -1,21 +1,7 @@
 # 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/.
 
 AUTOCFG_JS_EXPORTS = \
 		$(srcdir)/prefcalls.js \
 		$(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-AUTOCFG_JS_EXPORTS += $(srcdir)/mac/platform.js
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT), windows)
-AUTOCFG_JS_EXPORTS += $(srcdir)/win/platform.js
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT), beos)
-AUTOCFG_JS_EXPORTS += $(srcdir)/beos/platform.js
-else
-AUTOCFG_JS_EXPORTS += $(srcdir)/unix/platform.js
-endif
-endif
-endif
deleted file mode 100644
--- a/extensions/pref/autoconfig/src/beos/platform.js
+++ /dev/null
@@ -1,6 +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/. */
-
-// BeOS specific auto configuration preference defaults
-platform.value = "beos";
deleted file mode 100644
--- a/extensions/pref/autoconfig/src/mac/platform.js
+++ /dev/null
@@ -1,6 +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/. */
-
-// Mac specific auto configuration preference defaults
-platform.value = "macintosh";
--- a/extensions/pref/autoconfig/src/nsReadConfig.cpp
+++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp
@@ -153,21 +153,16 @@ nsresult nsReadConfig::readConfigFile()
         if (NS_FAILED(rv))
             return rv;
         
         // Open and evaluate function calls to set/lock/unlock prefs
         rv = openAndEvaluateJSFile("prefcalls.js", 0, false, false);
         if (NS_FAILED(rv)) 
             return rv;
 
-        // Evaluate platform specific directives
-        rv = openAndEvaluateJSFile("platform.js", 0, false, false);
-        if (NS_FAILED(rv)) 
-            return rv;
-
         mRead = true;
     }
     // If the lockFileName is nullptr return ok, because no lockFile will be used
   
   
     // Once the config file is read, we should check that the vendor name 
     // is consistent By checking for the vendor name after reading the config 
     // file we allow for the preference to be set (and locked) by the creator 
--- a/extensions/pref/autoconfig/src/prefcalls.js
+++ b/extensions/pref/autoconfig/src/prefcalls.js
@@ -5,19 +5,16 @@
 
 const nsILDAPURL = Components.interfaces.nsILDAPURL;
 const LDAPURLContractID = "@mozilla.org/network/ldap-url;1";
 const nsILDAPSyncQuery = Components.interfaces.nsILDAPSyncQuery;
 const LDAPSyncQueryContractID = "@mozilla.org/ldapsyncquery;1";
 const nsIPrefService = Components.interfaces.nsIPrefService;
 const PrefServiceContractID = "@mozilla.org/preferences-service;1";
 
-// set on a platform specific basis in platform.js
-platform = { value: "" };
-
 var gVersion;
 
 function getPrefBranch() {
     
     var prefService = Components.classes[PrefServiceContractID]
                                 .getService(nsIPrefService);    
     return prefService.getBranch(null);
 }
deleted file mode 100644
--- a/extensions/pref/autoconfig/src/unix/platform.js
+++ /dev/null
@@ -1,6 +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/. */
-
-// Unix specific auto configuration preference defaults
-platform.value = "unix";
deleted file mode 100644
--- a/extensions/pref/autoconfig/src/win/platform.js
+++ /dev/null
@@ -1,6 +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/. */
-
-// Windows specific auto configuration preference defaults
-platform.value = "windows";
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -508,17 +508,16 @@
 #endif
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 @BINPATH@/@PREF_DIR@/mobile.js
 @BINPATH@/@PREF_DIR@/mobile-branding.js
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 @BINPATH@/greprefs.js
-@BINPATH@/defaults/autoconfig/platform.js
 @BINPATH@/defaults/autoconfig/prefcalls.js
 @BINPATH@/defaults/profile/prefs.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine. 
 @BINPATH@/res/EditorOverride.css
 @BINPATH@/res/contenteditable.css
 @BINPATH@/res/designmode.css