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.

Sign up for GitHub

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

Jump to bottom

Update to SpiderMonkey 66 #172

Merged
merged 20 commits into from
May 6, 2019
Merged

Update to SpiderMonkey 66 #172

merged 20 commits into from
May 6, 2019

Conversation

jdm
Copy link
Member

@jdm jdm commented Mar 11, 2019 •
edited by larsbergstrom
Loading

This change is Reviewable

@jdm jdm changed the title Update to SpiderMonkey 66 WIP Update to SpiderMonkey 66 Mar 11, 2019
@asajeffrey
Copy link
Member

asajeffrey commented Mar 11, 2019 •
edited
Loading

This looks pretty sensible so far! OMG are we now the point where an SM upgrade takes a few days rather than months?

@asajeffrey asajeffrey closed this Mar 11, 2019
@asajeffrey asajeffrey reopened this Mar 11, 2019
@asajeffrey
Copy link
Member

Hmm, it is very easy to press the "close and comment" button by mistake. [Looks sheepish.]

atouchet
atouchet reviewed Mar 12, 2019
View reviewed changes
Cargo.toml Outdated Show resolved Hide resolved
@jdm
Copy link
Member Author

jdm commented Mar 13, 2019

Linux builds:

  = note: /usr/bin/ld: cannot find -lmozglue

MacOS builds with no features are passing. With debugmozjs:

error[E0107]: wrong number of type arguments: expected 1, found 0
 --> /Users/travis/build/servo/mozjs/target/debug/build/mozjs_sys-2d786b25f7d779ba/out/jsapi.rs:9:58173

@jdm
Copy link
Member Author

jdm commented Mar 13, 2019

The appveyor branch build seemed to stop in the middle of running bindgen, after running for 43 minutes total? Very confusing.

@jdm
Copy link
Member Author

jdm commented Mar 13, 2019

Nevermind, it looks like it timed out after 1 hour, not 43 minutes.

@jdm
Copy link
Member Author

jdm commented Mar 13, 2019

Second windows job finished with 8 seconds to spare 😓

@jdm
Copy link
Member Author

jdm commented Mar 13, 2019

Latest commit made mac complain about -lmozglue as well as linux.

@jdm
Copy link
Member Author

jdm commented Mar 21, 2019

Windows build is missing NSPR symbols.
Linux build is missing mozglue.
Mac build is missing mozglue.

@bors-servo
Copy link
Contributor

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

@jdm jdm force-pushed the smup66 branch 2 times, most recently from af7f58d to 80df25b Compare April 2, 2019 18:22
@jdm jdm changed the title WIP Update to SpiderMonkey 66 Update to SpiderMonkey 66 Apr 2, 2019
@bors-servo
Copy link
Contributor

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

@jdm jdm mentioned this pull request Apr 4, 2019
Merged
@jdm jdm force-pushed the smup66 branch 2 times, most recently from 57f3fad to 5d21cd6 Compare April 4, 2019 16:45
@jdm
Copy link
Member Author

jdm commented Apr 5, 2019

Note to self: mozjs/js/src/frontend/binsource/Cargo.toml is important

@jdm jdm mentioned this pull request Apr 9, 2019
Merged
@jdm
Copy link
Member Author

jdm commented Apr 26, 2019

Linux and Mac builds are working.
Windows x86 build is complaining that the wrong rust libraries are being linked.

@jdm jdm force-pushed the smup66 branch 2 times, most recently from 886447c to 44a26af Compare April 30, 2019 01:26
@jdm
Copy link
Member Author

jdm commented Apr 30, 2019 •
edited
Loading

  • Linux builds completed successfully
  • mac builds completed successfully
  • Windows x86 build completed successfully
  • windows x64 build completed successfully

@jdm jdm force-pushed the smup66 branch 2 times, most recently from bf26953 to a05cde6 Compare May 1, 2019 22:43
@asajeffrey
Copy link
Member

This all LGTM. Took a couple of months, which is better than last time but still not the few days I was hoping for. Rebase, make sure we don't lose the changes from #180 and r=me.

@jdm
Copy link
Member Author

jdm commented May 4, 2019

To be fair, I abandoned it for a while. I think it was less than three weeks total.

jdm added 20 commits May 6, 2019 11:45
@jdm
Update SpiderMonkey
d39217f
@jdm
Update commit.
3114abb
@jdm
Support incremental update script. Update patches for SM 66.
c03b799
@jdm
Generate configure.
e366a5e
@jdm
Update tests and bindgen setup for SM 66.
65eaf4f
@jdm
Work around rust-bindgen#380 for debugmozjs builds.
ddd64ef
@jdm
Ensure mozglue is included in the static JS library.
1e1412c
@jdm
Adjust CI for python requirements.
6d96232
@jdm
Remove all Cargo.toml files and third-party vendored Rust code while …
fe6065d 
…updating.
@jdm
Actually remove all cargo.toml files nad third-party vendored rust code.
92aebce
@jdm
Don't generate .cargo/config file.
3f86059
@jdm
Disable common unhelpful warning.
6f2f006
@jdm
Extend set of generated bindings.
a8a5cc5
@jdm
Incorporate clang-cl changes.
15f8bfc
@jdm
Use correct host for Windows cross-compilation.
d88db1a
@jdm
Remove unnecessary use of vcvars batch script due to clang-cl.
73bd2f1
@jdm
Duplicate JSID_VOID symbol.
5c1523b
@jdm
Generate android system wrappers
7df568d
@jdm
Don't include C define flags in assembler arguments.
f4990f9
@jdm
Update major version to 0.66.0
f302fe3
@jdm
Copy link
Member Author

jdm commented May 6, 2019

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

📌 Commit f302fe3 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

⌛ Testing commit f302fe3 with merge e21c05b...

bors-servo pushed a commit that referenced this pull request May 6, 2019
Auto merge of #172 - servo:smup66, r=asajeffrey
e21c05b 
Update to SpiderMonkey 66

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/172)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - checks-travis, status-appveyor
Approved by: asajeffrey
Pushing e21c05b to master...

@bors-servo bors-servo merged commit f302fe3 into master May 6, 2019
@bors-servo bors-servo mentioned this pull request May 6, 2019
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asajeffrey asajeffrey asajeffrey left review comments

@atouchet atouchet atouchet left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jdm @asajeffrey @bors-servo @atouchet