Skip to content

Commit 2095eea

Browse files
Igor Zinkovskyry
Igor Zinkovsky
authored andcommitted
msi changes
- remove license from MSI - adjust path on install - add message to the end
1 parent 2af6431 commit 2095eea

File tree

3 files changed

+36
-9
lines changed

3 files changed

+36
-9
lines changed

tools/msvs/msi/LICENSE.rtf

-4.2 KB
Binary file not shown.

tools/msvs/msi/nodemsi.wixproj

-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<ItemGroup>
2626
<Compile Include="product.wxs" />
2727
</ItemGroup>
28-
<ItemGroup>
29-
<Content Include="LICENSE.rtf" />
30-
</ItemGroup>
3128
<ItemGroup>
3229
<WixExtension Include="WixUIExtension">
3330
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>

tools/msvs/msi/product.wxs

+36-6
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,18 @@
1919
<Directory Id="NodeRoot" Name="nodejs">
2020
<Component Id="nodeexe" Guid="AEC0F08E-89B3-4C35-A286-8DB8598597F2">
2121
<File Id="filenodeexe" KeyPath="yes" Source="$(var.sourcedir)\node.exe" />
22+
<Environment Id="Environment"
23+
Action="set"
24+
Name="PATH"
25+
Part="last"
26+
System="yes"
27+
Value="[NodeRoot]" />
2228
</Component>
2329
<?if $(var.Configuration) = Debug ?>
2430
<Component Id="nodepdb" Guid="BEC0F08E-89B3-4C35-A286-8DB8598597F2">
2531
<File Id="filenodepdb" KeyPath="yes" Source="$(var.sourcedir)\node.pdb" />
2632
</Component>
2733
<?endif?>
28-
<Component Id="license" Guid="CEC0F08E-89B3-4C35-A286-8DB8598597F2">
29-
<File Id="filelicense" KeyPath="yes" Source="$(var.sourcedir)\..\LICENSE" />
30-
</Component>
3134
</Directory>
3235
</Directory>
3336
</Directory>
@@ -37,17 +40,44 @@
3740
<?if $(var.Configuration) = Debug ?>
3841
<ComponentRef Id="nodepdb"/>
3942
<?endif?>
40-
<ComponentRef Id="license"/>
4143
</ComponentGroup>
4244

4345
<Feature Id="nodejs" Title="node.js engine" Level="1" Description="evented I/O for V8 javascript">
4446
<ComponentGroupRef Id="allfiles" />
4547
<ComponentGroupRef Id="Product.Generated" />
4648
</Feature>
4749

48-
<WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\license.rtf" />
49-
<UIRef Id="WixUI_Minimal" />
50+
<UI Id="NodeInstallUI">
51+
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
52+
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
53+
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
54+
55+
<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
56+
<Property Id="WixUI_Mode" Value="Minimal" />
57+
58+
<DialogRef Id="ErrorDlg" />
59+
<DialogRef Id="FatalError" />
60+
<DialogRef Id="FilesInUse" />
61+
<DialogRef Id="MsiRMFilesInUse" />
62+
<DialogRef Id="PrepareDlg" />
63+
<DialogRef Id="ProgressDlg" />
64+
<DialogRef Id="ResumeDlg" />
65+
<DialogRef Id="UserExit" />
66+
<DialogRef Id="WelcomeDlg" />
67+
68+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="PrepareDlg">1</Publish>
69+
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
70+
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
71+
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
72+
<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
73+
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
74+
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
75+
76+
<Property Id="ARPNOMODIFY" Value="1" />
77+
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Node.js has been succesfully installed. To run Node.js open command prompt (cmd.exe), and run 'node'. See http://nodejs.org for information about the license." />
78+
</UI>
5079

80+
<UIRef Id="WixUI_Common" />
5181
</Product>
5282

5383
</Wix>

0 commit comments

Comments
 (0)