Skip to content

Commit

Permalink
Added branding to installer, made llicense rtf format to please Windows
Browse files Browse the repository at this point in the history
Currently only x86. x64 coming later.
Requires WiX Toolset 3.11 to build.
  • Loading branch information
Carson-Shook committed Nov 10, 2017
1 parent 2fc9ce2 commit 538f427
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 23 deletions.
37 changes: 35 additions & 2 deletions Setup-x86/Product.wxs
Original file line number Diff line number Diff line change
@@ -1,18 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="Winclipper" Language="1033" Version="1.0.0.0" Manufacturer="Carson Shook" UpgradeCode="a332e06b-480d-4d31-aaca-e5f7a2ef1dbb">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" />

<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate EmbedCab="yes" />

<Icon Id="Winclipper.ico" SourceFile="..\Winclipper\Winclipper.ico"/>
<Property Id="ARPPRODUCTICON" Value="Winclipper.ico" />
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Thank you for installing Winclipper." />
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch Winclipper" />
<Property Id="WixShellExecTarget" Value="[#Winclipper.exe]" />
<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />

<WixVariable Id="WixUILicenseRtf" Value="..\license.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="..\SetupResources\Winclipper-WixUIBanner.bmp"/>
<WixVariable Id="WixUIDialogBmp" Value="..\SetupResources\Winclipper-WixUIDialog.bmp"/>

<UI>
<UIRef Id="WixUI_Minimal" />
<Publish Dialog="ExitDialog"
Control="Finish"
Event="DoAction"
Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
</UI>

<Feature Id="ProductFeature" Title="Winclipper" Level="1">
<Feature Id="VCRedist" Title="Visual C++ 14 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="VCRedist"/>
</Feature>
<ComponentRef Id="Winclipper.exe" />
<ComponentRef Id="license"/>
<ComponentRef Id="readme"/>
<ComponentRef Id="ApplicationShortcut"/>
<ComponentRef Id="RegistryEntries"/>
</Feature>

<Directory Id="TARGETDIR" Name="SourceDir">
Expand All @@ -25,12 +46,24 @@
</Directory>
</Directory>

<DirectoryRef Id="TARGETDIR">
<Component Id="RegistryEntries" Guid="1F71A458-D2F5-4881-A303-752CF8614736">
<RegistryKey Root="HKCU"
Key="Software\Microsoft\Windows\CurrentVersion\Run">
<RegistryValue Type="string" Name="Winclipper" Value="[#Winclipper.exe]" />
</RegistryKey>
</Component>
</DirectoryRef>

<DirectoryRef Id="APPLICATIONROOTDIRECTORY">
<Component Id="Winclipper.exe" Guid="D59FE155-8940-4EA5-A130-AB7CEBCB527A">
<File Id="Winclipper.exe" Source="$(var.Winclipper.TargetPath)" KeyPath="yes" Checksum="yes"/>
</Component>
<Component Id="license" Guid="45D353B2-26C9-4051-961C-1CF36A5E40F6">
<File Id="license" Source="..\license" KeyPath="yes"/>
<File Id="license" Source="..\license.rtf" KeyPath="yes"/>
</Component>
<Component Id="readme" Guid="DCB35603-8C18-49F0-862D-E1FE5B8FEA18">
<File Id="readme" Name="readme.txt" Source="..\readme.md" KeyPath="yes"/>
</Component>
</DirectoryRef>

Expand Down
10 changes: 10 additions & 0 deletions Setup-x86/Setup-x86.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
<ItemGroup>
<Content Include="Microsoft_VC141_CRT_x86.msm" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
Expand Down
Binary file added SetupResources/Winclipper-WixUIBanner.bmp
Binary file not shown.
Binary file added SetupResources/Winclipper-WixUIDialog.bmp
Binary file not shown.
3 changes: 3 additions & 0 deletions Winclipper/Winclipper.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<Manifest>
<EnableDpiAwareness>true</EnableDpiAwareness>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="base64.h" />
Expand Down
21 changes: 0 additions & 21 deletions license

This file was deleted.

Binary file added license.rtf
Binary file not shown.

0 comments on commit 538f427

Please sign in to comment.