diff --git a/Cargo.lock b/Cargo.lock index 7cad7427505..0495a26b832 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -256,11 +256,6 @@ dependencies = [ "alloc-no-stdlib 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "browserhtml" -version = "0.1.17" -source = "git+https://github.com/browserhtml/browserhtml?branch=crate#84913eafd817c92fbb6bdbb8a8f7480baddee3d3" - [[package]] name = "byteorder" version = "1.2.1" @@ -2576,7 +2571,6 @@ dependencies = [ "android_injected_glue 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "browserhtml 0.1.17 (git+https://github.com/browserhtml/browserhtml?branch=crate)", "compositing 0.0.1", "euclid 0.16.4 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3539,7 +3533,6 @@ dependencies = [ "checksum blurz 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e73bda0f4c71c63a047351070097f3f507e6718e86b9ee525173371ef7b94b73" "checksum brotli 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fe87b40996b84fdc56e57c165d93079f4b50cb806598118e692ddfaa3d3c57c0" "checksum brotli-decompressor 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "313f4b6cc0b365d6b88eda5aa40175ee34ac6efa9a79e0b3b8202eca90247ba8" -"checksum browserhtml 0.1.17 (git+https://github.com/browserhtml/browserhtml?branch=crate)" = "" "checksum byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "652805b7e73fada9d85e9a6682a4abd490cb52d96aeecc12e33a0de34dfd0d23" "checksum bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c129aff112dcc562970abb69e2508b40850dd24c274761bb50fb8a0067ba6c27" "checksum caseless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8950b075cff75cdabadee97148a8b5816c7cf62e5948a6005b5255d564b42fe7" diff --git a/Info.plist b/Info.plist index a3136514d3a..ded92bf0267 100644 --- a/Info.plist +++ b/Info.plist @@ -3,7 +3,7 @@ CFBundleExecutable - run-servo + servo CFBundleGetInfoString Servo CFBundleIconFile diff --git a/README.md b/README.md index fe24a22478a..1572d33db0b 100644 --- a/README.md +++ b/README.md @@ -253,11 +253,6 @@ Run Servo with the command: ./mach run https://www.google.com ``` -Also, don't miss the info on the [browserhtml page](https://github.com/browserhtml/browserhtml) on how to run the Browser.html -full tech demo (it provides a more browser-like experience than just browsing a single -URL with servo). - - ### Commandline Arguments - `-p INTERVAL` turns on the profiler and dumps info to the console every diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml index b2632a3731f..a0fb6fd3b10 100644 --- a/ports/servo/Cargo.toml +++ b/ports/servo/Cargo.toml @@ -26,7 +26,6 @@ unstable = ["libservo/unstable"] [dependencies] backtrace = "0.3" -browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "crate"} bitflags = "1.0" compositing = {path = "../../components/compositing"} euclid = "0.16" diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 8cc307bfb51..ef0e7dacc3f 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -65,13 +65,6 @@ def find_dep_path_newest(package, bin_path): 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): """Create a .tar.gz archive in a deterministic (reproducible) manner. diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 6912962c095..2a2f2f74d8c 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -36,7 +36,6 @@ from servo.command_base import ( CommandBase, is_macosx, is_windows, - get_browserhtml_path, ) from servo.util import delete @@ -228,11 +227,9 @@ class PackageCommands(CommandBase): if path.exists(dir_to_dmg): print("Cleaning up from previous packaging") delete(dir_to_dmg) - browserhtml_path = get_browserhtml_path(binary_path) print("Copying files") shutil.copytree(path.join(dir_to_root, 'resources'), dir_to_resources) - shutil.copytree(browserhtml_path, path.join(dir_to_resources, 'browserhtml')) shutil.copy2(path.join(dir_to_root, 'Info.plist'), path.join(dir_to_app, 'Contents', 'Info.plist')) content_dir = path.join(dir_to_app, 'Contents', 'MacOS') @@ -264,16 +261,6 @@ class PackageCommands(CommandBase): credits_file.write(template.render(version=version)) delete(template_path) - print("Writing run-servo") - bhtml_path = path.join('${0%/*}', '..', 'Resources', 'browserhtml', 'index.html') - runservo = os.open( - path.join(content_dir, 'run-servo'), - os.O_WRONLY | os.O_CREAT, - int("0755", 8) - ) - os.write(runservo, '#!/bin/bash\nexec ${0%/*}/servo ' + bhtml_path) - os.close(runservo) - print("Creating dmg") os.symlink('/Applications', path.join(dir_to_dmg, 'Applications')) dmg_path = path.join(target_dir, "servo-tech-demo.dmg") @@ -323,14 +310,12 @@ class PackageCommands(CommandBase): print("Cleaning up from previous packaging") delete(dir_to_msi) os.makedirs(dir_to_msi) - browserhtml_path = get_browserhtml_path(binary_path) print("Copying files") dir_to_temp = path.join(dir_to_msi, 'temp') dir_to_temp_servo = path.join(dir_to_temp, 'servo') dir_to_resources = path.join(dir_to_temp_servo, 'resources') shutil.copytree(path.join(dir_to_root, 'resources'), dir_to_resources) - shutil.copytree(browserhtml_path, path.join(dir_to_temp_servo, 'browserhtml')) shutil.copy(binary_path, dir_to_temp_servo) shutil.copy("{}.manifest".format(binary_path), dir_to_temp_servo) copy_windows_dependencies(target_dir, dir_to_temp_servo) @@ -372,7 +357,6 @@ class PackageCommands(CommandBase): delete(dir_to_temp) else: dir_to_temp = path.join(target_dir, 'packaging-temp') - browserhtml_path = get_browserhtml_path(binary_path) if path.exists(dir_to_temp): # TODO(aneeshusa): lock dir_to_temp to prevent simultaneous builds print("Cleaning up from previous packaging") @@ -381,7 +365,6 @@ class PackageCommands(CommandBase): print("Copying files") dir_to_resources = path.join(dir_to_temp, 'resources') shutil.copytree(path.join(dir_to_root, 'resources'), dir_to_resources) - shutil.copytree(browserhtml_path, path.join(dir_to_temp, 'browserhtml')) shutil.copy(binary_path, dir_to_temp) change_prefs(dir_to_resources, "linux") diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index 30d1eed9bc0..115c03f30b5 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -23,8 +23,7 @@ from mach.decorators import ( from servo.command_base import ( CommandBase, check_call, check_output, BIN_SUFFIX, - is_linux, is_windows, is_macosx, set_osmesa_env, - get_browserhtml_path, + is_linux, set_osmesa_env, ) @@ -53,8 +52,6 @@ class PostBuildCommands(CommandBase): 'have no effect without this.') @CommandArgument('--debugger', default=None, type=str, help='Name of debugger to use.') - @CommandArgument('--browserhtml', '-b', action='store_true', - help='Launch with Browser.html') @CommandArgument('--headless', '-z', action='store_true', help='Launch in headless mode') @CommandArgument('--software', '-s', action='store_true', @@ -64,7 +61,7 @@ class PostBuildCommands(CommandBase): @CommandArgument( 'params', nargs='...', help="Command-line arguments to be passed through to Servo") - def run(self, params, release=False, dev=False, android=None, debug=False, debugger=None, browserhtml=False, + def run(self, params, release=False, dev=False, android=None, debug=False, debugger=None, headless=False, software=False, bin=None): env = self.build_env() env["RUST_BACKTRACE"] = "1" @@ -100,20 +97,6 @@ class PostBuildCommands(CommandBase): args = [bin or self.get_binary_path(release, dev)] - if browserhtml: - browserhtml_path = get_browserhtml_path(args[0]) - 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 + ['--pref', 'dom.mozbrowser.enabled', - '--pref', 'dom.forcetouch.enabled', - '--pref', 'shell.builtin-key-shortcuts.enabled=false', - path.join(browserhtml_path, 'index.html')] - if headless: set_osmesa_env(args[0], env) args.append('-z') diff --git a/resources/package-prefs.json b/resources/package-prefs.json index b68db95d663..0762de26cbc 100644 --- a/resources/package-prefs.json +++ b/resources/package-prefs.json @@ -1,7 +1,3 @@ { - "dom.forcetouch.enabled": true, - "dom.mozbrowser.enabled": true, - "shell.builtin-key-shortcuts.enabled": false, - "os:windows,os:linux;shell.homepage": "browserhtml/index.html", - "os:macosx;shell.native-titlebar.enabled": false + "_comment": "this file is used to add some specific preferences to the Servo package (nightly builds)" } diff --git a/resources/prefs.json b/resources/prefs.json index f7682c8f182..0c42ab221ec 100644 --- a/resources/prefs.json +++ b/resources/prefs.json @@ -8,7 +8,6 @@ "dom.gamepad.enabled": false, "dom.microdata.testing.enabled": true, "dom.mouseevent.which.enabled": false, - "dom.mozbrowser.enabled": false, "dom.mutation_observer.enabled": false, "dom.permissions.enabled": false, "dom.permissions.testing.allowed_in_nonsecure_contexts": false, diff --git a/support/windows/Servo.wxs.mako b/support/windows/Servo.wxs.mako index 08294abd392..a2a62ccb581 100644 --- a/support/windows/Servo.wxs.mako +++ b/support/windows/Servo.wxs.mako @@ -44,7 +44,6 @@ ${include_directory(resources_path, "resources")} - ${include_directory(path.join(dir_to_temp, "browserhtml"), "browserhtml")}