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

Merge latest green inbound changeset and mozilla-central; a=merge

Browse Source
This commit is contained in:
Ed Morley 2014-06-06 16:55:11 +01:00
commit ca9f260ce5
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
b2g/chrome/content/devtools.js
View File

@ -272,14 +272,7 @@ Target.prototype = {
},
_send: function target_send(data) {
let frame = this.frame;
let systemapp = document.querySelector('#systemapp');
if (this.frame === systemapp) {
frame = getContentWindow();
}
shell.sendEvent(frame, 'developer-hud-update', Cu.cloneInto(data, target));
shell.sendEvent(this.frame, 'developer-hud-update', Cu.cloneInto(data, this.frame));
}
};

7
testing/tps/create_venv.py
View File

@ -38,9 +38,11 @@ virtualenv_url = 'https://raw.github.com/pypa/virtualenv/1.9.1/virtualenv.py'
if sys.platform == 'win32':
bin_name = os.path.join('Scripts', 'activate.bat')
activate_env = os.path.join('Scripts', 'activate_this.py')
python_env = os.path.join('Scripts', 'python.exe')
else:
bin_name = os.path.join('bin', 'activate')
activate_env = os.path.join('bin', 'activate_this.py')
python_env = os.path.join('bin', 'python')
def main():
parser = optparse.OptionParser('Usage: %prog [options] path_to_venv')
@ -65,13 +67,12 @@ def main():
subprocess.check_call(cmd_args)
# Activate tps environment
tps_env = os.path.join(target, activate_env)
execfile(tps_env, dict(__file__=tps_env))
# Install TPS in environment
subprocess.check_call(['python', os.path.join(here, 'setup.py'),
'install'])
subprocess.check_call([os.path.join(target, python_env),
os.path.join(here, 'setup.py'), 'install'])
# Get the path to tests and extensions directory by checking check where
# the tests and extensions directories are located