Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a3d03ec

Browse files
zoobazooba
committed
Adds option to only install the launcher.
1 parent 313fbf4 commit a3d03ec

13 files changed

Lines changed: 52 additions & 47 deletions

File tree

‎Doc/using/windows.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ of available options is shown below.
146146
+---------------------------+--------------------------------------+--------------------------+
147147
| Include_tools | Install utility scripts | 1 |
148148
+---------------------------+--------------------------------------+--------------------------+
149+
| LauncherOnly | Only installs the launcher. This | 0 |
150+
| | will override most other options. | |
151+
+---------------------------+--------------------------------------+--------------------------+
149152
| SimpleInstall | Disable most install UI | 0 |
150153
+---------------------------+--------------------------------------+--------------------------+
151154
| SimpleInstallDescription | A custom message to display when the | (empty) |

‎Tools/msi/bundle/Default.thm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.HelpHeader)</Text>
1313
<Image X="0" Y="0" Width="162" Height="352" ImageFile="SideBar.png"/>
1414

15-
<Text X="185" Y="50" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
15+
<Hypertext X="185" Y="50" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Hypertext>
1616
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.CloseButton)</Button>
1717
</Page>
1818
<Page Name="Install">

‎Tools/msi/bundle/bundle.wxs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
<Variable Name="Include_symbols" Value="0" bal:Overridable="yes" />
6565
<Variable Name="Include_debug" Value="0" bal:Overridable="yes" />
6666

67+
<Variable Name="LauncherOnly" Value="0" bal:Overridable="yes" />
68+
6769
<Variable Name="AssociateFiles" Value="1" bal:Overridable="yes" />
6870
<Variable Name="Shortcuts" Value="1" bal:Overridable="yes" />
6971
<Variable Name="PrependPath" Value="0" bal:Overridable="yes" />

‎Tools/msi/bundle/packagegroups/core.wxs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Compressed="$(var.CompressMSI)"
88
DownloadUrl="$(var.DownloadUrl)"
99
ForcePerMachine="yes"
10-
InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip)">
10+
InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and not LauncherOnly">
1111
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
1212
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
1313
</MsiPackage>
@@ -16,7 +16,7 @@
1616
Compressed="$(var.CompressPDB)"
1717
DownloadUrl="$(var.DownloadUrl)"
1818
ForcePerMachine="yes"
19-
InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_symbols">
19+
InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_symbols and not LauncherOnly">
2020
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
2121
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
2222
</MsiPackage>
@@ -25,7 +25,7 @@
2525
Compressed="$(var.CompressMSI_D)"
2626
DownloadUrl="$(var.DownloadUrl)"
2727
ForcePerMachine="yes"
28-
InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_debug">
28+
InstallCondition="InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_debug and not LauncherOnly">
2929
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
3030
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
3131
</MsiPackage>
@@ -35,7 +35,7 @@
3535
Compressed="$(var.CompressMSI)"
3636
DownloadUrl="$(var.DownloadUrl)"
3737
ForcePerMachine="no"
38-
InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip)">
38+
InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and not LauncherOnly">
3939
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
4040
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
4141
</MsiPackage>
@@ -44,7 +44,7 @@
4444
Compressed="$(var.CompressPDB)"
4545
DownloadUrl="$(var.DownloadUrl)"
4646
ForcePerMachine="no"
47-
InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_symbols">
47+
InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_symbols and not LauncherOnly">
4848
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
4949
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
5050
</MsiPackage>
@@ -53,7 +53,7 @@
5353
Compressed="$(var.CompressMSI_D)"
5454
DownloadUrl="$(var.DownloadUrl)"
5555
ForcePerMachine="no"
56-
InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_debug">
56+
InstallCondition="not InstallAllUsers and (Include_core or Include_exe or Include_launcher or Include_pip) and Include_debug and not LauncherOnly">
5757
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
5858
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
5959
</MsiPackage>

‎Tools/msi/bundle/packagegroups/crt.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
Description="!(loc.CRTDescription)"
3232
Compressed="$(var.CompressMSI)"
3333
DownloadUrl="$(var.DownloadUrl)"
34-
InstallCondition="not CRTInstalled and VersionNT = $(var.ver) and not VersionNT64 and (Include_core or Include_exe or Include_launcher or Include_pip)" />
34+
InstallCondition="not CRTInstalled and VersionNT = $(var.ver) and not VersionNT64 and (Include_core or Include_exe or Include_launcher or Include_pip) and not LauncherOnly" />
3535

3636
<MsuPackage Id="crt_14.0_$(var.ver)_x64"
3737
KB="2999226"
@@ -40,7 +40,7 @@
4040
Description="!(loc.CRTDescription)"
4141
Compressed="$(var.CompressMSI)"
4242
DownloadUrl="$(var.DownloadUrl)"
43-
InstallCondition="not CRTInstalled and VersionNT64 = $(var.ver) and (Include_core or Include_exe or Include_launcher or Include_pip)" />
43+
InstallCondition="not CRTInstalled and VersionNT64 = $(var.ver) and (Include_core or Include_exe or Include_launcher or Include_pip) and not LauncherOnly" />
4444
</PackageGroup>
4545
</Fragment>
4646

‎Tools/msi/bundle/packagegroups/dev.wxs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Compressed="$(var.CompressMSI)"
88
DownloadUrl="$(var.DownloadUrl)"
99
ForcePerMachine="yes"
10-
InstallCondition="InstallAllUsers and Include_dev">
10+
InstallCondition="InstallAllUsers and Include_dev and not LauncherOnly">
1111
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
1212
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
1313
</MsiPackage>
@@ -16,7 +16,7 @@
1616
Compressed="$(var.CompressMSI_D)"
1717
DownloadUrl="$(var.DownloadUrl)"
1818
ForcePerMachine="yes"
19-
InstallCondition="InstallAllUsers and Include_dev and Include_debug">
19+
InstallCondition="InstallAllUsers and Include_dev and Include_debug and not LauncherOnly">
2020
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
2121
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
2222
</MsiPackage>
@@ -26,7 +26,7 @@
2626
Compressed="$(var.CompressMSI)"
2727
DownloadUrl="$(var.DownloadUrl)"
2828
ForcePerMachine="no"
29-
InstallCondition="not InstallAllUsers and Include_dev">
29+
InstallCondition="not InstallAllUsers and Include_dev and not LauncherOnly">
3030
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
3131
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
3232
</MsiPackage>
@@ -35,7 +35,7 @@
3535
Compressed="$(var.CompressMSI_D)"
3636
DownloadUrl="$(var.DownloadUrl)"
3737
ForcePerMachine="no"
38-
InstallCondition="not InstallAllUsers and Include_dev and Include_debug">
38+
InstallCondition="not InstallAllUsers and Include_dev and Include_debug and not LauncherOnly">
3939
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
4040
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
4141
</MsiPackage>

‎Tools/msi/bundle/packagegroups/doc.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
DownloadUrl="$(var.DownloadUrl)"
99
EnableFeatureSelection="yes"
1010
ForcePerMachine="yes"
11-
InstallCondition="InstallAllUsers and Include_doc">
11+
InstallCondition="InstallAllUsers and Include_doc and not LauncherOnly">
1212
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
1313
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
1414
</MsiPackage>
@@ -19,7 +19,7 @@
1919
DownloadUrl="$(var.DownloadUrl)"
2020
EnableFeatureSelection="yes"
2121
ForcePerMachine="no"
22-
InstallCondition="not InstallAllUsers and Include_doc">
22+
InstallCondition="not InstallAllUsers and Include_doc and not LauncherOnly">
2323
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
2424
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
2525
</MsiPackage>

‎Tools/msi/bundle/packagegroups/exe.wxs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Compressed="$(var.CompressMSI)"
99
DownloadUrl="$(var.DownloadUrl)"
1010
EnableFeatureSelection="yes"
11-
InstallCondition="InstallAllUsers and (Include_exe or Include_launcher or Include_pip)">
11+
InstallCondition="InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and not LauncherOnly">
1212
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
1313
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
1414
</MsiPackage>
@@ -17,7 +17,7 @@
1717
ForcePerMachine="yes"
1818
Compressed="$(var.CompressPDB)"
1919
DownloadUrl="$(var.DownloadUrl)"
20-
InstallCondition="InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and Include_symbols">
20+
InstallCondition="InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and Include_symbols and not LauncherOnly">
2121
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
2222
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
2323
</MsiPackage>
@@ -26,7 +26,7 @@
2626
ForcePerMachine="yes"
2727
Compressed="$(var.CompressMSI_D)"
2828
DownloadUrl="$(var.DownloadUrl)"
29-
InstallCondition="InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and Include_debug">
29+
InstallCondition="InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and Include_debug and not LauncherOnly">
3030
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
3131
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
3232
</MsiPackage>
@@ -37,7 +37,7 @@
3737
Compressed="$(var.CompressMSI)"
3838
DownloadUrl="$(var.DownloadUrl)"
3939
EnableFeatureSelection="yes"
40-
InstallCondition="not InstallAllUsers and (Include_exe or Include_launcher or Include_pip)">
40+
InstallCondition="not InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and not LauncherOnly">
4141
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
4242
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
4343
</MsiPackage>
@@ -46,7 +46,7 @@
4646
ForcePerMachine="no"
4747
Compressed="$(var.CompressPDB)"
4848
DownloadUrl="$(var.DownloadUrl)"
49-
InstallCondition="not InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and Include_symbols">
49+
InstallCondition="not InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and Include_symbols and not LauncherOnly">
5050
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
5151
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
5252
</MsiPackage>
@@ -55,7 +55,7 @@
5555
ForcePerMachine="no"
5656
Compressed="$(var.CompressMSI_D)"
5757
DownloadUrl="$(var.DownloadUrl)"
58-
InstallCondition="not InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and Include_debug">
58+
InstallCondition="not InstallAllUsers and (Include_exe or Include_launcher or Include_pip) and Include_debug and not LauncherOnly">
5959
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
6060
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
6161
</MsiPackage>

‎Tools/msi/bundle/packagegroups/lib.wxs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Compressed="$(var.CompressMSI)"
88
DownloadUrl="$(var.DownloadUrl)"
99
ForcePerMachine="yes"
10-
InstallCondition="InstallAllUsers and Include_lib">
10+
InstallCondition="InstallAllUsers and Include_lib and not LauncherOnly">
1111
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
1212
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
1313
</MsiPackage>
@@ -16,7 +16,7 @@
1616
Compressed="$(var.CompressPDB)"
1717
DownloadUrl="$(var.DownloadUrl)"
1818
ForcePerMachine="yes"
19-
InstallCondition="InstallAllUsers and Include_lib and Include_symbols">
19+
InstallCondition="InstallAllUsers and Include_lib and Include_symbols and not LauncherOnly">
2020
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
2121
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
2222
</MsiPackage>
@@ -25,7 +25,7 @@
2525
Compressed="$(var.CompressMSI_D)"
2626
DownloadUrl="$(var.DownloadUrl)"
2727
ForcePerMachine="yes"
28-
InstallCondition="InstallAllUsers and Include_lib and Include_debug">
28+
InstallCondition="InstallAllUsers and Include_lib and Include_debug and not LauncherOnly">
2929
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
3030
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
3131
</MsiPackage>
@@ -35,7 +35,7 @@
3535
Compressed="$(var.CompressMSI)"
3636
DownloadUrl="$(var.DownloadUrl)"
3737
ForcePerMachine="no"
38-
InstallCondition="not InstallAllUsers and Include_lib">
38+
InstallCondition="not InstallAllUsers and Include_lib and not LauncherOnly">
3939
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
4040
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
4141
</MsiPackage>
@@ -44,7 +44,7 @@
4444
Compressed="$(var.CompressPDB)"
4545
DownloadUrl="$(var.DownloadUrl)"
4646
ForcePerMachine="no"
47-
InstallCondition="not InstallAllUsers and Include_lib and Include_symbols">
47+
InstallCondition="not InstallAllUsers and Include_lib and Include_symbols and not LauncherOnly">
4848
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
4949
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
5050
</MsiPackage>
@@ -53,7 +53,7 @@
5353
Compressed="$(var.CompressMSI_D)"
5454
DownloadUrl="$(var.DownloadUrl)"
5555
ForcePerMachine="no"
56-
InstallCondition="not InstallAllUsers and Include_lib and Include_debug">
56+
InstallCondition="not InstallAllUsers and Include_lib and Include_debug and not LauncherOnly">
5757
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
5858
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
5959
</MsiPackage>

0 commit comments

Comments
 (0)