Rewrite make-win-dist.py in Rust #41932

wesleywiser · 2017-05-12T03:14:16Z

Fixes #41568

rust-highfive · 2017-05-12T03:14:29Z

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

alexcrichton

Awesome looks great to me here, thanks @wesleywiser!

alexcrichton · 2017-05-12T05:06:59Z

src/bootstrap/dist.rs

+    //Ask gcc where it keeps its stuff
+    let gcc_out =
+        String::from_utf8(
+            Command::new("gcc.exe")


With access in Rust, it may actually be best to query build.cc(target) to find the path to gcc here.

alexcrichton · 2017-05-12T05:07:11Z

src/bootstrap/dist.rs

+
+    for file in &files {
+        let file_path =
+            path .iter()


stray space?

alexcrichton · 2017-05-12T05:07:26Z

src/bootstrap/dist.rs

+        let file_path =
+            path .iter()
+                .map(|dir| dir.join(file))
+                .find(|p| fs::metadata(&p).is_ok());


Nowadays I think for this you can just use p.exists()

alexcrichton · 2017-05-12T05:08:30Z

src/bootstrap/dist.rs

+    let rustc_dlls = find_files(rustc_dlls, &bin_path);
+    let target_libs = find_files(target_libs, &lib_path);
+
+    fn copy(src: &Path, dest_folder: &Path) {


I think there's a util::copy to use for this as well.

It looks to me like that function assumes dst already refers to a full path name like "C:\rust\test.dll" instead of just the folder name which is what this function handles. I can change this function to call util::copy instead of fs::copy though.

alexcrichton · 2017-05-12T05:09:47Z

src/bootstrap/dist.rs

+    }
+
+    let target_tools = vec!["gcc.exe", "ld.exe", "ar.exe", "dlltool.exe"];
+    let mut rustc_dlls = vec!["libstdc++-6.dll", "libwinpthread-1.dll", "libwinpthread-1.dll"];


libwinpthread is mentioned twice here?

alexcrichton · 2017-05-12T05:10:18Z

src/bootstrap/dist.rs

+                .collect();
+
+        if key == "programs" {
+            bin_path.append(&mut value);


You can probably use extend here actually to avoid the collect above, dropping a few lines in the process!

wesleywiser · 2017-05-15T01:04:35Z

Updated

Mark-Simulacrum · 2017-05-15T01:12:10Z

src/bootstrap/dist.rs

@@ -98,6 +98,139 @@ pub fn docs(build: &Build, stage: u32, host: &str) {
    }
 }

+fn find_files(files: Vec<&str>, path: &Vec<PathBuf>) -> Vec<PathBuf> {


I'd prefer that this function take files: &[Path], path: &[PathBuf] since it doesn't need a vector for either parameter. Looks like the files are really just strings, in which case &[str] would also be fine.

Mark-Simulacrum · 2017-05-15T01:15:45Z

src/bootstrap/dist.rs

+                .stdout).expect("gcc.exe output was not utf8");
+
+    let mut bin_path: Vec<_> =
+        env::split_paths(&env::var_os("PATH").expect("failed to get $PATH"))


It seems better to unwrap_or_default here, since PATH being empty is a decent, if not good, default.

Fixes rust-lang#41568

wesleywiser · 2017-05-15T01:24:43Z

@Mark-Simulacrum Fixed

Mark-Simulacrum · 2017-05-15T01:27:31Z

I'll give @alexcrichton the final say, though. But looks good to me!

alexcrichton · 2017-05-15T14:26:18Z

@bors: r+

Looks great to me too, thanks so much again @wesleywiser!

bors · 2017-05-15T14:26:19Z

📌 Commit 173f693 has been approved by alexcrichton

Rewrite make-win-dist.py in Rust Fixes rust-lang#41568

Mark-Simulacrum · 2017-05-16T14:17:20Z

This seemed to fail dist in rollup:

Dist RLS stage2 (x86_64-pc-windows-gnu)
Dist mingw (x86_64-pc-windows-gnu)
thread 'main' panicked at 'failed to copy `C:\projects\rust\mingw64\bin\libstdc++-6.dll` to `C:\projects\rust\build\tmp/dist\bin/libstdc++-6.dll`: The system cannot find the path specified. (os error 3)', src\bootstrap\util.rs:47
note: Run with `RUST_BACKTRACE=1` for a backtrace.
Build completed unsuccessfully in 1:12:20
Command exited with code 101

Mark-Simulacrum · 2017-05-16T14:17:40Z

@bors r-

Mark-Simulacrum · 2017-05-20T23:13:03Z

@wesleywiser Have you had a chance to take a look at the failure?

wesleywiser · 2017-05-22T03:37:59Z

@Mark-Simulacrum I was having some trouble repro'ing it but I think I've got it now. I'll continue looking at it this week.

wesleywiser · 2017-05-23T04:02:03Z

@Mark-Simulacrum I think that should fix it

Mark-Simulacrum · 2017-05-23T11:21:47Z

@bors r=alexcrichton

bors · 2017-05-23T11:21:48Z

📌 Commit 7eebabe has been approved by alexcrichton

bors · 2017-05-23T12:53:21Z

⌛ Testing commit 7eebabe with merge ce15fd0...

bors · 2017-05-23T15:53:50Z

💔 Test failed - status-appveyor

wesleywiser · 2017-05-23T16:05:47Z

Build execution time has reached the maximum allowed time for your plan (180 minutes).

alexcrichton · 2017-05-23T16:59:26Z

@bors: retry

Tracking issue for spurious git-related failures #42117

bors · 2017-05-23T17:02:34Z

⌛ Testing commit 7eebabe with merge 1ba03d3...

bors · 2017-05-23T20:04:35Z

💔 Test failed - status-appveyor

Mark-Simulacrum · 2017-05-23T20:23:05Z

@bors retry

appveyor timed out

bors · 2017-05-24T01:28:18Z

⌛ Testing commit 7eebabe with merge 4b21210...

bors · 2017-05-24T04:28:36Z

💔 Test failed - status-travis

Mark-Simulacrum · 2017-05-24T12:47:35Z

@bors retry

travis timed out

Rewrite make-win-dist.py in Rust Fixes rust-lang#41568

bors · 2017-05-24T18:34:12Z

⌛ Testing commit 7eebabe with merge 2ded772...

bors · 2017-05-24T21:36:35Z

💔 Test failed - status-appveyor

Mark-Simulacrum · 2017-05-24T21:40:01Z

Timeouts, timeouts. It takes us 40 minutes before we even run configure right now, this is probably never going to work until appveyor is fixed realistically.

@bors retry

bors · 2017-05-25T10:35:10Z

⌛ Testing commit 7eebabe with merge d86d134...

Rewrite make-win-dist.py in Rust Fixes #41568

bors · 2017-05-25T13:01:51Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing d86d134 to master...

wesleywiser · 2017-05-25T13:12:25Z

Woohooo! Thanks @Mark-Simulacrum and @alexcrichton

rust-highfive assigned alexcrichton May 12, 2017

alexcrichton reviewed May 12, 2017

View reviewed changes

shepmaster added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 12, 2017

wesleywiser force-pushed the py-to-rust branch from 8ad11dd to 93d0c77 Compare May 15, 2017 01:04

Mark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 15, 2017

Mark-Simulacrum requested changes May 15, 2017

View reviewed changes

Rewrite make-win-dist.py in Rust

173f693

Fixes rust-lang#41568

wesleywiser force-pushed the py-to-rust branch from 93d0c77 to 173f693 Compare May 15, 2017 01:24

Mark-Simulacrum approved these changes May 15, 2017

View reviewed changes

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 16, 2017

Rollup merge of rust-lang#41932 - wesleywiser:py-to-rust, r=alexcrichton

0dc1d45

Rewrite make-win-dist.py in Rust Fixes rust-lang#41568

Mark-Simulacrum mentioned this pull request May 16, 2017

Rollup of 8 pull requests #42032

Closed

arielb1 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 16, 2017

Create the bin dir

7eebabe

Mark-Simulacrum added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 23, 2017

Mark-Simulacrum removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 23, 2017

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 24, 2017

Rollup merge of rust-lang#41932 - wesleywiser:py-to-rust, r=alexcrichton

4cbfa70

Rewrite make-win-dist.py in Rust Fixes rust-lang#41568

Mark-Simulacrum mentioned this pull request May 24, 2017

Rollup of 14 pull requests #42193

Closed

kennytm mentioned this pull request May 24, 2017

rewrite make-win-dist.py script into Rust #42204

Closed

bors added a commit that referenced this pull request May 25, 2017

Auto merge of #41932 - wesleywiser:py-to-rust, r=alexcrichton

d86d134

Rewrite make-win-dist.py in Rust Fixes #41568

bors merged commit 7eebabe into rust-lang:master May 25, 2017

Rewrite make-win-dist.py in Rust #41932

Rewrite make-win-dist.py in Rust #41932

Conversation

wesleywiser commented May 12, 2017

rust-highfive commented May 12, 2017

alexcrichton left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wesleywiser commented May 15, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wesleywiser commented May 15, 2017

Mark-Simulacrum commented May 15, 2017

alexcrichton commented May 15, 2017

bors commented May 15, 2017

Mark-Simulacrum commented May 16, 2017

Mark-Simulacrum commented May 16, 2017

Mark-Simulacrum commented May 20, 2017

wesleywiser commented May 22, 2017

wesleywiser commented May 23, 2017

Mark-Simulacrum commented May 23, 2017

bors commented May 23, 2017

bors commented May 23, 2017

bors commented May 23, 2017

wesleywiser commented May 23, 2017

alexcrichton commented May 23, 2017 • edited Loading

bors commented May 23, 2017

bors commented May 23, 2017

Mark-Simulacrum commented May 23, 2017

bors commented May 24, 2017

bors commented May 24, 2017

Mark-Simulacrum commented May 24, 2017

bors commented May 24, 2017

bors commented May 24, 2017

Mark-Simulacrum commented May 24, 2017

bors commented May 25, 2017

bors commented May 25, 2017

wesleywiser commented May 25, 2017

alexcrichton commented May 23, 2017 •

edited

Loading