wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge b2g-inbound to m-c.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-09-17 22:46:32 -04:00
commit 871fb32207
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "ca3cef257ae1d19f25cd4b973f7ba2a713b8a7c2",
"revision": "94340fb19f685f3cd6e5fa990281557ba810a10e",
"repo_path": "/integration/gaia-central"
}

41
toolkit/webapps/WebappOSUtils.jsm
View File

@ -134,28 +134,37 @@ this.WebappOSUtils = {
},
getInstallPath: function(aApp) {
if (Services.appinfo.ID == "{3c2e2abc-06d4-11e1-ac3b-374f68613e61}") {
// B2G
return aApp.basePath + "/" + aApp.id;
} else if (Services.appinfo.ID == "{aa3c5121-dab2-40e2-81ca-7ea25febc110}") {
// Android
return aApp.basePath + "/" + aApp.id;
} else if (Services.appinfo.ID == "{99bceaaa-e3c6-48c1-b981-ef9b46b67d60}") {
// Metro
return null;
} else {
// Firefox, the Webapp Runtime and other Desktop products share the same
// directory naming scheme.
#ifdef XP_WIN
let execFile = this.getLaunchTarget(aApp);
if (!execFile) {
return null;
}
let execFile = this.getLaunchTarget(aApp);
if (!execFile) {
return null;
}
return execFile.parent.path;
return execFile.parent.path;
#elifdef XP_MACOSX
let [ bundleID, path ] = this.getLaunchTarget(aApp);
return path;
#elifdef MOZ_B2G
return aApp.basePath + "/" + aApp.id;
#elifdef MOZ_FENNEC
return aApp.basePath + "/" + aApp.id;
let [ bundleID, path ] = this.getLaunchTarget(aApp);
return path;
#elifdef XP_UNIX
let execFile = this.getLaunchTarget(aApp);
if (!execFile) {
return null;
}
let execFile = this.getLaunchTarget(aApp);
if (!execFile) {
return null;
}
return execFile.parent.path;
return execFile.parent.path;
#endif
}
},
launch: function(aApp) {