Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MPL license to https #22198

Merged
merged 5 commits into from Nov 19, 2018
Merged

Update MPL license to https #22198

merged 5 commits into from Nov 19, 2018

Conversation

@Darkspirit
Copy link
Contributor

Darkspirit commented Nov 14, 2018

Current MPL license (https://www.mozilla.org/en-US/MPL/2.0/) contains an https link:

This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.

This change would not remove the summary above the LICENSE file. Tested here.

I didn't update the tests folder with this change because I haven't yet looked into what needs to be considered with regards to WPT. Let's do that with a separate PR.

This change is splitted into multiple parts to prevent any "Load diff" button instead of a preview and was made with following commands:

git checkout -b mpl_https
kate python/tidy/servo_tidy/tidy.py
kate python/tidy/servo_tidy/licenseck.py
git add *
git commit -m "servo-tidy: Allow to use MPL with http and https"

find etc LICENSE mach ports python support -type f -not -path "python/tidy/servo_tidy/licenseck.py" -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 1)"

find components/script/dom/webidls -type f -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 2)"

find components/script -type f -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 3)"

find components -type f -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 4)"
./mach test-tidy --all
git push origin HEAD

  • ./mach test-tidy does not report any errors

This change is Reviewable

@highfive
Copy link

highfive commented Nov 14, 2018

Heads up! This PR modifies the following files:

  • @jgraham: components/webdriver_server/lib.rs
  • @wafflespeanut: python/tidy/servo_tidy_tests/shebang_license.py, python/tidy/servo_tidy_tests/speclink.rs, python/servo/packages.py, python/tidy/servo_tidy/tidy.py, python/tidy/servo_tidy_tests/lib.rs and 12 more
  • @emilio: components/style/values/computed/position.rs, components/style/properties/cascade.rs, components/style/values/specified/mod.rs, components/style/gecko_bindings/sugar/ns_t_array.rs, components/layout/display_list/background.rs and 308 more
  • @KiChjang: components/script/dom/webidls/VRDisplayCapabilities.webidl, components/script/test.rs, components/script/dom/webidls/ErrorEvent.webidl, components/script/webdriver_handlers.rs, components/script/dom/textencoder.rs and 750 more
  • @asajeffrey: components/script/dom/webidls/VRDisplayCapabilities.webidl, components/script/test.rs, components/script/dom/webidls/ErrorEvent.webidl, components/script/webdriver_handlers.rs, components/script/dom/textencoder.rs and 710 more
  • @cbrewster: components/constellation/timer_scheduler.rs, components/constellation/lib.rs, components/constellation/browsingcontext.rs, components/constellation/pipeline.rs, components/constellation/event_loop.rs and 4 more
  • @edunham: python/tidy/servo_tidy_tests/shebang_license.py, python/tidy/servo_tidy_tests/speclink.rs, python/tidy/servo_tidy/tidy.py, python/tidy/servo_tidy_tests/lib.rs, python/tidy/servo_tidy_tests/multiline_string.rs and 8 more
  • @paulrouget: ports/servo/glutin_app/window.rs, components/compositing/build.rs, components/constellation/timer_scheduler.rs, components/compositing/compositor_thread.rs, ports/servo/glutin_app/mod.rs and 22 more
@bors-servo
Copy link
Contributor

bors-servo commented Nov 18, 2018

The latest upstream changes (presumably #22142) made this pull request unmergeable. Please resolve the merge conflicts.

Darkspirit added 5 commits Nov 19, 2018
@jdm
Copy link
Member

jdm commented Nov 19, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2018

📌 Commit 1d6fe65 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 19, 2018

Testing commit 1d6fe65 with merge f1dd31f...

bors-servo added a commit that referenced this pull request Nov 19, 2018
Update MPL license to https

Current MPL license (https://www.mozilla.org/en-US/MPL/2.0/) contains an https link:

> This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.

This change would not remove the summary above the LICENSE file. Tested [here](https://github.com/Darkspirit/darkspirit.github.io/blob/master/LICENSE).

I didn't update the `tests` folder with this change because I haven't yet looked into what needs to be considered with regards to WPT. Let's do that with a separate PR.

This change is splitted into multiple parts to prevent any "Load diff" button instead of a preview and was made with following commands:
```
git checkout -b mpl_https
kate python/tidy/servo_tidy/tidy.py
kate python/tidy/servo_tidy/licenseck.py
git add *
git commit -m "servo-tidy: Allow to use MPL with http and https"

find etc LICENSE mach ports python support -type f -not -path "python/tidy/servo_tidy/licenseck.py" -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 1)"

find components/script/dom/webidls -type f -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 2)"

find components/script -type f -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 3)"

find components -type f -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 4)"
./mach test-tidy --all
git push origin HEAD
```

---
- [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/22198)
<!-- Reviewable:end -->
@bors-servo bors-servo merged commit 1d6fe65 into servo:master Nov 19, 2018
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Darkspirit Darkspirit deleted the Darkspirit:mpl_https branch Nov 19, 2018
@Darkspirit
Copy link
Contributor Author

Darkspirit commented Nov 19, 2018

@jdm Could you publish a new version of servo_tidy on PyPI for webrender? Thanks

moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Dec 3, 2018
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request Dec 3, 2018
mykmelez pushed a commit to mykmelez/gecko that referenced this pull request Dec 4, 2018
mykmelez pushed a commit to mykmelez/gecko that referenced this pull request Dec 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.