Backed out changeset d38346a423b5 (bug 138009) for packaging bustage.

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-04-17 15:16:49 -04:00
parent 2811c9898e
commit e1ed651fbf
7 changed files with 46 additions and 0 deletions

View File

@ -5,3 +5,17 @@
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

View File

@ -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";

View File

@ -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";

View File

@ -158,6 +158,11 @@ nsresult nsReadConfig::readConfigFile()
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

View File

@ -10,6 +10,9 @@ 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() {

View File

@ -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";

View File

@ -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";