Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 15:18:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move get_browserhtml_path to command_base #14815

Browse source 
Remove unused import of find_dep_path_newest #14815

Move get_browserhtml_path top along with find_dep_path_newest #14815
This commit is contained in:
Teodor Szente 2017-01-02 00:16:55 +02:00
parent bbe70c7c5f
commit 48df976bcd
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/servo/command_base.py
View file

@ -61,6 +61,13 @@ def find_dep_path_newest(package, bin_path):
return None return None
def get_browserhtml_path(binary_path):
browserhtml_path = find_dep_path_newest('browserhtml', binary_path)
if browserhtml_path:
return path.join(browserhtml_path, "out")
sys.exit("Could not find browserhtml package; perhaps you haven't built Servo.")
def archive_deterministically(dir_to_archive, dest_archive, prepend_path=None): def archive_deterministically(dir_to_archive, dest_archive, prepend_path=None):
"""Create a .tar.gz archive in a deterministic (reproducible) manner. """Create a .tar.gz archive in a deterministic (reproducible) manner.

10
python/servo/package_commands.py
View file

@ -36,8 +36,9 @@ from servo.command_base import (
CommandBase, CommandBase,
is_macosx, is_macosx,
is_windows, is_windows,
get_browserhtml_path,
) )
from servo.post_build_commands import find_dep_path_newest from servo.command_base import find_dep_path_newest
def delete(path): def delete(path):
@ -123,13 +124,6 @@ def change_prefs(resources_path, platform):
delete(package_prefs_path) delete(package_prefs_path)
def get_browserhtml_path(binary_path):
browserhtml_path = find_dep_path_newest('browserhtml', binary_path)
if browserhtml_path:
return path.join(browserhtml_path, "out")
sys.exit("Could not find browserhtml package; perhaps you haven't built Servo.")
@CommandProvider @CommandProvider
class PackageCommands(CommandBase): class PackageCommands(CommandBase):
@Command('package', @Command('package',

9
python/servo/post_build_commands.py
View file

@ -24,8 +24,9 @@ from mach.decorators import (
from servo.command_base import ( from servo.command_base import (
CommandBase, CommandBase,
call, check_call, find_dep_path_newest, call, check_call,
is_windows, is_macosx, set_osmesa_env, is_windows, is_macosx, set_osmesa_env,
get_browserhtml_path,
) )
@ -97,11 +98,7 @@ class PostBuildCommands(CommandBase):
args = [self.get_binary_path(release, dev)] args = [self.get_binary_path(release, dev)]
if browserhtml: if browserhtml:
browserhtml_path = find_dep_path_newest('browserhtml', args[0]) browserhtml_path = get_browserhtml_path('browserhtml', args[0])
if browserhtml_path is None:
print("Could not find browserhtml package; perhaps you haven't built Servo.")
return 1
if is_macosx(): if is_macosx():
# Enable borderless on OSX # Enable borderless on OSX
args = args + ['-b'] args = args + ['-b']