Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Set windows subsystem on MSVC builds with editbin

Browse source
This commit is contained in:
Vladimir Vukicevic 2016-07-29 15:42:12 -04:00
parent 5bbec7469d
commit 82df8e9399
1 changed files with 33 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

29
python/servo/build_commands.py
View file

@ -23,7 +23,7 @@ from mach.decorators import (
Command, Command,
) )
from servo.command_base import CommandBase, cd, call, BIN_SUFFIX from servo.command_base import CommandBase, cd, call, BIN_SUFFIX, host_triple
def format_duration(seconds): def format_duration(seconds):
@ -86,11 +86,11 @@ def notify_darwin(title, text):
raise Exception("Optional Python module 'pyobjc' is not installed.") raise Exception("Optional Python module 'pyobjc' is not installed.")
def notify_build_done(elapsed): def notify_build_done(elapsed, success=True):
"""Generate desktop notification when build is complete and the """Generate desktop notification when build is complete and the
elapsed build time was longer than 30 seconds.""" elapsed build time was longer than 30 seconds."""
if elapsed > 30: if elapsed > 30:
notify("Servo build", "Completed in %s" % format_duration(elapsed)) notify("Servo build", "%s in %s" % ("Completed" if success else "FAILED", format_duration(elapsed)))
def notify(title, text): def notify(title, text):
@ -236,21 +236,30 @@ class MachCommands(CommandBase):
cargo_binary = "cargo" + BIN_SUFFIX cargo_binary = "cargo" + BIN_SUFFIX
if sys.platform == "win32" or sys.platform == "msys": if sys.platform in ("win32", "msys"):
env["RUSTFLAGS"] = "-C link-args=-Wl,--subsystem,windows" if "msvc" not in host_triple():
env[b'RUSTFLAGS'] = b'-C link-args=-Wl,--subsystem,windows'
status = call( status = call(
[cargo_binary, "build"] + opts, [cargo_binary, "build"] + opts,
env=env, cwd=self.servo_crate(), verbose=verbose) env=env, cwd=self.servo_crate(), verbose=verbose)
elapsed = time() - build_start elapsed = time() - build_start
if sys.platform == "win32" or sys.platform == "msys": # Do some additional things if the build succeeded
if status == 0:
if sys.platform in ("win32", "msys"):
servo_exe_dir = path.join(base_path, "debug" if dev else "release")
# On windows, copy in our manifest
shutil.copy(path.join(self.get_top_dir(), "components", "servo", "servo.exe.manifest"), shutil.copy(path.join(self.get_top_dir(), "components", "servo", "servo.exe.manifest"),
path.join(base_path, "debug" if dev else "release")) servo_exe_dir)
# And on msvc builds, use editbin to change the subsystem to windows
if "msvc" in host_triple():
call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")],
verbose=verbose)
elif sys.platform == "darwin":
# On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools # On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools
# like Instruments.app. # like Instruments.app.
if sys.platform == "darwin":
try: try:
import Cocoa import Cocoa
icon_path = path.join(self.get_top_dir(), "resources", "servo.png") icon_path = path.join(self.get_top_dir(), "resources", "servo.png")
@ -263,9 +272,9 @@ class MachCommands(CommandBase):
pass pass
# Generate Desktop Notification if elapsed-time > some threshold value # Generate Desktop Notification if elapsed-time > some threshold value
notify_build_done(elapsed) notify_build_done(elapsed, status == 0)
print("Build completed in %s" % format_duration(elapsed)) print("Build %s in %s" % ("Completed" if status == 0 else "FAILED", format_duration(elapsed)))
return status return status
@Command('build-cef', @Command('build-cef',