Backed out changeset 5eebce6c8845 (bug 1091109) for webapp test failures.

browser/app/macbuild/Contents/MacOS-files.in

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

browser/installer/package-manifest.in

@@ -856,7 +856,11 @@ 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@

testing/mochitest/mach_commands.py

@@ -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', 'Resources', appname)
+            'Contents', 'MacOS', appname)
         else:
             appname = os.path.join(self.distdir, 'bin', appname)
         return appname

testing/testsuite-targets.mk

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

toolkit/webapps/MacNativeApp.js

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

webapprt/mac/webapprt.mm

@@ -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_RESOURCES_PATH,
+        [NSString stringWithFormat: @"%@%s%s", firefoxPath, APP_MACOS_PATH,
                                                WEBAPPRT_EXECUTABLE];
       NSLog(@"### Firefox webapprt path: %@", newWebRTPath);
       if (![fileClerk fileExistsAtPath:newWebRTPath]) {