|
72 | 72 | <ComponentRef Id="NodeVarsScript"/>
|
73 | 73 | <ComponentRef Id="NodeStartMenu"/>
|
74 | 74 | <ComponentRef Id="AppData" />
|
| 75 | + <ComponentRef Id="InstallToolsBat" /> |
| 76 | + <ComponentRef Id="InstallToolsTxt" /> |
75 | 77 | <ComponentGroupRef Id="Product.Generated"/>
|
76 | 78 |
|
77 | 79 | <Feature Id="NodePerfCtrSupport"
|
|
162 | 164 | <File Id="nodevars.bat" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\nodevars.bat"/>
|
163 | 165 | </Component>
|
164 | 166 |
|
| 167 | + <Component Id="InstallToolsBat"> |
| 168 | + <File Id="InstallToolsBat" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\install_tools\install_tools.bat"/> |
| 169 | + </Component> |
| 170 | + |
| 171 | + <Component Id="InstallToolsTxt"> |
| 172 | + <File Id="InstallToolsTxt" Source="$(var.RepoDir)\tools\msvs\install_tools\install_tools.txt"/> |
| 173 | + </Component> |
| 174 | + |
165 | 175 | <?if $(var.NoPerfCtr) != 1 ?>
|
166 | 176 | <Component Id="NodePerfCtrSupport">
|
167 | 177 | <File Id="node_perfctr_provider_man" Name="node_perfctr_provider.man" Source="$(var.RepoDir)\src\res\node_perfctr_provider.man">
|
|
195 | 205 | Arguments='/k "[INSTALLDIR]nodevars.bat"'
|
196 | 206 | Show="normal"
|
197 | 207 | WorkingDirectory="INSTALLDIR"/>
|
| 208 | + <Shortcut Id="InstallToolsShortcut" |
| 209 | + Name="Install Additional Tools for Node.js" |
| 210 | + Target="[%ComSpec]" |
| 211 | + Arguments='/d /c "[INSTALLDIR]install_tools.bat"' |
| 212 | + Show="normal" |
| 213 | + WorkingDirectory="INSTALLDIR"/> |
198 | 214 | <Shortcut Id="NodeExecutableShortcut"
|
199 | 215 | Name="Node.js"
|
200 | 216 | Target="[INSTALLDIR]node.exe"
|
|
310 | 326 | Execute="immediate"
|
311 | 327 | Return="check" />
|
312 | 328 |
|
| 329 | + <Property Id="WixShellExecTarget" Value="[#InstallToolsBat]" /> |
| 330 | + <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" /> |
| 331 | + |
313 | 332 | <InstallUISequence>
|
314 | 333 | <Custom Action='SetInstallScope' Before='FindRelatedProducts'/>
|
315 | 334 | </InstallUISequence>
|
|
340 | 359 | <DialogRef Id="InstallDirDlg"/>
|
341 | 360 | <DialogRef Id="BrowseDlg"/>
|
342 | 361 | <DialogRef Id="InvalidDirDlg"/>
|
| 362 | + <Dialog Id="NativeToolsDlg" Width="370" Height="270" Title="!(loc.NativeToolsDlg_Title)"> |
| 363 | + <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.NativeToolsDlgBannerBitmap)" /> |
| 364 | + <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.NativeToolsDlgTitle)" /> |
| 365 | + <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.NativeToolsDlgDescription)" /> |
| 366 | + <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> |
| 367 | + |
| 368 | + <Control Id="Intro" Type="Text" X="20" Y="65" Width="330" Height="30" NoPrefix="yes" Text="!(loc.NativeToolsDlgIntro)" /> |
| 369 | + <Control Id="InstallCheckbox" Type="CheckBox" X="20" Y="105" Width="330" Height="30" Property="NATIVETOOLSCHECKBOX" CheckBoxValue="1" Text="!(loc.NativeToolsDlgInstallCheckbox)" /> |
| 370 | + <Control Id="ManualDetails" Type="Hyperlink" X="20" Y="140" Width="330" Height="30" Text="!(loc.NativeToolsDlgManualDetails)" /> |
| 371 | + |
| 372 | + <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> |
| 373 | + <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" /> |
| 374 | + <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" /> |
| 375 | + <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> |
| 376 | + <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> |
| 377 | + </Control> |
| 378 | + </Dialog> |
343 | 379 |
|
344 | 380 | <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
|
345 | 381 | <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
|
|
350 | 386 | <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="10">1</Publish>
|
351 | 387 | <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="10">1</Publish>
|
352 | 388 | <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="20">1</Publish>
|
353 |
| - <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> |
354 | 389 | <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish>
|
355 | 390 | <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
|
356 | 391 | <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">Installed AND PATCH</Publish>
|
|
361 | 396 | <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
|
362 | 397 | <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">Installed</Publish>
|
363 | 398 | <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="2">NOT Installed</Publish>
|
364 |
| - <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> |
| 399 | + <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="NativeToolsDlg">1</Publish> |
| 400 | + <Publish Dialog="NativeToolsDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">1</Publish> |
| 401 | + <Publish Dialog="NativeToolsDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> |
| 402 | + <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">NATIVETOOLSCHECKBOX = 1</Publish> |
| 403 | + <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> |
365 | 404 |
|
366 | 405 | <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="!(loc.WIXUI_EXITDIALOGOPTIONALTEXT)"/>
|
367 | 406 | </UI>
|
|
0 commit comments