Skip to content

Commit 9b79547

Browse files
authored
Auto merge of servo#29934 - mrobinson:move-third-party, r=atbrakhi
Create a top-level "third_party" directory This directory now contains third_party software that is vendored into the Servo source tree. The idea is that it would eventually hold webrender and other crates from mozilla-central as well with a standard patch management approach for each. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because this should not change behavior. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
2 parents 47faf83 + 8be014e commit 9b79547

File tree

148 files changed

+10
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+10
-7
lines changed

components/script/dom/bindings/codegen/run.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@
66
import sys
77
import json
88

9+
SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__))
10+
SERVO_ROOT = os.path.abspath(os.path.join(SCRIPT_PATH, "..", "..", "..", "..", ".."))
11+
912

1013
def main():
1114
os.chdir(os.path.join(os.path.dirname(__file__)))
12-
sys.path[0:0] = ["./parser", "./ply"]
15+
sys.path.insert(0, os.path.join(SERVO_ROOT, "third_party", "WebIDL"))
16+
sys.path.insert(0, os.path.join(SERVO_ROOT, "third_party", "ply"))
1317

1418
css_properties_json, out_dir = sys.argv[1:]
15-
doc_servo = "../../../../../target/doc/servo"
16-
webidls_dir = "../../webidls"
19+
doc_servo = os.path.join(SERVO_ROOT, "target", "doc", "servo")
20+
webidls_dir = os.path.join(SCRIPT_PATH, "..", "..", "webidls")
1721
config_file = "Bindings.conf"
1822

1923
import WebIDL

python/servo/testing_commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ def test_scripts(self, verbose, very_verbose, all, tests):
339339

340340
if all or tests:
341341
print("Running WebIDL tests...")
342-
test_file_dir = path.abspath(path.join(PROJECT_TOPLEVEL_PATH, "components", "script",
343-
"dom", "bindings", "codegen", "parser"))
342+
343+
test_file_dir = path.abspath(path.join(PROJECT_TOPLEVEL_PATH, "third_party", "WebIDL"))
344344
# For the `import WebIDL` in runtests.py
345345
sys.path.insert(0, test_file_dir)
346346
run_file = path.abspath(path.join(test_file_dir, "runtests.py"))

servo-tidy.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,11 @@ directories = [
140140
"./tests/wpt/mozilla/tests/mozilla/referrer-policy",
141141
"./tests/wpt/mozilla/tests/webgl",
142142
"./python/tidy/tests",
143-
"./components/script/dom/bindings/codegen/parser",
144-
"./components/script/dom/bindings/codegen/ply",
145143
"./python/_virtualenv*",
146144
"./python/mach",
147145
# Generated and upstream code combined with our own. Could use cleanup
148146
"./target",
147+
"./third_party",
149148
]
150149

151150
# Directories that are checked for correct file extension

0 commit comments

Comments
 (0)