Use WIX environment variable

Author: Boddlnagg

src/rustup-win-installer/build.rs

@@ -1,10 +1,13 @@
+use std::env;
+
 fn main() {
     println!("cargo:rustc-link-lib=dylib=msi");
     println!("cargo:rustc-link-lib=dylib=wcautil");
     println!("cargo:rustc-link-lib=dylib=dutil");
     println!("cargo:rustc-link-lib=dylib=user32");
     println!("cargo:rustc-link-lib=dylib=mincore");
 
-    // TODO: maybe don't hardcode path to WiX 3.10
-    println!("cargo:rustc-link-search=native=C:\\Program Files (x86)\\WiX Toolset v3.10\\SDK\\VS2015\\lib\\x86");
+    let wix_path = env::var("WIX").unwrap();
+    // x86 target is hard-coded because we only build an x86 installer (works just fine on x64)
+    println!("cargo:rustc-link-search=native={}SDK\\VS2015\\lib\\x86", wix_path);
 }

src/rustup-win-installer/msi/build.ps1

@@ -5,9 +5,11 @@ $env:CFG_VER_MINOR = $version[1]
 $env:CFG_VER_PATCH = $version[2]
 
 foreach($file in Get-ChildItem *.wxs) {
-    &'C:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe' -nologo -arch x86 -ext WixUIExtension -ext WixUtilExtension -out "target\$($file.Name.Replace(".wxs",".wixobj"))" $($file.Name)
+    $in = $file.Name
+    $out = $($file.Name.Replace(".wxs",".wixobj"))
+    &"$($env:WIX)bin\candle.exe" -nologo -arch x86 -ext WixUIExtension -ext WixUtilExtension -out "target\$out" $in
     if ($LASTEXITCODE -ne 0) { exit }
 }
 
 # ICE57 wrongly complains about per-machine data in per-user install, because it doesn't know that INSTALLLOCATION is in per-user directory
-&'C:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe' -nologo -ext WixUIExtension -ext WixUtilExtension -out "target\rustup.msi" -sice:ICE57 $(Get-ChildItem target\*.wixobj)
+&"$($env:WIX)\bin\light.exe" -nologo -ext WixUIExtension -ext WixUtilExtension -out "target\rustup.msi" -sice:ICE57 $(Get-ChildItem target\*.wixobj)