Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 23:23:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1076941: Keep supporting the legacy location under Contents/MacOS for the webapprt folder on OSX. r=myk

Browse Source
This commit is contained in:
Stephen Pohl 2014-10-03 08:04:44 -04:00
parent f6c188526f
commit aae0cf9d0c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/webapps/tests/chrome.ini
View File

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = buildapp == 'mulet' || os == "mac" # see bug 993690 and bug 1076941
skip-if = buildapp == 'mulet' || os == "mac" && os_version == "10.6" # see bug 993690
support-files =
head.js
app.sjs

8
webapprt/mac/webapprt.mm
View File

@ -117,7 +117,13 @@ main(int argc, char **argv)
NSString* myWebRTPath = [myBundle pathForResource:@"webapprt"
ofType:nil];
if (!myWebRTPath) {
@throw MakeException(@"Missing Web Runtime Files", @"Cannot locate binary for this App");
myWebRTPath = [myBundlePath stringByAppendingPathComponent:@"Contents"];
myWebRTPath = [myWebRTPath stringByAppendingPathComponent:@"MacOS"];
myWebRTPath = [myWebRTPath stringByAppendingPathComponent:@"webapprt"];
if ([[NSFileManager defaultManager] fileExistsAtPath:myWebRTPath] == NO) {
@throw MakeException(@"Missing Web Runtime Files",
@"Cannot locate binary for this App");
}
}
//GET FIREFOX BUILD ID