Merge pull request #130 from vosen/master

More polish for installation and ootb experience
PistonDevelopers · May 13, 2015 · eff5fc3 · eff5fc3
2 parents 1206f53 + 7c07456
commit eff5fc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/VisualRust.Build/Rustc.cs b/VisualRust.Build/Rustc.cs
@@ -187,7 +187,7 @@ private bool ExecuteInner()
             string rustBinPath = VisualRust.Shared.Environment.FindInstallPath(VisualRust.Shared.Environment.DefaultTarget);
             if(rustBinPath == null)
             {
-                Log.LogError("No Rust compiler installed.");
+              Log.LogError("No Rust installation detected. You can download official Rust installer from rust-lang.org/install.");
                 return false;
             }
             StringBuilder sb = new StringBuilder();

diff --git a/VisualRust.Setup/vsx2013.wxs b/VisualRust.Setup/vsx2013.wxs
@@ -68,5 +68,9 @@
       <Custom Action="CA_Remove_Ancient_Version" Before="CA_VS2013Setup"><![CDATA[VS2013DEVENV AND &Ftr_VisualRust=3]]></Custom>
       <Custom Action="CA_VS2013Setup" Before="InstallFinalize"><![CDATA[(VS2013DEVENV AND &Ftr_VisualRust=3) OR ((NOT UPGRADINGPRODUCTCODE) AND (&Ftr_VisualRust=2) AND (!Ftr_VisualRust=3))]]></Custom>
     </InstallExecuteSequence>
+    <UI>
+      <ProgressText Action="CA_Remove_Ancient_Version">Removing ancient version of Visual Rust</ProgressText>
+      <ProgressText Action="CA_VS2013Setup">Configuring Visual Studio 2013 (this might take a few minutes)</ProgressText>
+    </UI>
   </Fragment>
 </Wix>