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

Auto merge of #14531 - UK992:win32-installer, r=larsbergstrom

Browse source 
Various Windows installer fixes and improvements

r? @metajack or @larsbergstrom

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14531)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-12-12 13:07:25 -08:00 • committed by GitHub
commit ced1199c61
2 changed files with 66 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

31
python/servo/package_commands.py
View file

@ -329,33 +329,44 @@ class PackageCommands(CommandBase):
print("Packaged Servo into " + tar_path)
@Command('install',
description='Install Servo (currently, Android only)',
description='Install Servo (currently, Android and Windows only)',
category='package')
@CommandArgument('--release', '-r', action='store_true',
help='Install the release build')
@CommandArgument('--dev', '-d', action='store_true',
help='Install the dev build')
def install(self, release=False, dev=False):
@CommandArgument('--android',
action='store_true',
help='Install on Android')
def install(self, release=False, dev=False, android=False):
try:
binary_path = self.get_binary_path(release, dev, android=True)
binary_path = self.get_binary_path(release, dev, android=android)
except BuildNotFound:
print("Servo build not found. Building servo...")
result = Registrar.dispatch(
"build", context=self.context, release=release, dev=dev
"build", context=self.context, release=release, dev=dev, android=android
)
if result:
return result
try:
binary_path = self.get_binary_path(release, dev, android=True)
binary_path = self.get_binary_path(release, dev, android=android)
except BuildNotFound:
print("Rebuilding Servo did not solve the missing build problem.")
return 1
apk_path = binary_path + ".apk"
if not path.exists(apk_path):
result = Registrar.dispatch("package", context=self.context, release=release, dev=dev)
if android:
pkg_path = binary_path + ".apk"
exec_command = ["adb", "install", "-r", pkg_path]
elif is_windows():
pkg_path = path.join(path.dirname(binary_path), 'msi', 'Servo.msi')
exec_command = ["msiexec", "/i", pkg_path]
if not path.exists(pkg_path):
result = Registrar.dispatch(
"package", context=self.context, release=release, dev=dev, android=android
)
if result != 0:
return result
print(["adb", "install", "-r", apk_path])
return subprocess.call(["adb", "install", "-r", apk_path], env=self.build_env())
print(" ".join(exec_command))
return subprocess.call(exec_command, env=self.build_env())