Skip to content

build,win: open shortcut folder instead of running script #24237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
refack wants to merge 6 commits into from
Closed

build,win: open shortcut folder instead of running script #24237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dab27c0
build,win: open shortcut folder instead of running script
refack Nov 7, 2018
5d9cd8f
Update tools/msvs/msi/product.wxs
richardlau Nov 8, 2018
9f70c62
Update tools/msvs/msi/product.wxs
richardlau Nov 8, 2018
905d7c7
build,win: make installer res files ready for translation
refack Nov 8, 2018
00742b0
fixup!
refack Nov 9, 2018
590b1d5
fixup!!
refack Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions tools/msvs/msi/i18n/en-us.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,23 @@
<String Id="NativeToolsDlgTitle">{\WixUI_Font_Title}Tools for Native Modules</String>
<String Id="NativeToolsDlgDescription">Optionally install the tools necessary to compile native modules.</String>
<String Id="NativeToolsDlgBannerBitmap">WixUI_Bmp_Banner</String>
<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>
<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>
<String Id="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>
<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>
<String Id="NativeToolsDlgInstallCheckbox">
Open the shortcut folder to run the tools install script.
Note that it will also install
<![CDATA[<a href="https://boxstarter.org/">Boxstarter</a>]]>
and
<![CDATA[<a href="https://chocolatey.org/">Chocolatey</a>]]>
</String>
<String Id="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>

<!-- References like [ProductName] or $(var.ProductName) don't seem to work in Title attributes -->
<String Id="NodeRuntime_Title">Node.js runtime</String>
Expand Down
6 changes: 3 additions & 3 deletions tools/msvs/msi/product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@
Execute="immediate"
Return="check" />

<Property Id="WixShellExecTarget" Value="[#InstallToolsBat]" />
<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" />
<Property Id="WixShellExecTarget" Value="[#NodeStartMenu]" />
<CustomAction Id="OpenShurtcutFolder" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
Comment thread
refack marked this conversation as resolved.
Outdated

<InstallUISequence>
<Custom Action='SetInstallScope' Before='FindRelatedProducts'/>
Expand Down Expand Up @@ -384,7 +384,7 @@
<Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="NativeToolsDlg">1</Publish>
<Publish Dialog="NativeToolsDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg">1</Publish>
<Publish Dialog="NativeToolsDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
<Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">NATIVETOOLSCHECKBOX = 1</Publish>
<Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="OpenShurtcutFolder">NATIVETOOLSCHECKBOX = 1</Publish>
Comment thread
refack marked this conversation as resolved.
Outdated
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>

<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="!(loc.WIXUI_EXITDIALOGOPTIONALTEXT)"/>
Expand Down