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 976773 - Fix simulator path on Windows and fix the simulator addon versioning. r=jryans

Browse Source
This commit is contained in:
Alexandre Poirot 2014-04-04 08:19:09 -04:00
parent bb2d762d2e
commit 5da8206c18
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/simulator/build_xpi.py
View File

@ -48,10 +48,12 @@ def process_package_overload(src, dst, version, app_buildid):
# First replace numeric version like '1.3'
# Then replace with 'slashed' version like '1_4'
# Finally set the full length addon version like 1.3.20131230
# (reduce the app build id to only the build date
# as addon manager doesn't handle big ints in addon versions)
defines = {
"NUM_VERSION": version,
"SLASH_VERSION": version.replace(".", "_"),
"FULL_VERSION": ("%s.%s" % (version, app_buildid))
"FULL_VERSION": ("%s.%s" % (version, app_buildid[:8]))
}
pp = Preprocessor(defines=defines)
pp.do_filter("substitution")

6
b2g/simulator/lib/simulator-process.js
View File

@ -145,8 +145,10 @@ exports.SimulatorProcess = Class({
Linux: "b2g-bin",
};
console.log("bin url: "+bin+"/"+executables[Runtime.OS]);
let path = bin + "/" + executables[Runtime.OS];
let path = bin;
path += Runtime.OS == "WINNT" ? "\\" : "/";
path += executables[Runtime.OS];
console.log("simulator path: " + path);
let executable = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
executable.initWithPath(path);