Bug 987411 - Fix Simulator path to b2g on Mac. r=ochameau

b2g/simulator/build_xpi.py

@@ -131,7 +131,7 @@ def main(platform):
     ])
 
     # Ship b2g-desktop, but prevent its gaia profile to be shipped in the xpi
-    add_dir_to_zip(xpi_path, os.path.join(distdir, "b2g"), "b2g", ("gaia"))
+    add_dir_to_zip(xpi_path, os.path.join(distdir, "b2g"), "b2g", ("gaia", "B2G.app/Contents/MacOS/gaia"))
     # Then ship our own gaia profile
     add_dir_to_zip(xpi_path, os.path.join(gaia_path, "profile"), "profile")
 

b2g/simulator/lib/simulator-process.js

@@ -141,7 +141,7 @@ exports.SimulatorProcess = Class({
     let bin = URL.toFilename(BIN_URL);
     let executables = {
       WINNT: "b2g-bin.exe",
-      Darwin: "Contents/MacOS/b2g-bin",
+      Darwin: "B2G.app/Contents/MacOS/b2g-bin",
       Linux: "b2g-bin",
     };