Commit graph

1150 commits

Author SHA1 Message Date
Josh Matthews
fb5213c8fc Synchronize ANGLE linking path with VS project. 2020-02-20 16:27:08 -05:00
bors-servo
7786464dad
Auto merge of #25761 - luka-zitnik:python-virtualenv-missing, r=jdm
Instruct intallation of python-virtualenv

Fixes servo/servo#23210
Closes servo/servo#23212

<!-- Please describe your changes on the following line: -->
(Re-)enable `./mach bootstrap` by requiring a separate installation step for packages python, python-pip and python-virtualenv.

---
<!-- 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 fix #23210

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because bootstrap command is not covered by tests

<!-- 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. -->
2020-02-20 08:19:05 -05:00
bors-servo
cdd5dc17aa
Auto merge of #25736 - Darkspirit:ossl, r=jdm
Add OpenSSL 1.1.1 build check, Update HSTS Preload list

* This variant also works with cross-compilation. PR should fail in CI on Android at first:
  The net crate successfully compiled after switching to OpenSSL 1.1.1 on Android. It seemed openssl.sh doesn't need any changes.(?)
* Updated HSTS preload list and public suffix list.
* Configured OpenSSL [SECLEVEL=2](https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_security_level.html) like [Debian](https://wiki.debian.org/ContinuousIntegration/TriagingTips/openssl-1.1.1) Stable:
  > As a result RSA, DSA and DH keys shorter than [2048 bits](16a5a9bb78/docs/BR.md (6153-subscriber-certificates)) and ECC keys shorter than 224 bits are prohibited.
* Although all other crates compile I generally get a `libscript-fe019dd3e0a4e06d.rlib: bad extended name index at 8` error on simpleservo_jniapi, I guess Debian Testing is too new and I just haven't found the right steps so far.
./mach build -d --android
```
  = note: /home/darkspirit/github/servo/android-toolchains/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld.gold: error: /home/darkspirit/github/servo/target/android/armv7-linux-androideabi/debug/deps/libscript-fe019dd3e0a4e06d.rlib: bad extended name index at 8
          clang: error: linker command failed with exit code 1 (use -v to see invocation)
          toolchain: /home/darkspirit/github/servo/android-toolchains/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
          libs dir: /home/darkspirit/github/servo/android-toolchains/ndk/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a
          sysroot: /home/darkspirit/github/servo/android-toolchains/ndk/platforms/android-21/arch-arm
          targetdir: /home/darkspirit/github/servo/target/android/armv7-linux-androideabi/debug/build/simpleservo_jniapi-26ef18debb5b3630/out/../../..
```

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #25708, fix #25619.
2020-02-14 12:57:22 -05:00
Luka Zitnik
a15775bad7 Instruct intallation of python-vitualenv
Fixes servo/servo#23210
Closes servo/servo#23212
2020-02-14 03:09:38 +01:00
Jan Andre Ikenmeyer
ad9ee36e7b
Switch Android to OpenSSL 1.1.1d 2020-02-12 13:51:35 +01:00
Robert Bragg
8902aa93e4 Build: check for VC142 MSVC redist dir 2020-02-11 13:56:00 +00:00
bors-servo
39133ee059
Auto merge of #25716 - jdm:revert-angle-up, r=jdm
Revert ANGLE upgrade.

This reverts commit ce6204b904, reversing
changes made to 904fcb4317.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #25683
2020-02-10 13:33:07 -05:00
Josh Matthews
4a4b8bd9bd Revert "Auto merge of #25509 - jdm:angle-up, r=asajeffrey"
This reverts commit ce6204b904, reversing
changes made to 904fcb4317.
2020-02-10 11:25:46 -05:00
takumi
4dec35ca87 fix zip extraction for python 3 2020-02-07 17:56:30 +09:00
Simon Sapin
acfbf8c85a Correctly install 'nigthtly' (without a date) if it’s not installed already.
Should fix errors like:

https://community-tc.services.mozilla.com/tasks/WWNv1op4QUau10ixVuJfFQ/runs/0/logs/https%3A%2F%2Fcommunity-tc.services.mozilla.com%2Fapi%2Fqueue%2Fv1%2Ftask%2FWWNv1op4QUau10ixVuJfFQ%2Fruns%2F0%2Fartifacts%2Fpublic%2Flogs%2Flive.log#L364-401

… where the previous code would find the string `nightly` in the output of `rustup toolchain list` in a line like `nightly-2020-01-16-x86_64-unknown-linux-gnu` and conclude that that toolchain was already installed.
2020-01-31 12:30:22 +01:00
bors-servo
f75b01f07d
Auto merge of #25617 - zhuowei:python3-bootstrap-android, r=jdm
mach: fix `bootstrap-android` on Python 3

When running `python3 ./mach bootstrap-android`, this error occurs:

```
AttributeError: 'HTTPMessage' object has no attribute 'getheader'

  File "/servo/python/servo/bootstrap_commands.py", line 136, in bootstrap_android
    download("sdk", tools.format(system=system))
  File "/servo/python/servo/bootstrap_commands.py", line 117, in download
    download_file(filename, url, archive)
  File "/servo/python/servo/util.py", line 170, in download_file
    download(desc, src, fd)
  File "/servo/python/servo/util.py", line 110, in download
    if resp.info().getheader('Content-Length'):
```

Use the `get()` function instead, which exists in both Python 3 and 2
(where it is a synonym for `getheader()`).

Fixes #25616.
2020-01-27 07:45:58 -05:00
Zhuowei Zhang
634a1127c0 mach: fix bootstrap-android on Python 3
When running `python3 ./mach bootstrap-android`, this error occurs:

```
AttributeError: 'HTTPMessage' object has no attribute 'getheader'

  File "/servo/python/servo/bootstrap_commands.py", line 136, in bootstrap_android
    download("sdk", tools.format(system=system))
  File "/servo/python/servo/bootstrap_commands.py", line 117, in download
    download_file(filename, url, archive)
  File "/servo/python/servo/util.py", line 170, in download_file
    download(desc, src, fd)
  File "/servo/python/servo/util.py", line 110, in download
    if resp.info().getheader('Content-Length'):
```

Use the `get()` function instead, which exists in both Python 3 and 2
(where it is a synonym for `getheader()`).

Fixes #25616.
2020-01-26 10:50:35 -05:00
Zhuowei Zhang
aff14a77e7 mach: fix error on Python 3 when specifying a target
Previously, when running Mach on Python 3, specifying a target when building
causes this error:

```
TypeError: a bytes-like object is required, not 'str'

  File "/servo/python/servo/build_commands.py", line 241, in build
    self.ensure_bootstrapped(target=target)
  File "/servo/python/servo/command_base.py", line 1023, in ensure_bootstrapped
    ["rustup", "target", "list", "--installed", "--toolchain", toolchain]
```

This change encodes the target using utf-8 before comparing.

Fixes #25614.
2020-01-26 10:39:22 -05:00
Josh Matthews
f4c1837eaa
Update windows llvm to 8.0.1. 2020-01-23 13:44:07 +00:00
Warren Fisher
6fa50a423e Add default arguments so that ./mach test --all works 2020-01-19 13:20:36 -04:00
Josh Matthews
fc61190ddc Update ANGLE for UWP build. 2020-01-13 12:54:38 -05:00
bors-servo
9f971f794e
Auto merge of #25300 - MeFisto94:improve-msvc-detection, r=jdm
Mach: Improve Visual Studio detection for non-standard-path installations

Improve locating the Visual Studio installation

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #25225
- [X] These changes do not require tests because testing build infrastructure is difficult
2020-01-08 09:55:14 -05:00
pshaughn
f80958d2e8 Put correct version number in rustup version-requirement string, sys.exit(1) on bad rustup version 2020-01-06 11:23:56 -05:00
Simon Sapin
8fc072a375 Don’t run ensure_bootstrapped when rustup is not used at all.
Linux WPT tasks on our CI don’t have rustup installed.
2020-01-02 19:25:01 +01:00
Simon Sapin
1d3fdc471e Fix Python 3 support in mach’s ensure_bootstrapped 2020-01-02 17:02:12 +01:00
Simon Sapin
895cf695c4 Fix a Python 3 warning
```
/home/simon/projects/servo/python/servo/testing_commands.py:301:
SyntaxWarning: "is not" with a literal. Did you mean "!="?
  if err is not 0:
```
2020-01-02 16:44:17 +01:00
Simon Sapin
f93c03cda3 Install rust-docs rustup component in ./mach doc 2020-01-02 15:48:11 +01:00
Simon Sapin
1110cac184 mach + rustup: use the minimal profile and install rustc-dev 2020-01-02 15:48:11 +01:00
Simon Sapin
6f70a9c1de mach: always call ensure_bootstrapped before call_rustup_run 2020-01-02 15:30:33 +01:00
Simon Sapin
e96bcea669 mach: explicitly install the toolchain and target in ensure_bootstrapped 2020-01-02 15:30:33 +01:00
Simon Sapin
855601ebb4 mach: check rustup version in ensure_bootstrapped() 2020-01-02 15:30:33 +01:00
Simon Sapin
d4da65d149 mach: on Windows, opt into MSVC target for all uses of rust_toolchain() 2020-01-02 15:30:33 +01:00
Simon Sapin
e56e49e98f mach: run rustup target add in ensure_bootstrapped 2020-01-02 15:30:33 +01:00
Simon Sapin
cef92a2050 Mach: rename default_toolchain to rust_toolchain 2020-01-02 14:20:18 +01:00
Josh Matthews
e922d5e11d Print OSMesa environment variables when starting debugger under WPT. 2019-12-20 11:25:19 -05:00
pylbrecht
65a21e9bad Enable raqote by default 2019-12-17 19:51:55 +01:00
MeFisto94
0a80dd9417 Mach: Improve Visual Studio detection for non-standard-path installations 2019-12-16 22:56:02 +01:00
Simon Sapin
d670b4420a Add layout-2020 option to the .servobuild file
… and `--with-layout-2013` command-line option to disable it.
2019-12-16 15:36:18 +01:00
bors-servo
a03a413c15
Auto merge of #25255 - marmeladema:fix-25251, r=jdm
Use filename instead of opened file descriptor when calling ZipFile

This should fix #25251

<!-- 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: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- 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. -->
2019-12-12 11:50:41 -05:00
bors-servo
06e3d13795
Auto merge of #25247 - pshaughn:clean_virtualenv2.7, r=jdm
mach clean now finds the right virtualenv to remove

<!-- Please describe your changes on the following line: -->
mach clean now knows about the 00cf7452ef change and will remove _virtualenv2.7 appropriately

---
<!-- 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 fix problems discussed today with SimonSapin in IRC

<!-- Either: -->
- [X] These changes do not require tests because the functionality being changed uninstalls some of the test framework

<!-- 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. -->
2019-12-12 05:21:16 -05:00
marmeladema
e6a3a9774a Use filename instead of already opened file descriptor when calling ZipFile
This should fix #25251
2019-12-12 00:14:32 +00:00
Patrick Shaughnessy
47fab46ca3 mach clean now finds the right virtualenv 2019-12-11 16:12:55 -05:00
marmeladema
7b5fabe855 Fix tidiness errors for Python3 compatibility across whole repo 2019-12-11 16:03:20 +00:00
marmeladema
9d04f231f4 Make mach test-tidy --no-wpt compatible with Python3
Note: tidiness tests of Python file using flake8 was effectively
broken since a previous commit for Python3 compatibility
2019-12-11 13:57:07 +00:00
bors-servo
8d4cedb911
Auto merge of #24575 - marmeladema:issue-23607/compat, r=SimonSapin
Enable some mach commands to be run with python3

This change finally enable the following commands to be run with python3:
* `build`
* `test-unit`
* `package`

As previously explained, `test-tidy` will require more work in the wpt repository directly. Maybe `test-tidy --no-wpt` is achievable relatively quickly though.

For possible remaining bits that might need to be worked on, see https://github.com/servo/servo/issues/23607

---
<!-- 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

<!-- Either: -->
- [x] There are tests for these changes

<!-- 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. -->
2019-12-10 16:34:10 -05:00
bors-servo
47716cc1aa
Auto merge of #25219 - jdm:angle-uwp-up, r=paulrouget
Update ANGLE for UWP fix.

This fixes a WACK error where the ANGLE DLLs do not contain the App Container feature.
2019-12-10 14:47:32 -05:00
marmeladema
02c55e2eca Use is_linux to check for current platform instead of relying on sys.platform 2019-12-10 16:11:03 +00:00
marmeladema
267eaad4eb Properly open file as 'wb' in archive_deterministically 2019-12-10 16:10:58 +00:00
Josh Matthews
ba8c52854e Update ANGLE for UWP fix. 2019-12-09 14:40:33 -05:00
marmeladema
3f48f2863c Convert cmp= to key= in sort method call for Python3 compatibility 2019-12-09 19:31:46 +00:00
Simon Sapin
7282839cf7 Fix Python Unicode error in './mach filter-intermittents'
Fix https://github.com/servo/servo/issues/25062
2019-12-05 15:48:39 +01:00
Simon Sapin
14f049ddd1 Fix Python Unicode error on macOS CI 2019-12-03 17:55:51 +01:00
Simon Sapin
0ac021c1a5 Include test output in filtered WPT logs 2019-12-03 16:49:23 +01:00
Josh Matthews
fcdf347d83
Support overriding the moztools path order. 2019-11-27 11:56:47 -05:00
Simon Sapin
c156bf2dd9 Add a .servobuild option for --with-debug-assertions 2019-11-26 16:36:24 +01:00