Backed out changeset d38346a423b5 (bug 138009) for packaging bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 17 Apr 2015 15:16:49 -0400
changeset 271150 95999fe8a720c85a68c197b4f9e429491846ec66
parent 271149 efc47b3755ca1cf775df529781c6fd4384e21af0
child 271151 549422b4460b7c8f76d9033cfb00acc302e451b9
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs138009
milestone40.0a1
backs outd38346a423b525dfc3796c0865a1f1dc34308439
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
Backed out changeset d38346a423b5 (bug 138009) for packaging bustage. CLOSED TREE
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
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -1,7 +1,21 @@
 # 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
new file mode 100644
--- /dev/null
+++ b/extensions/pref/autoconfig/src/beos/platform.js
@@ -0,0 +1,6 @@
+/* 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";
new file mode 100644
--- /dev/null
+++ b/extensions/pref/autoconfig/src/mac/platform.js
@@ -0,0 +1,6 @@
+/* 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,16 +153,21 @@ 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,16 +5,19 @@
 
 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);
 }
new file mode 100644
--- /dev/null
+++ b/extensions/pref/autoconfig/src/unix/platform.js
@@ -0,0 +1,6 @@
+/* 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";
new file mode 100644
--- /dev/null
+++ b/extensions/pref/autoconfig/src/win/platform.js
@@ -0,0 +1,6 @@
+/* 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";