Skip to content

Commit 9e293c1

Browse files
refackMylesBorins
refack
authored and
MylesBorins
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 <reis@janeasystems.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
1 parent 5d17bf1 commit 9e293c1

4 files changed

Lines changed: 2 additions & 128 deletions

File tree

‎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
<StringId="MajorUpgrade_DowngradeErrorMessage">A later version of [ProductName] is already installed. Setup will now exit.</String>
1010

11-
<StringId="NativeToolsDlg_Title">[ProductName] Setup</String>
12-
<StringId="NativeToolsDlgTitle">{\WixUI_Font_Title}Tools for Native Modules</String>
13-
<StringId="NativeToolsDlgDescription">Optionally install the tools necessary to compile native modules.</String>
14-
<StringId="NativeToolsDlgBannerBitmap">WixUI_Bmp_Banner</String>
15-
<StringId="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-
<StringId="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-
<StringId="NativeToolsDlgManualDetails">Alternatively, follow the instructions at <![CDATA[<a href="https://github.com/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
<StringId="NodeRuntime_Title">Node.js runtime</String>
2113
<StringId="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
<ComponentRefId="NodeVarsScript"/>
7373
<ComponentRefId="NodeStartMenu"/>
7474
<ComponentRefId="AppData" />
75-
<ComponentRefId="InstallToolsBat" />
76-
<ComponentRefId="InstallToolsTxt" />
7775
<ComponentGroupRefId="Product.Generated"/>
7876

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

167-
<ComponentId="InstallToolsBat">
168-
<FileId="InstallToolsBat"KeyPath="yes"Source="$(var.RepoDir)\tools\msvs\install_tools\install_tools.bat"/>
169-
</Component>
170-
171-
<ComponentId="InstallToolsTxt">
172-
<FileId="InstallToolsTxt"Source="$(var.RepoDir)\tools\msvs\install_tools\install_tools.txt"/>
173-
</Component>
174-
175165
<?if $(var.NoPerfCtr) != 1 ?>
176166
<ComponentId="NodePerfCtrSupport">
177167
<FileId="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-
<ShortcutId="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
<ShortcutId="NodeExecutableShortcut"
215199
Name="Node.js"
216200
Target="[INSTALLDIR]node.exe"
@@ -326,9 +310,6 @@
326310
Execute="immediate"
327311
Return="check" />
328312

329-
<PropertyId="WixShellExecTarget"Value="[#InstallToolsBat]" />
330-
<CustomActionId="LaunchApplication"BinaryKey="WixCA"DllEntry="WixShellExec" />
331-
332313
<InstallUISequence>
333314
<CustomAction='SetInstallScope'Before='FindRelatedProducts'/>
334315
</InstallUISequence>
@@ -359,23 +340,6 @@
359340
<DialogRefId="InstallDirDlg"/>
360341
<DialogRefId="BrowseDlg"/>
361342
<DialogRefId="InvalidDirDlg"/>
362-
<DialogId="NativeToolsDlg"Width="370"Height="270"Title="!(loc.NativeToolsDlg_Title)">
363-
<ControlId="BannerBitmap"Type="Bitmap"X="0"Y="0"Width="370"Height="44"TabSkip="no"Text="!(loc.NativeToolsDlgBannerBitmap)" />
364-
<ControlId="Title"Type="Text"X="15"Y="6"Width="200"Height="15"Transparent="yes"NoPrefix="yes"Text="!(loc.NativeToolsDlgTitle)" />
365-
<ControlId="Description"Type="Text"X="25"Y="23"Width="280"Height="15"Transparent="yes"NoPrefix="yes"Text="!(loc.NativeToolsDlgDescription)" />
366-
<ControlId="BannerLine"Type="Line"X="0"Y="44"Width="370"Height="0" />
367-
368-
<ControlId="Intro"Type="Text"X="20"Y="65"Width="330"Height="30"NoPrefix="yes"Text="!(loc.NativeToolsDlgIntro)" />
369-
<ControlId="InstallCheckbox"Type="CheckBox"X="20"Y="105"Width="330"Height="30"Property="NATIVETOOLSCHECKBOX"CheckBoxValue="1"Text="!(loc.NativeToolsDlgInstallCheckbox)" />
370-
<ControlId="ManualDetails"Type="Hyperlink"X="20"Y="140"Width="330"Height="30"Text="!(loc.NativeToolsDlgManualDetails)" />
371-
372-
<ControlId="BottomLine"Type="Line"X="0"Y="234"Width="370"Height="0" />
373-
<ControlId="Next"Type="PushButton"X="236"Y="243"Width="56"Height="17"Default="yes"Text="!(loc.WixUINext)" />
374-
<ControlId="Back"Type="PushButton"X="180"Y="243"Width="56"Height="17"Text="!(loc.WixUIBack)" />
375-
<ControlId="Cancel"Type="PushButton"X="304"Y="243"Width="56"Height="17"Cancel="yes"Text="!(loc.WixUICancel)">
376-
<PublishEvent="SpawnDialog"Value="CancelDlg">1</Publish>
377-
</Control>
378-
</Dialog>
379343

380344
<PublishDialog="WelcomeDlg"Control="Next"Event="NewDialog"Value="LicenseAgreementDlg">NOT Installed</Publish>
381345
<PublishDialog="WelcomeDlg"Control="Next"Event="NewDialog"Value="VerifyReadyDlg">Installed AND PATCH</Publish>
@@ -386,6 +350,7 @@
386350
<PublishDialog="InstallDirDlg"Control="Next"Event="SetTargetPath"Value="[WIXUI_INSTALLDIR]"Order="10">1</Publish>
387351
<PublishDialog="InstallDirDlg"Control="ChangeFolder"Property="_BrowseProperty"Value="[WIXUI_INSTALLDIR]"Order="10">1</Publish>
388352
<PublishDialog="InstallDirDlg"Control="ChangeFolder"Event="SpawnDialog"Value="BrowseDlg"Order="20">1</Publish>
353+
<PublishDialog="ExitDialog"Control="Finish"Event="EndDialog"Value="Return"Order="999">1</Publish>
389354
<PublishDialog="VerifyReadyDlg"Control="Back"Event="NewDialog"Value="CustomizeDlg"Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish>
390355
<PublishDialog="VerifyReadyDlg"Control="Back"Event="NewDialog"Value="MaintenanceTypeDlg"Order="2">Installed AND NOT PATCH</Publish>
391356
<PublishDialog="VerifyReadyDlg"Control="Back"Event="NewDialog"Value="WelcomeDlg"Order="3">Installed AND PATCH</Publish>
@@ -396,11 +361,7 @@
396361
<PublishDialog="MaintenanceTypeDlg"Control="Back"Event="NewDialog"Value="MaintenanceWelcomeDlg">1</Publish>
397362
<PublishDialog="CustomizeDlg"Control="Back"Event="NewDialog"Value="MaintenanceTypeDlg"Order="1">Installed</Publish>
398363
<PublishDialog="CustomizeDlg"Control="Back"Event="NewDialog"Value="InstallDirDlg"Order="2">NOT Installed</Publish>
399-
<PublishDialog="CustomizeDlg"Control="Next"Event="NewDialog"Value="NativeToolsDlg">1</Publish>
400-
<PublishDialog="NativeToolsDlg"Control="Back"Event="NewDialog"Value="CustomizeDlg">1</Publish>
401-
<PublishDialog="NativeToolsDlg"Control="Next"Event="NewDialog"Value="VerifyReadyDlg">1</Publish>
402-
<PublishDialog="ExitDialog"Control="Finish"Event="DoAction"Value="LaunchApplication">NATIVETOOLSCHECKBOX = 1</Publish>
403-
<PublishDialog="ExitDialog"Control="Finish"Event="EndDialog"Value="Return"Order="999">1</Publish>
364+
<PublishDialog="CustomizeDlg"Control="Next"Event="NewDialog"Value="VerifyReadyDlg">1</Publish>
404365

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

0 commit comments

Comments
 (0)