Skip to content

Commit 81e8d51

Browse files
feschberfeschber
committed
bundle vc_redist.x64.exe
1 parent 6125944 commit 81e8d51

File tree

12 files changed

+101
-20
lines changed

12 files changed

+101
-20
lines changed

‎wix/.gitignore‎ renamed to ‎wix/bundle/.gitignore‎

File renamed without changes.

‎wix/bundle/Bundle.wixproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="WixToolset.Sdk/5.0.0">
2+
<PropertyGroup>
3+
<OutputType>Bundle</OutputType>
4+
<TargetExt>.exe</TargetExt>
5+
<Platforms>x64</Platforms>
6+
<InstallerPlatform>x64</InstallerPlatform>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageReference Include="WixToolset.Heat">
10+
<Version>5.0.2</Version>
11+
</PackageReference>
12+
<PackageReference Include="WixToolset.Bal.wixext">
13+
<Version>5.0.2</Version>
14+
</PackageReference>
15+
</ItemGroup>
16+
</Project>

‎wix/bundle/Bundle.wxs‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
2+
xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3+
4+
<Bundle
5+
Name="Lan Mouse"
6+
Version="0.10.0"
7+
UpgradeCode="{39A9744D-9D6E-4CD3-A84F-9E034786A7B1}"
8+
Compressed="no"
9+
SplashScreenSourceFile="icon.ico">
10+
11+
<BootstrapperApplication>
12+
<bal:WixStandardBootstrapperApplication
13+
LicenseUrl=""
14+
Theme="hyperlinkLicense" />
15+
</BootstrapperApplication>
16+
17+
<Chain>
18+
<!-- Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810 -->
19+
<ExePackage
20+
Id="VC_REDIST_X64"
21+
DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
22+
PerMachine="yes"
23+
Permanent="yes"
24+
Protocol="burn"
25+
InstallCondition="VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
26+
DetectCondition="(VCRUNTIME_X64_VER &gt;= VCRUNTIME_VER) AND VersionNT64 AND (ARCH_NAME = &quot;AMD64&quot;)"
27+
InstallArguments="/install /quiet /norestart"
28+
RepairArguments="/repair /quiet /norestart"
29+
UninstallArguments="/uninstall /quiet /norestart">
30+
<ExePackagePayload
31+
Name="VC_redist.x64.exe"
32+
ProductName="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
33+
Description="Microsoft Visual C++ 2015-2022 Redistributable (x64) - 14.40.33810"
34+
Hash="5935B69F5138AC3FBC33813C74DA853269BA079F910936AEFA95E230C6092B92F6225BFFB594E5DD35FF29BF260E4B35F91ADEDE90FDF5F062030D8666FD0104"
35+
Size="25397512"
36+
Version="14.40.33810.0"
37+
DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/1754ea58-11a6-44ab-a262-696e194ce543/3642E3F95D50CC193E4B5A0B0FFBF7FE2C08801517758B4C8AEB7105A091208A/VC_redist.x64.exe" />
38+
</ExePackage>
39+
<MsiPackage SourceFile="..\lan-mouse\bin\Debug\en-US\LanMouse.msi" Compressed="yes"/>
40+
</Chain>
41+
</Bundle>
42+
</Wix>

‎wix/bundle/VC_redist.x64.exe‎

24.5 MB
Binary file not shown.

‎wix/lan-mouse/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/bin
2+
/obj
3+
icon.ico

‎wix/Folders.wxs‎ renamed to ‎wix/lan-mouse/Folders.wxs‎

File renamed without changes.

‎wix/LanMouse.wixproj‎ renamed to ‎wix/lan-mouse/LanMouse.wixproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="WixToolset.Sdk/5.0.2">
22
<PropertyGroup>
33
<InstallerPlatform>x64</InstallerPlatform>
4+
<OutputType>Bundle</OutputType>
45
</PropertyGroup>
56
<ItemGroup>
67
<PackageReference Include="WixToolset.Heat">

‎wix/LanMouseComponents.wxs‎ renamed to ‎wix/lan-mouse/LanMouseComponents.wxs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<ComponentGroup Id="LanMouseComponents" Directory="INSTALLFOLDER" Subdirectory="bin">
44
<Component Guid="{ECB52D3E-28AD-4BEC-B9DF-E01CCAB356BE}">
55
<!-- the main binary -->
6-
<File Source="..\target\release\lan-mouse.exe"/>
6+
<File Source="..\..\target\release\lan-mouse.exe"/>
77

88
<!-- visual c runtime dll -->
9-
<File Source="C:\windows\system32\VCRUNTIME140.dll"/>
10-
<File Source="C:\windows\system32\VCRUNTIME140_1.dll"/>
9+
<!--<File Source="C:\windows\system32\VCRUNTIME140.dll"/>-->
10+
<!--<File Source="C:\windows\system32\VCRUNTIME140_1.dll"/>-->
1111
</Component>
1212
<!-- start menu entry-->
1313
<Component Id="ApplicationShortcut" Directory="ApplicationProgramsFolder">

‎wix/Package.en-us.wxl‎ renamed to ‎wix/lan-mouse/Package.en-us.wxl‎

File renamed without changes.

‎wix/lan-mouse/Package.wxs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2+
<Package Name="Lan Mouse"
3+
Manufacturer="Ferdinand Schober"
4+
Version="0.10.0.0"
5+
UpgradeCode="{a330cd60-4c35-4a54-8bb6-75b3049b46c6}">
6+
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
7+
8+
<MediaTemplate EmbedCab="yes"/>
9+
<Feature Id="Main">
10+
<ComponentGroupRef Id="GTKBIN"/>
11+
<ComponentGroupRef Id="GTKICONS"/>
12+
<ComponentGroupRef Id="GTKLIBS"/>
13+
<ComponentGroupRef Id="LanMouseComponents"/>
14+
</Feature>
15+
</Package>
16+
<!-- Microsoft Visual C++ 2015 x86 libraries -->
17+
<PackageGroup Id="VC14RedistX86">
18+
<ExePackage
19+
Cache="no"
20+
Compressed="yes"
21+
PerMachine="yes"
22+
Permanent="yes"
23+
Vital="yes"
24+
Name="Redist\vcredist14_x64.exe"
25+
SourceFile="VC_redist.x64.exe"
26+
InstallCommand="/install /quiet /norestart">
27+
28+
<!-- -->
29+
<ExitCode Value="3010" Behavior="forceReboot"/>
30+
31+
<!-- Ignore "Newer version installed" error -->
32+
<ExitCode Value="1638" Behavior="success"/>
33+
</ExePackage>
34+
</PackageGroup>
35+
36+
</Wix>

0 commit comments

Comments
 (0)