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

Bug 1091109: Don't sign webapprt-stub on OSX because webapps fail to launch due to quarantine bit. r=smichaud,myk

Browse Source
This commit is contained in:
Stephen Pohl 2014-10-31 20:39:07 -04:00
parent e2b8496ba0
commit b4fd3bc4b5
6 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/app/macbuild/Contents/MacOS-files.in
View File

@ -5,6 +5,5 @@
/gtest/***
/pk12util
/ssltunnel
/webapprt-stub
/xpcshell
/XUL

4
browser/installer/package-manifest.in
View File

@ -856,11 +856,7 @@ bin/libfreebl_32int64_3.so
#ifdef XP_WIN
@BINPATH@/webapp-uninstaller@BIN_SUFFIX@
#endif
#ifdef XP_MACOSX
@APPNAME@/Contents/MacOS/webapprt-stub@BIN_SUFFIX@
#else
@BINPATH@/webapprt-stub@BIN_SUFFIX@
#endif
@BINPATH@/webapprt/webapprt.ini
@BINPATH@/webapprt/chrome.manifest
@BINPATH@/webapprt/chrome/webapprt@JAREXT@

2
testing/mochitest/mach_commands.py
View File

@ -92,7 +92,7 @@ class MochitestRunner(MozbuildObject):
appname = 'webapprt-stub' + mozinfo.info.get('bin_suffix', '')
if sys.platform.startswith('darwin'):
appname = os.path.join(self.distdir, self.substs['MOZ_MACBUNDLE_NAME'],
'Contents', 'MacOS', appname)
'Contents', 'Resources', appname)
else:
appname = os.path.join(self.distdir, 'bin', appname)
return appname

2
testing/testsuite-targets.mk
View File

@ -169,7 +169,7 @@ endif
$(CHECK_TEST_ERROR)
ifeq ($(OS_ARCH),Darwin)
webapprt_stub_path = $(TARGET_DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/webapprt-stub$(BIN_SUFFIX)
webapprt_stub_path = $(TARGET_DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/webapprt-stub$(BIN_SUFFIX)
endif
ifeq ($(OS_ARCH),WINNT)
webapprt_stub_path = $(TARGET_DIST)/bin/webapprt-stub$(BIN_SUFFIX)

3
toolkit/webapps/MacNativeApp.js
View File

@ -222,7 +222,8 @@ NativeApp.prototype = {
_copyPrebuiltFiles: function(aDir) {
let destDir = getFile(aDir, this.macOSDir);
let stub = getFile(this.runtimeFolder, "webapprt-stub");
let stub = getFile(OS.Path.join(OS.Path.dirname(this.runtimeFolder),
"Resources"), "webapprt-stub");
stub.copyTo(destDir, "webapprt");
},

2
webapprt/mac/webapprt.mm
View File

@ -166,7 +166,7 @@ main(int argc, char **argv)
//we know the firefox path, so copy the new webapprt here
NSString *newWebRTPath =
[NSString stringWithFormat: @"%@%s%s", firefoxPath, APP_MACOS_PATH,
[NSString stringWithFormat: @"%@%s%s", firefoxPath, APP_RESOURCES_PATH,
WEBAPPRT_EXECUTABLE];
NSLog(@"### Firefox webapprt path: %@", newWebRTPath);
if (![fileClerk fileExistsAtPath:newWebRTPath]) {