about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-01-28 10:24:42 -0800
committerAlex Crichton <alex@alexcrichton.com>2017-01-30 08:56:30 -0800
commit45d203df302d1a4b684ffec07edc4ec7fd1fa36d (patch)
tree88fa276a3471a20bd226e0ee0baf325c33426d2e /src
parentc81c1d6a41babf7e34120625727211cad7b40b87 (diff)
downloadrust-45d203df302d1a4b684ffec07edc4ec7fd1fa36d.tar.gz
rust-45d203df302d1a4b684ffec07edc4ec7fd1fa36d.zip
travis: Tweak artifact uploads
* Don't upload `*.wixpdb` files by accident
* Don't upload `doc` dir by accident
* Fix level of indirection on Travis
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/dist.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 71a5f313bbd..5fac142f777 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -827,7 +827,7 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
         cmd.arg("-nologo")
            .arg("-ext").arg("WixUIExtension")
            .arg("-ext").arg("WixUtilExtension")
-           .arg("-out").arg(distdir(build).join(filename))
+           .arg("-out").arg(exe.join(&filename))
            .arg("rust.wixobj")
            .arg("ui.wixobj")
            .arg("rustwelcomedlg.wixobj")
@@ -844,6 +844,8 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
         cmd.arg("-sice:ICE57");
 
         build.run(&mut cmd);
+
+        t!(fs::rename(exe.join(&filename), distdir(build).join(&filename)));
     }
 }