adding a check to bootstrap script by ducks · Pull Request #36256 · rust-lang/rust

ducks · 2016-09-04T03:31:01Z

and a check to the rust config script

first crack at making configure detect nodejs

and a check to the rust config script

rust-highfive · 2016-09-04T03:31:14Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

alexcrichton · 2016-09-06T04:49:18Z

Thanks for the PR! The nodejs logic in bootstrap.py though seems to never be called? I think this'll want to perhaps live in sanity.rs or close to that where we do the probing. A manually configured nodejs = "...", however, would override whatever we end up probing for.

ducks · 2016-09-06T13:45:05Z

Yeah, I didn't make it as far as actually make it do something yet.

I was reading through the bootstrap readme and was probably ask for some guidance but thanks for the advance advice. :)

brson · 2016-09-06T22:48:16Z

I don't have a solid grasp on how all the build system pieces work these days, but I expected this detection to happin in configure, whereafter bootstrap would read it from config.mk, and in turn pass it to compiletest.

ducks · 2016-09-06T23:27:54Z

Dang, ok. I was a bit off. I think I focused on /src/bootstrap too much and will look at configure more.

a nodejs cmd sanity check

ducks · 2016-09-07T22:38:35Z

So I think I made a bit of progress. I am now detecting nodejs back in ./configure.
I then pass it through config.rs when it slurps up the config.mk. It seems to pass the sanity check that I added to sanity.rs because when running make, bootstrap compiles fine. I also did some println!ing and it was showing the correct node path.

I get a bit lost after this. Where to pass it next or how to add a test to compiletest for it or if I need to? Any advice on where to look next?

Thanks in advance! :)

alexcrichton · 2016-09-08T21:58:37Z

+ // If a manual nodejs was added to the config,
+ // of if a nodejs install is detected through config, use it.
+ if build.config.nodejs.is_some() {
+ need_cmd("nodejs".as_ref())


Here I think you'll want to do:
ifletSome(ref s) = build.config.nodejs{need_cmd(s.as_ref());}

alexcrichton · 2016-09-09T16:13:28Z

@bors: r+ 89bc13c

Thanks!

bors · 2016-09-09T18:09:12Z

⌛ Testing commit 89bc13c with merge 48dd4f4...

bors · 2016-09-09T19:40:20Z

💔 Test failed - auto-win-msvc-64-cargotest

alexcrichton · 2016-09-09T20:09:04Z

@bors: retry

On Fri, Sep 9, 2016 at 12:40 PM, bors notifications@github.com wrote:

💔 Test failed - auto-win-msvc-64-cargotest
https://buildbot.rust-lang.org/builders/auto-win-msvc-64-cargotest/builds/1773
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#36256 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95K5IZjAPqNDpaBJy1ff1gOa0YK6Tks5qobYngaJpZM4J0cs7
.

bors · 2016-09-09T21:04:32Z

⌛ Testing commit 89bc13c with merge 1284081...

…207, r=alexcrichton adding a check to bootstrap script and a check to the rust config script refs #36207 first crack at making configure detect nodejs

bors · 2016-09-09T22:27:45Z

💔 Test failed - auto-win-msvc-64-cargotest

alexcrichton · 2016-09-09T22:34:22Z

@bors: retry

On Fri, Sep 9, 2016 at 3:27 PM, bors notifications@github.com wrote:

💔 Test failed - auto-win-msvc-64-cargotest
https://buildbot.rust-lang.org/builders/auto-win-msvc-64-cargotest/builds/1775
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#36256 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95EKETXVThkUTgYg6MZtlDKA3edhuks5qod1kgaJpZM4J0cs7
.

bors · 2016-09-10T00:14:47Z

⚡ Previous build results for auto-linux-cross-opt are reusable. Rebuilding only auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild...

bors · 2016-09-10T04:35:28Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: alexcrichton
Pushing 1284081 to master...

adding a check to bootstrap script
b664100
and a check to the rust config script

rust-highfive assigned brson Sep 4, 2016

adding a check to sanity to look for the nodejs command
79644ac

Jake Goldsborough added 2 commits September 6, 2016 18:31

detecting nodejs in configure
0adcf46

moving nodejs detection logic to configure and adding
7e46f2c
a nodejs cmd sanity check

alexcrichton reviewed Sep 8, 2016
View reviewed changes

tweaking the nodejs cmd sanity check
89bc13c

bors merged commit 89bc13c into rust-lang:masterSep 10, 2016

foophoof mentioned this pull request Sep 12, 2016
configure needs to detect name of the nodejs binary #36207
Closed

alexcrichton mentioned this pull request Sep 12, 2016
Working asmjs and wasm targets #36339
Merged

Uh oh!

Uh oh!

Conversation

ducks commented Sep 4, 2016

Uh oh!

rust-highfive commented Sep 4, 2016

Uh oh!

alexcrichton commented Sep 6, 2016

Uh oh!

ducks commented Sep 6, 2016

Uh oh!

brson commented Sep 6, 2016

Uh oh!

ducks commented Sep 6, 2016

Uh oh!

ducks commented Sep 7, 2016

Uh oh!

alexcrichtonSep 8, 2016

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Sep 9, 2016

Uh oh!

bors commented Sep 9, 2016

Uh oh!

bors commented Sep 9, 2016

Uh oh!

alexcrichton commented Sep 9, 2016

Uh oh!

bors commented Sep 9, 2016

Uh oh!

bors commented Sep 9, 2016

Uh oh!

alexcrichton commented Sep 9, 2016

Uh oh!

bors commented Sep 10, 2016

Uh oh!

bors commented Sep 10, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants