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

Add --magicleap option to mach install

Browse source
This commit is contained in:
Alan Jeffrey 2019-08-19 10:26:15 -05:00
parent d5430ceba6
commit 88a3021c9d
1 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

34
python/servo/package_commands.py
View file

@ -487,6 +487,10 @@ class PackageCommands(CommandBase):
@CommandArgument('--android', @CommandArgument('--android',
action='store_true', action='store_true',
help='Install on Android') help='Install on Android')
@CommandArgument('--magicleap',
default=None,
action='store_true',
help='Install on Magic Leap')
@CommandArgument('--emulator', @CommandArgument('--emulator',
action='store_true', action='store_true',
help='For Android, install to the only emulated device') help='For Android, install to the only emulated device')
@ -496,29 +500,44 @@ class PackageCommands(CommandBase):
@CommandArgument('--target', '-t', @CommandArgument('--target', '-t',
default=None, default=None,
help='Install the given target platform') help='Install the given target platform')
def install(self, release=False, dev=False, android=False, emulator=False, usb=False, target=None): def install(self, release=False, dev=False, android=False, magicleap=False, emulator=False, usb=False, target=None):
env = self.build_env()
if target and android: if target and android:
print("Please specify either --target or --android.") print("Please specify either --target or --android.")
sys.exit(1) sys.exit(1)
if not android: if not android:
android = self.handle_android_target(target) android = self.handle_android_target(target)
if target and magicleap:
print("Please specify either --target or --magicleap.")
sys.exit(1)
if magicleap:
target = "aarch64-linux-android"
env = self.build_env(target=target)
try: try:
binary_path = self.get_binary_path(release, dev, android=android) binary_path = self.get_binary_path(release, dev, android=android, magicleap=magicleap)
except BuildNotFound: except BuildNotFound:
print("Servo build not found. Building servo...") print("Servo build not found. Building servo...")
result = Registrar.dispatch( result = Registrar.dispatch(
"build", context=self.context, release=release, dev=dev, android=android "build", context=self.context, release=release, dev=dev, android=android, magicleap=magicleap,
) )
if result: if result:
return result return result
try: try:
binary_path = self.get_binary_path(release, dev, android=android) binary_path = self.get_binary_path(release, dev, android=android, magicleap=magicleap)
except BuildNotFound: except BuildNotFound:
print("Rebuilding Servo did not solve the missing build problem.") print("Rebuilding Servo did not solve the missing build problem.")
return 1 return 1
if android: if magicleap:
if not env.get("MAGICLEAP_SDK"):
raise Exception("Magic Leap installs need the MAGICLEAP_SDK environment variable")
mldb = path.join(env.get("MAGICLEAP_SDK"), "tools", "mldb", "mldb")
pkg_path = path.join(path.dirname(binary_path), "Servo.mpk")
exec_command = [
mldb,
"install", "-u",
pkg_path,
]
elif android:
pkg_path = self.get_apk_path(release) pkg_path = self.get_apk_path(release)
exec_command = [self.android_adb_path(env)] exec_command = [self.android_adb_path(env)]
if emulator and usb: if emulator and usb:
@ -534,8 +553,9 @@ class PackageCommands(CommandBase):
exec_command = ["msiexec", "/i", pkg_path] exec_command = ["msiexec", "/i", pkg_path]
if not path.exists(pkg_path): if not path.exists(pkg_path):
print("Servo package not found. Packaging servo...")
result = Registrar.dispatch( result = Registrar.dispatch(
"package", context=self.context, release=release, dev=dev, android=android "package", context=self.context, release=release, dev=dev, android=android, magicleap=magicleap,
) )
if result != 0: if result != 0:
return result return result