Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #11543 - UK992:browserhtml, r=metajack

Browse source 
Fix ./mach --browserhtml

Rebased https://github.com/servo/servo/pull/10943 and simplified by https://github.com/servo/servo/pull/10943#issuecomment-221643014.
Fixes path related issue with browser.html on Windows and enable borderless window only on OSX.

r? @metajack

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11543)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-08 19:01:42 -05:00
commit 28c0b869ca
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
python/servo/command_base.py
View file

@ -105,6 +105,15 @@ def check_call(*args, **kwargs):
return subprocess.check_call(*args, shell=sys.platform == 'win32', **kwargs) return subprocess.check_call(*args, shell=sys.platform == 'win32', **kwargs)
def is_windows():
""" Detect windows, mingw, cygwin """
return sys.platform == 'win32' or sys.platform == 'msys' or sys.platform == 'cygwin'
def is_macosx():
return sys.platform == 'darwin'
class BuildNotFound(Exception): class BuildNotFound(Exception):
def __init__(self, message): def __init__(self, message):
self.message = message self.message = message

12
python/servo/post_build_commands.py
View file

@ -23,7 +23,7 @@ from mach.decorators import (
Command, Command,
) )
from servo.command_base import CommandBase, cd, call, check_call from servo.command_base import CommandBase, cd, call, check_call, is_windows, is_macosx
def read_file(filename, if_exists=False): def read_file(filename, if_exists=False):
@ -131,7 +131,15 @@ class PostBuildCommands(CommandBase):
if browserhtml_path is None: if browserhtml_path is None:
print("Could not find browserhtml package; perhaps you haven't built Servo.") print("Could not find browserhtml package; perhaps you haven't built Servo.")
return 1 return 1
args = args + ['-w', '-b',
if is_macosx():
# Enable borderless on OSX
args = args + ['-b']
elif is_windows():
# Convert to a relative path to avoid mingw -> Windows path conversions
browserhtml_path = path.relpath(browserhtml_path, os.getcwd())
args = args + ['-w',
'--pref', 'dom.mozbrowser.enabled', '--pref', 'dom.mozbrowser.enabled',
'--pref', 'dom.forcetouch.enabled', '--pref', 'dom.forcetouch.enabled',
'--pref', 'shell.quit-on-escape.enabled=false', '--pref', 'shell.quit-on-escape.enabled=false',