diff options
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/lints/wpt_lint.py | 45 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 48 | ||||
| -rw-r--r-- | python/servo/testing_commands.py | 6 |
3 files changed, 30 insertions, 69 deletions
diff --git a/python/servo/lints/wpt_lint.py b/python/servo/lints/wpt_lint.py deleted file mode 100644 index ada03b65a99..00000000000 --- a/python/servo/lints/wpt_lint.py +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2013 The Servo Project Developers. See the COPYRIGHT -# file at the top-level directory of this distribution. -# -# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -# option. This file may not be copied, modified, or distributed -# except according to those terms. - -from __future__ import print_function - -import os -import sys - -from servo_tidy.tidy import LintRunner, filter_file - -WPT_PATH = os.path.join(".", "tests", "wpt") -SUITES = ["web-platform-tests", os.path.join("mozilla", "tests")] - - -class Lint(LintRunner): - def _get_wpt_files(self, suite): - working_dir = os.path.join(WPT_PATH, suite, '') - file_iter = self.get_files(working_dir, exclude_dirs=[]) - print('\nRunning the WPT lint on %s...' % working_dir) - for f in file_iter: - if filter_file(f): - yield f[len(working_dir):] - - def run(self): - if self.stylo or self.no_wpt: - return - - wpt_working_dir = os.path.abspath(os.path.join(WPT_PATH, "web-platform-tests")) - for suite in SUITES: - files = list(self._get_wpt_files(suite)) - if not files: - continue - sys.path.insert(0, wpt_working_dir) - from tools.lint import lint - file_dir = os.path.abspath(os.path.join(WPT_PATH, suite)) - returncode = lint.lint(file_dir, files, output_format="json") - sys.path.remove(wpt_working_dir) - if returncode: - yield ("WPT Lint Tool", "", "lint error(s) in Web Platform Tests: exit status %s" % returncode) diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 13ef267f6c2..b8e22d42b72 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -41,7 +41,7 @@ from servo.command_base import ( ) from servo.build_commands import copy_dependencies, change_rpath_in_binary from servo.gstreamer import macos_gst_root -from servo.util import delete +from servo.util import delete, get_target_dir # Note: mako cannot be imported at the top level because it breaks mach bootstrap sys.path.append(path.join(path.dirname(__file__), "..", "..", @@ -49,42 +49,50 @@ sys.path.append(path.join(path.dirname(__file__), "..", "..", PACKAGES = { 'android': [ - 'target/android/armv7-linux-androideabi/release/servoapp.apk', - 'target/android/armv7-linux-androideabi/release/servoview.aar', + 'android/armv7-linux-androideabi/release/servoapp.apk', + 'android/armv7-linux-androideabi/release/servoview.aar', ], 'linux': [ - 'target/release/servo-tech-demo.tar.gz', + 'release/servo-tech-demo.tar.gz', ], 'linux-layout2020': [ - 'target/release/servo-tech-demo.tar.gz', + 'release/servo-tech-demo.tar.gz', ], 'mac': [ - 'target/release/servo-tech-demo.dmg', + 'release/servo-tech-demo.dmg', ], 'mac-layout2020': [ - 'target/release/servo-tech-demo.dmg', + 'release/servo-tech-demo.dmg', ], 'macbrew': [ - 'target/release/brew/servo.tar.gz', + 'release/brew/servo.tar.gz', ], 'maven': [ - 'target/android/gradle/servoview/maven/org/mozilla/servoview/servoview-armv7/', - 'target/android/gradle/servoview/maven/org/mozilla/servoview/servoview-x86/', + 'android/gradle/servoview/maven/org/mozilla/servoview/servoview-armv7/', + 'android/gradle/servoview/maven/org/mozilla/servoview/servoview-x86/', ], 'windows-msvc': [ - r'target\release\msi\Servo.exe', - r'target\release\msi\Servo.zip', + r'release\msi\Servo.exe', + r'release\msi\Servo.zip', ], 'windows-msvc-layout2020': [ - r'target\release\msi\Servo.exe', - r'target\release\msi\Servo.zip', - ], - 'uwp': [ - r'support\hololens\AppPackages\ServoApp\FirefoxReality.zip', + r'release\msi\Servo.exe', + r'release\msi\Servo.zip', ], } +def packages_for_platform(platform): + target_dir = get_target_dir() + + if platform == "uwp": + yield r'support\hololens\AppPackages\ServoApp\FirefoxReality.zip' + return + + for package in PACKAGES[platform]: + yield path.join(target_dir, package) + + def listfiles(directory): return [f for f in os.listdir(directory) if path.isfile(path.join(directory, f))] @@ -652,7 +660,7 @@ class PackageCommands(CommandBase): ], stdout=DEVNULL, stderr=DEVNULL) timestamp = datetime.utcnow().replace(microsecond=0) - for package in PACKAGES[platform]: + for package in packages_for_platform(platform): if path.isdir(package): continue if not path.isfile(package): @@ -677,11 +685,11 @@ class PackageCommands(CommandBase): upload_to_github_release(platform, package, package_hash) if platform == 'maven': - for package in PACKAGES[platform]: + for package in packages_for_platform(platform): update_maven(package) if platform == 'macbrew': - packages = PACKAGES[platform] + packages = list(packages_for_platform(platform)) assert(len(packages) == 1) update_brew(packages[0], timestamp) diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 6ed56465ecc..291a00b15c0 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -31,14 +31,12 @@ from mach.decorators import ( CommandProvider, Command, ) +import tidy -from servo_tidy import tidy from servo.command_base import ( CommandBase, call, check_call, check_output, ) -from servo_tidy_tests import test_tidy - from servo.util import delete from distutils.dir_util import copy_tree @@ -298,7 +296,7 @@ class MachCommands(CommandBase): help="Only handle files in the stylo tree") def test_tidy(self, all_files, no_progress, self_test, stylo, force_cpp=False, no_wpt=False): if self_test: - return test_tidy.do_tests() + return tidy.do_tests() else: if no_wpt: manifest_dirty = False |