From 8bd1114343012c21ccc0638547494d032e7eb92a Mon Sep 17 00:00:00 2001
From: Kaylyn Bogle <kaylyn@kaylyn.ink>
Date: Tue, 1 Dec 2015 16:03:58 -0800
Subject: [PATCH 1/3] Added native module build tool message at end of windows
 msi install

---
 tools/msvs/msi/NodeExitDialog.wxs | 41 +++++++++++++++++++++++++++++++
 tools/msvs/msi/i18n/en-us.wxl     |  2 ++
 tools/msvs/msi/nodemsi.wixproj    |  1 +
 tools/msvs/msi/product.wxs        |  2 +-
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 tools/msvs/msi/NodeExitDialog.wxs

diff --git a/tools/msvs/msi/NodeExitDialog.wxs b/tools/msvs/msi/NodeExitDialog.wxs
new file mode 100644
index 00000000000000..7ad472e1e74eba
--- /dev/null
+++ b/tools/msvs/msi/NodeExitDialog.wxs
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  <copyright file="ExitDialog.wxs" company="Outercurve Foundation">
+    Copyright (c) 2004, Outercurve Foundation.
+    This software is released under Microsoft Reciprocal License (MS-RL).
+    The license and further copyright text can be found in the file
+    LICENSE.TXT at the root directory of the distribution.
+  </copyright>
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI>
+      <Dialog Id="NodeExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
+        <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
+        <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+        <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
+        <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
+        <Control Id="OptionalText" Type="Text" X="135" Y="110" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
+          <Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition>
+        </Control>
+        <Control Id="TestLink" Type="Hyperlink" X="135" Y="150" Width="220" Height="60" Transparent="yes" Text="!(loc.InstalledNativeCompileInfo)">
+          <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
+        </Control>
+        <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
+          <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
+        </Control>
+      </Dialog>
+
+      <InstallUISequence>
+        <Show Dialog="NodeExitDialog" OnExit="success" Overridable="yes" />
+      </InstallUISequence>
+
+      <AdminUISequence>
+        <Show Dialog="NodeExitDialog" OnExit="success" Overridable="yes" />
+      </AdminUISequence>
+    </UI>
+  </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/tools/msvs/msi/i18n/en-us.wxl b/tools/msvs/msi/i18n/en-us.wxl
index fd23724b562990..f3f83a12406882 100644
--- a/tools/msvs/msi/i18n/en-us.wxl
+++ b/tools/msvs/msi/i18n/en-us.wxl
@@ -35,4 +35,6 @@
 
     <!-- References like [ProductName] are not resolved for Property tags -->
     <String Id="WIXUI_EXITDIALOGOPTIONALTEXT">Node.js has been successfully installed.</String>
+
+    <String Id="InstalledNativeCompileInfo">Some native modules may require additional build tools to be installed. See the <![CDATA[<a href="https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#configuring-your-windows-development-environment">Windows Native Development Guide</a>]]> for more information.</String>
 </WixLocalization>
diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj
index 70ffec50bcc8e4..568fcde488d56b 100644
--- a/tools/msvs/msi/nodemsi.wixproj
+++ b/tools/msvs/msi/nodemsi.wixproj
@@ -39,6 +39,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="product.wxs" />
+    <Compile Include="NodeExitDialog.wxs" />
     <Compile Include="..\..\..\npm.wxs">
       <Link>npm.wxs</Link>
     </Compile>
diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs
index bdda1a19c13e72..8192996f5834a9 100755
--- a/tools/msvs/msi/product.wxs
+++ b/tools/msvs/msi/product.wxs
@@ -336,7 +336,7 @@
       <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="10">1</Publish>
       <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="10">1</Publish>
       <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="20">1</Publish>
-      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+      <Publish Dialog="NodeExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish>
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
       <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">Installed AND PATCH</Publish>

From 9bd51993164b41111c2e40a06211efd77e52a68c Mon Sep 17 00:00:00 2001
From: Kaylyn Bogle <kaylyn@kaylyn.ink>
Date: Tue, 12 Jan 2016 17:35:27 -0800
Subject: [PATCH 2/3] Updated URI to point to new Windows Environment page
 Added German translation

---
 tools/msvs/msi/i18n/de-de.wxl | 2 ++
 tools/msvs/msi/i18n/en-us.wxl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/msvs/msi/i18n/de-de.wxl b/tools/msvs/msi/i18n/de-de.wxl
index 432d1eeaace3fb..fcaee52a54a93b 100644
--- a/tools/msvs/msi/i18n/de-de.wxl
+++ b/tools/msvs/msi/i18n/de-de.wxl
@@ -35,4 +35,6 @@
 
     <!-- References like [ProductName] are not resolved for Property tags -->
     <String Id="WIXUI_EXITDIALOGOPTIONALTEXT">Node.js wurde erfolgreich installiert.</String>
+
+    <String Id="InstalledNativeCompileInfo">Einige native Module benötigen eventuell zusätzliche Build-Tools um installiert werden zu können. Weitere Informationen finden Sie im <![CDATA[<a href="https://nodejs.org/windows-environment">Windows Environment</a>]]>.</String>
 </WixLocalization>
diff --git a/tools/msvs/msi/i18n/en-us.wxl b/tools/msvs/msi/i18n/en-us.wxl
index f3f83a12406882..e932539286a77f 100644
--- a/tools/msvs/msi/i18n/en-us.wxl
+++ b/tools/msvs/msi/i18n/en-us.wxl
@@ -36,5 +36,5 @@
     <!-- References like [ProductName] are not resolved for Property tags -->
     <String Id="WIXUI_EXITDIALOGOPTIONALTEXT">Node.js has been successfully installed.</String>
 
-    <String Id="InstalledNativeCompileInfo">Some native modules may require additional build tools to be installed. See the <![CDATA[<a href="https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#configuring-your-windows-development-environment">Windows Native Development Guide</a>]]> for more information.</String>
+    <String Id="InstalledNativeCompileInfo">Some native modules may require additional build tools to be installed. See <![CDATA[<a href="https://nodejs.org/windows-environment">Windows Environment</a>]]> for more information.</String>
 </WixLocalization>

From 412cf9a7fe680ca4d8ea57d61bc8e66dafd9364e Mon Sep 17 00:00:00 2001
From: Kaylyn Bogle <kaylyn@kaylyn.ink>
Date: Wed, 13 Jan 2016 18:35:23 -0800
Subject: [PATCH 3/3] updated german translation

---
 tools/msvs/msi/i18n/de-de.wxl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/msvs/msi/i18n/de-de.wxl b/tools/msvs/msi/i18n/de-de.wxl
index fcaee52a54a93b..17a77c57d4d504 100644
--- a/tools/msvs/msi/i18n/de-de.wxl
+++ b/tools/msvs/msi/i18n/de-de.wxl
@@ -36,5 +36,5 @@
     <!-- References like [ProductName] are not resolved for Property tags -->
     <String Id="WIXUI_EXITDIALOGOPTIONALTEXT">Node.js wurde erfolgreich installiert.</String>
 
-    <String Id="InstalledNativeCompileInfo">Einige native Module benötigen eventuell zusätzliche Build-Tools um installiert werden zu können. Weitere Informationen finden Sie im <![CDATA[<a href="https://nodejs.org/windows-environment">Windows Environment</a>]]>.</String>
+    <String Id="InstalledNativeCompileInfo">Einige native Module benötigen eventuell zusätzliche Build-Tools um installiert werden zu können. Weitere Informationen finden Sie unter <![CDATA[<a href="https://nodejs.org/windows-environment">Windows Environment</a>]]>.</String>
 </WixLocalization>