Merge b2g-inbound to m-c.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 17 Sep 2013 22:46:32 -0400
changeset 147622 ab4ccf3d6b6028d9c7dfdec85325e472370d3fba
parent 147612 44f4567699ff6775b71be3ed26edb0d8bb0fa5bb (current diff)
parent 147621 9fc5d65192ae323f7a6e4c27d052bed289f7c90a (diff)
child 147675 96d8a2bf056b4fb9c46c58b5f791055fc8e19c55
child 147691 28c6bfc7e99af4404fb8d349401f4efcf48ab5c4
child 147698 57b8a8774e4ffb2fa86092ea625aa6626fe74a57
child 155759 ce80490d1900010d21bd0ea7b277d0233e6298c1
push id25308
push userryanvm@gmail.com
push dateWed, 18 Sep 2013 02:46:31 +0000
treeherdermozilla-central@ab4ccf3d6b60 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone27.0a1
first release with
nightly linux32
ab4ccf3d6b60 / 27.0a1 / 20130918030202 / files
nightly linux64
ab4ccf3d6b60 / 27.0a1 / 20130918030202 / files
nightly mac
ab4ccf3d6b60 / 27.0a1 / 20130918030202 / files
nightly win32
ab4ccf3d6b60 / 27.0a1 / 20130918030202 / files
nightly win64
ab4ccf3d6b60 / 27.0a1 / 20130918030202 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge b2g-inbound to m-c.
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "ca3cef257ae1d19f25cd4b973f7ba2a713b8a7c2", 
+    "revision": "94340fb19f685f3cd6e5fa990281557ba810a10e", 
     "repo_path": "/integration/gaia-central"
 }
--- a/toolkit/webapps/WebappOSUtils.jsm
+++ b/toolkit/webapps/WebappOSUtils.jsm
@@ -129,38 +129,47 @@ this.WebappOSUtils = {
       }
     }
 
     return exeFile;
 #endif
   },
 
   getInstallPath: function(aApp) {
-#ifdef XP_WIN
-    let execFile = this.getLaunchTarget(aApp);
-    if (!execFile) {
+    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;
+      }
 
-    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;
+#endif
     }
-
-    return execFile.parent.path;
-#endif
   },
 
   launch: function(aApp) {
     let uniqueName = this.getUniqueName(aApp);
 
 #ifdef XP_WIN
     let initProcess = CC("@mozilla.org/process/util;1",
                          "nsIProcess", "init");