mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Mac v2 signing - Bug 1047738 - Make distribution code look for the distribution directory under Contents/Resources due to v2 signing requirements. r=bsmedberg
This commit is contained in:
parent
462a374b6f
commit
66beaa2106
@ -125,12 +125,11 @@ static void
|
||||
AppendDistroSearchDirs(nsIProperties* aDirSvc, nsCOMArray<nsIFile> &array)
|
||||
{
|
||||
nsCOMPtr<nsIFile> searchPlugins;
|
||||
nsresult rv = aDirSvc->Get(XRE_EXECUTABLE_FILE,
|
||||
nsresult rv = aDirSvc->Get(XRE_APP_DISTRIBUTION_DIR,
|
||||
NS_GET_IID(nsIFile),
|
||||
getter_AddRefs(searchPlugins));
|
||||
if (NS_FAILED(rv))
|
||||
return;
|
||||
searchPlugins->SetNativeLeafName(NS_LITERAL_CSTRING("distribution"));
|
||||
searchPlugins->AppendNative(NS_LITERAL_CSTRING("searchplugins"));
|
||||
|
||||
bool exists;
|
||||
|
@ -26,12 +26,16 @@ this.DistributionCustomizer = function DistributionCustomizer() {
|
||||
} catch(ex) {}
|
||||
let dirSvc = Cc["@mozilla.org/file/directory_service;1"].
|
||||
getService(Ci.nsIProperties);
|
||||
let iniFile = loadFromProfile ? dirSvc.get("ProfD", Ci.nsIFile)
|
||||
: dirSvc.get("XREExeF", Ci.nsIFile);
|
||||
iniFile.leafName = "distribution";
|
||||
iniFile.append("distribution.ini");
|
||||
if (iniFile.exists())
|
||||
this._iniFile = iniFile;
|
||||
try {
|
||||
let iniFile = loadFromProfile ? dirSvc.get("ProfD", Ci.nsIFile)
|
||||
: dirSvc.get("XREAppDist", Ci.nsIFile);
|
||||
if (loadFromProfile) {
|
||||
iniFile.leafName = "distribution";
|
||||
}
|
||||
iniFile.append("distribution.ini");
|
||||
if (iniFile.exists())
|
||||
this._iniFile = iniFile;
|
||||
} catch(ex) {}
|
||||
}
|
||||
|
||||
DistributionCustomizer.prototype = {
|
||||
|
@ -373,9 +373,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
|
||||
}
|
||||
else if (!strcmp(aProperty, XRE_APP_DISTRIBUTION_DIR)) {
|
||||
bool persistent = false;
|
||||
rv = GetFile(XRE_EXECUTABLE_FILE, &persistent, getter_AddRefs(file));
|
||||
rv = GetFile(NS_GRE_DIR, &persistent, getter_AddRefs(file));
|
||||
if (NS_SUCCEEDED(rv))
|
||||
rv = file->SetNativeLeafName(NS_LITERAL_CSTRING("distribution"));
|
||||
rv = file->AppendNative(NS_LITERAL_CSTRING("distribution"));
|
||||
}
|
||||
else if (NS_SUCCEEDED(GetProfileStartupDir(getter_AddRefs(file)))) {
|
||||
// We need to allow component, xpt, and chrome registration to
|
||||
|
Loading…
Reference in New Issue
Block a user