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

deps: update v8_inspector #7796

Merged
merged 5 commits into from
Jul 27, 2016
Merged

deps: update v8_inspector #7796

merged 5 commits into from
Jul 27, 2016

Conversation

ofrobots
Copy link
Contributor

@ofrobots ofrobots commented Jul 19, 2016

Checklist
  • make -j4 test (UNIX), or vcbuild test nosign (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

deps:v8_inspector

Description of change

To add a LICENSE file along with the v8_inspector code, we need to
pick up v8_inspector from an intermediate repository:
https://github.com/pavelfeldman/v8_inspector. This repo still tracks
upstream code in Blink.

This roll also picks up the latest v8_inspector from upstream fixing
a few issues.

  • Pickup commit id bc60957 from pavelfeldman/v8_inspector
  • Update node.gyp to adapt to the new file paths
  • Update the DevTools hash for the devtools frontend.

Fixes: #7123
Fixes: #7736
Fixes: #7734

EDIT: CI: https://ci.nodejs.org/job/node-test-pull-request/3337/
EDIT: CI: https://ci.nodejs.org/job/node-test-pull-request/3361/

@nodejs-github-bot nodejs-github-bot added the inspector Issues and PRs related to the V8 inspector protocol label Jul 19, 2016
@gibfahn
Copy link
Member

gibfahn commented Jul 19, 2016

@rvagg As this includes a new License file deps/v8_inspector/third_party/v8_inspector/LICENSE, presumably license-builder.sh will need to be updated and then run to update the Node license?

Not sure if this is normally done during or after landing a PR...

Ref; #7123 (comment)

@MylesBorins
Copy link
Contributor

I think it could easily be included in this PR as a separate commit

@bnoordhuis
Copy link
Member

LGTM but can you break up the long line in node.gyp? GYP supports C-style string concatenation so you can just continue on the next line.

Also, is there a reason the jinja test suite is included? Doesn't seem very necessary.

# v8_inspector
addlicense "v8_inspector" "deps/v8_inspector/third_party/v8_inspector" \
"$(cat ${rootdir}/deps/v8_inspector/third_party/v8_inspector/LICENSE)"
# Build tooling for v8_inspector
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rvagg Is the ordering here important? Should the inspector be above the build/test tools?

@ofrobots
Copy link
Contributor Author

ofrobots commented Jul 21, 2016

I have updated license-builder.sh and also included a commit to update the LICENSE file.

@bnoordhuis fixed long line in node.gyp.

Also, is there a reason the jinja test suite is included? Doesn't seem very necessary.

No strong reason other than minimizing the number of local changes to a vendored dependency in order to minimize the work if the dependency needs to be updated in the future. Is there a particular reason why the jinja test files should be locally deleted?

EDIT: New CI: https://ci.nodejs.org/job/node-test-pull-request/3361/

@ofrobots
Copy link
Contributor Author

The failures in the CI look like infrastructure / flakes. Will land tomorrow.

@bnoordhuis
Copy link
Member

Is there a particular reason why the jinja test files should be locally deleted?

Do they end up in release tarballs? If yes, they should either be deleted from the tree or the $(TARBALL) rule in the top-level Makefile should delete them before packaging.

@gibfahn
Copy link
Member

gibfahn commented Jul 22, 2016

@ofrobots it sounds like an update_inspector.sh script might be useful if you're having to manually rip this out of Chromium source every time.

@ofrobots
Copy link
Contributor Author

Removed tests from jinja2. New CI: https://ci.nodejs.org/job/node-test-pull-request/3401/.

@gibfahn

it sounds like an update_inspector.sh script might be useful if you're having to manually rip this out of Chromium source every time.

The next time I have to do this, I will definitely consider writing a update_inspector.sh script 😄. Hopefully these dependencies don't change very frequently. I am also hoping that v8-inspector will land in V8 at some point in the near future.

@Trott
Copy link
Member

Trott commented Jul 25, 2016

Will probably want to re-run CI after #7873 lands (hopefully within the hour). That will fix the bad build on four of the Linux hosts.

@ofrobots
Copy link
Contributor Author

Reran twice: https://ci.nodejs.org/job/node-test-pull-request/3408/, https://ci.nodejs.org/job/node-test-pull-request/3410/. windows-fanned builds seems to timeout after 30 minutes. The rest is looking green.

@Trott
Copy link
Member

Trott commented Jul 26, 2016

One last time hoping the Windows stuff has passed: https://ci.nodejs.org/job/node-test-pull-request/3412/

@ofrobots
Copy link
Contributor Author

That one failed too. Seems like the windows-fanned builds have infra issues. I will land this PR tomorrow morning.

@ofrobots
Copy link
Contributor Author

One more build after a rebase: https://ci.nodejs.org/job/node-test-pull-request/3424/.

@ofrobots
Copy link
Contributor Author

All green!!1! However, I noticed that the update licenses commit was added after the LGTM from @bnoordhuis . Can I get some LGTMs before landing?

@jasnell
Copy link
Member

jasnell commented Jul 26, 2016

Lgtm

@bnoordhuis
Copy link
Member

Still LGTM.

ofrobots added 5 commits July 27, 2016 07:28
To add a LICENSE file along with the v8_inspector code, we need to
pick up v8_inspector from an intermediate repository:
https://github.com/pavelfeldman/v8_inspector. This repo still tracks
upstream code in Blink.

This roll also picks up the latest v8_inspector from upstream fixing
a few issues.

* Pickup commit id bc60957 from pavelfeldman/v8_inspector
* Update node.gyp to adapt to the new file paths
* Update the DevTools hash for the devtools frontend.

Fixes: nodejs#7123
Fixes: nodejs#7736
Fixes: nodejs#7734
PR-URL: nodejs#7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
jinja.el is not shipped as part of the distribution, and neither is
it used in the build. While not strictly necessary, removing it
simplifies life from a licensing point of view.

PR-URL: nodejs#7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
Start including the license from v8_inspector and its build time
dependencies: jinja2 and markupsafe.

PR-URL: nodejs#7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
Created using `tools/license-builder.sh`.

PR-URL: nodejs#7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
PR-URL: nodejs#7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
@ofrobots ofrobots merged commit 2554549 into nodejs:master Jul 27, 2016
@ofrobots
Copy link
Contributor Author

ofrobots commented Jul 27, 2016

Thanks. Landed as ea725ed...2554549.

@cjihrig cjihrig mentioned this pull request Aug 8, 2016
@cjihrig
Copy link
Contributor

cjihrig commented Aug 10, 2016

@ofrobots could you backport this to v6.x. It applies cleanly, but causes compile errors.

@ofrobots
Copy link
Contributor Author

@cjihrig I will take a look.

cjihrig pushed a commit that referenced this pull request Aug 11, 2016
To add a LICENSE file along with the v8_inspector code, we need to
pick up v8_inspector from an intermediate repository:
https://github.com/pavelfeldman/v8_inspector. This repo still tracks
upstream code in Blink.

This roll also picks up the latest v8_inspector from upstream fixing
a few issues.

* Pickup commit id bc60957 from pavelfeldman/v8_inspector
* Update node.gyp to adapt to the new file paths
* Update the DevTools hash for the devtools frontend.

Fixes: #7123
Fixes: #7736
Fixes: #7734
PR-URL: #7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
cjihrig pushed a commit that referenced this pull request Aug 11, 2016
jinja.el is not shipped as part of the distribution, and neither is
it used in the build. While not strictly necessary, removing it
simplifies life from a licensing point of view.

PR-URL: #7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
cjihrig pushed a commit that referenced this pull request Aug 11, 2016
Start including the license from v8_inspector and its build time
dependencies: jinja2 and markupsafe.

PR-URL: #7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
cjihrig pushed a commit that referenced this pull request Aug 11, 2016
Created using `tools/license-builder.sh`.

PR-URL: #7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
cjihrig pushed a commit that referenced this pull request Aug 11, 2016
PR-URL: #7796
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
@cjihrig cjihrig mentioned this pull request Aug 11, 2016
@ofrobots ofrobots deleted the roll-inspector branch August 17, 2016 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
inspector Issues and PRs related to the V8 inspector protocol
Projects
None yet
9 participants