Skip to content

Commit 469473d

Browse files
refackrefack
committed
Revert "win,msi: install tools for native modules"
This reverts: Revision: 257a5e9 win: add prompt to tools installation script Revision: e9a2915 win: clarify Boxstarter behavior on install tools Revision: 3b895d1 win,msi: display license notes before installing tools Revision: cf284c8 win,msi: install Boxstarter from elevated shell Revision: 2b7e18d win,msi: highlight installation of 3rd-party tools Revision: ebf36cd win,msi: install tools for native modules PR-URL: #24344 Refs: #22645 Refs: #23987 Refs: nodejs/Release#369 Refs: #23838 Refs: nodejs/security-wg#439 Reviewed-By: João Reis <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent 9a7554a commit 469473d

File tree

4 files changed

+2
-128
lines changed

4 files changed

+2
-128
lines changed

‎tools/msvs/install_tools/install_tools.bat‎

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎tools/msvs/install_tools/install_tools.txt‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎tools/msvs/msi/i18n/en-us.wxl‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88

99
<String Id="MajorUpgrade_DowngradeErrorMessage">A later version of [ProductName] is already installed. Setup will now exit.</String>
1010

11-
<String Id="NativeToolsDlg_Title">[ProductName] Setup</String>
12-
<String Id="NativeToolsDlgTitle">{\WixUI_Font_Title}Tools for Native Modules</String>
13-
<String Id="NativeToolsDlgDescription">Optionally install the tools necessary to compile native modules.</String>
14-
<String Id="NativeToolsDlgBannerBitmap">WixUI_Bmp_Banner</String>
15-
<String Id="NativeToolsDlgIntro">Some npm modules need to be compiled from C/C++ when installing. If you want to be able to install such modules, some tools (Python 2 and Visual Studio Build Tools) need to be installed.</String>
16-
<String Id="NativeToolsDlgInstallCheckbox">Automatically install the necessary tools. Note that this will also install Boxstarter and Chocolatey. The script will pop-up in a new window after the installation completes.</String>
17-
<String Id="NativeToolsDlgManualDetails">Alternatively, follow the instructions at <![CDATA[<a href="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/nodejs/node-gyp#on-windows">https://github.com/nodejs/node-gyp#on-windows</a>]]> to install the dependencies yourself.</String>
18-
1911
<!-- References like [ProductName] or $(var.ProductName) don't seem to work in Title attributes -->
2012
<String Id="NodeRuntime_Title">Node.js runtime</String>
2113
<String Id="NodeRuntime_Description">Install the core [ProductName] runtime (node.exe).</String>

‎tools/msvs/msi/product.wxs‎

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@
7272
<ComponentRef Id="NodeVarsScript"/>
7373
<ComponentRef Id="NodeStartMenu"/>
7474
<ComponentRef Id="AppData" />
75-
<ComponentRef Id="InstallToolsBat" />
76-
<ComponentRef Id="InstallToolsTxt" />
7775
<ComponentGroupRef Id="Product.Generated"/>
7876

7977
<Feature Id="NodePerfCtrSupport"
@@ -164,14 +162,6 @@
164162
<File Id="nodevars.bat" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\nodevars.bat"/>
165163
</Component>
166164

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-
175165
<?if $(var.NoPerfCtr) != 1 ?>
176166
<Component Id="NodePerfCtrSupport">
177167
<File Id="node_perfctr_provider_man" Name="node_perfctr_provider.man" Source="$(var.RepoDir)\src\res\node_perfctr_provider.man">
@@ -205,12 +195,6 @@
205195
Arguments='/k "[INSTALLDIR]nodevars.bat"'
206196
Show="normal"
207197
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"/>
214198
<Shortcut Id="NodeExecutableShortcut"
215199
Name="Node.js"
216200
Target="[INSTALLDIR]node.exe"
@@ -326,9 +310,6 @@
326310
Execute="immediate"
327311
Return="check" />
328312

329-
<Property Id="WixShellExecTarget" Value="[#InstallToolsBat]" />
330-
<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" />
331-
332313
<InstallUISequence>
333314
<Custom Action='SetInstallScope' Before='FindRelatedProducts'/>
334315
</InstallUISequence>
@@ -359,23 +340,6 @@
359340
<DialogRef Id="InstallDirDlg"/>
360341
<DialogRef Id="BrowseDlg"/>
361342
<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>
379343

380344
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
381345
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
@@ -386,6 +350,7 @@
386350
<Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="10">1</Publish>
387351
<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="10">1</Publish>
388352
<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>
389354
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish>
390355
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
391356
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">Installed AND PATCH</Publish>
@@ -396,11 +361,7 @@
396361
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
397362
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">Installed</Publish>
398363
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="2">NOT Installed</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>
364+
<Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
404365

405366
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="!(loc.WIXUI_EXITDIALOGOPTIONALTEXT)"/>
406367
</UI>

0 commit comments

Comments
 (0)