Reindent WiX XML
This commit is contained in:
Andrew Nelless
parent
7161e28cf6
commit
b9d12e2197
|
|
@ -1,20 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Include>
|
||||
|
||||
<?define Name="Synergy" ?>
|
||||
<?define Author="Symless Ltd" ?>
|
||||
|
||||
<?define BinPath="../../../bin/$(var.Configuration)" ?>
|
||||
<?define ResPath="../../../res" ?>
|
||||
<?define ExtPath="../../../ext" ?>
|
||||
|
||||
<?ifndef Version ?>
|
||||
<?define Version="1.0.0" ?>
|
||||
<?endif?>
|
||||
|
||||
<?endif ?>
|
||||
<?define UpgradeGuid32="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
|
||||
<?define UpgradeGuid64="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
|
||||
|
||||
<?if $(var.Platform) = "x64" ?>
|
||||
<?define ProgramFilesFolder="ProgramFiles64Folder" ?>
|
||||
<?define PlatformSimpleName="64-bit" ?>
|
||||
|
|
@ -22,15 +17,13 @@
|
|||
<?define var.OpensslPath="openssl/win64" ?>
|
||||
<?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?>
|
||||
<?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?>
|
||||
<?else?>
|
||||
<?else ?>
|
||||
<?define ProgramFilesFolder="ProgramFilesFolder" ?>
|
||||
<?define PlatformSimpleName="32-bit" ?>
|
||||
<?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
|
||||
<?define var.OpensslPath="openssl/win32" ?>
|
||||
<?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
|
||||
<?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
|
||||
<?endif?>
|
||||
|
||||
<?endif ?>
|
||||
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
|
||||
|
||||
</Include>
|
||||
|
|
@ -1,163 +1,104 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Wix
|
||||
xmlns="http://schemas.microsoft.com/wix/2006/wi"
|
||||
xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
|
||||
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
<?include Include.wxi?>
|
||||
|
||||
<Product
|
||||
Id="*"
|
||||
UpgradeCode="$(var.UpgradeGuid)"
|
||||
Name="$(var.Name) ($(var.PlatformSimpleName))"
|
||||
Language="1033"
|
||||
Version="$(var.Version)"
|
||||
Manufacturer="$(var.Author)">
|
||||
|
||||
<Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" />
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed." />
|
||||
<MediaTemplate EmbedCab="yes" />
|
||||
<UIRef Id="WixUI_InstallDir" />
|
||||
|
||||
<Product Id="*" Language="1033" Manufacturer="$(var.Author)" Name="$(var.Name) ($(var.PlatformSimpleName))" UpgradeCode="$(var.UpgradeGuid)" Version="$(var.Version)">
|
||||
<Package Compressed="yes" InstallScope="perMachine" InstallerVersion="301"/>
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed."/>
|
||||
<MediaTemplate EmbedCab="yes"/>
|
||||
<UIRef Id="WixUI_InstallDir"/>
|
||||
<!-- causes ICE61 warning, but stops user from installing many instances from nightly builds. -->
|
||||
<Upgrade Id="$(var.UpgradeGuid)">
|
||||
<UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE" />
|
||||
<UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE"/>
|
||||
</Upgrade>
|
||||
|
||||
<Feature Id="ProductFeature" Title="$(var.Name)">
|
||||
<ComponentGroupRef Id="ProductComponents" />
|
||||
<ComponentGroupRef Id="OpenSslComponents" />
|
||||
<ComponentGroupRef Id="ProductQtPluginComponents" />
|
||||
<MergeRef Id="CRT" />
|
||||
<ComponentRef Id="RegistryEntries" />
|
||||
<ComponentGroupRef Id="ProductComponents"/>
|
||||
<ComponentGroupRef Id="OpenSslComponents"/>
|
||||
<ComponentGroupRef Id="ProductQtPluginComponents"/>
|
||||
<MergeRef Id="CRT"/>
|
||||
<ComponentRef Id="RegistryEntries"/>
|
||||
</Feature>
|
||||
|
||||
<DirectoryRef Id="TARGETDIR">
|
||||
<Component Id="RegistryEntries" Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67">
|
||||
<RegistryKey Root="HKLM"
|
||||
Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers"
|
||||
Action="createAndRemoveOnUninstall">
|
||||
<RegistryValue Type="string" Name="[INSTALLFOLDER]synergys.exe" Value="~ HIGHDPIAWARE WIN7RTM"/>
|
||||
<Component Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67" Id="RegistryEntries">
|
||||
<RegistryKey Action="createAndRemoveOnUninstall" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
|
||||
<RegistryValue Name="[INSTALLFOLDER]synergys.exe" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
|
||||
</RegistryKey>
|
||||
|
||||
<Condition>
|
||||
<![CDATA[Installed OR (VersionNT >= 602)]]>
|
||||
</Condition>
|
||||
<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
|
||||
<Icon Id="synergy.ico" SourceFile="$(var.ResPath)/synergy.ico"/>
|
||||
|
||||
<WixVariable Id="WixUILicenseRtf" Value="$(var.ResPath)\License.rtf" />
|
||||
<WixVariable Id="WixUIBannerBmp" Value="$(var.ResPath)\banner.bmp" />
|
||||
<WixVariable Id="WixUIDialogBmp" Value="$(var.ResPath)\dialog.bmp" />
|
||||
|
||||
<Property Id="ARPPRODUCTICON" Value="synergy.ico" />
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
|
||||
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" />
|
||||
|
||||
<WixVariable Id="WixUILicenseRtf" Value="$(var.ResPath)\License.rtf"/>
|
||||
<WixVariable Id="WixUIBannerBmp" Value="$(var.ResPath)\banner.bmp"/>
|
||||
<WixVariable Id="WixUIDialogBmp" Value="$(var.ResPath)\dialog.bmp"/>
|
||||
<Property Id="ARPPRODUCTICON" Value="synergy.ico"/>
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
|
||||
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
|
||||
<Property Id="LEGACY_UNINSTALL_EXISTS">
|
||||
<RegistrySearch
|
||||
Id="LegacyRegistrySearch" Root="HKLM"
|
||||
Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Synergy"
|
||||
Name="UninstallString" Win64="no" Type="file">
|
||||
<FileSearch Id="LegacyFileSearch" Name="uninstall.exe" />
|
||||
<RegistrySearch Id="LegacyRegistrySearch" Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Synergy" Name="UninstallString" Root="HKLM" Type="file" Win64="no">
|
||||
<FileSearch Id="LegacyFileSearch" Name="uninstall.exe"/>
|
||||
</RegistrySearch>
|
||||
</Property>
|
||||
|
||||
<Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing.">
|
||||
NOT LEGACY_UNINSTALL_EXISTS
|
||||
<Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing.">NOT LEGACY_UNINSTALL_EXISTS
|
||||
</Condition>
|
||||
|
||||
<CustomAction Id="StartGui" FileKey="GuiProgram" ExeCommand="" Return="asyncNoWait" />
|
||||
<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
|
||||
<UI>
|
||||
<Publish Dialog="ExitDialog"
|
||||
Control="Finish"
|
||||
Event="DoAction"
|
||||
Value="StartGui">NOT Installed</Publish>
|
||||
<Publish Control="Finish" Dialog="ExitDialog" Event="DoAction" Value="StartGui">NOT Installed</Publish>
|
||||
</UI>
|
||||
|
||||
</Product>
|
||||
|
||||
<Fragment>
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="$(var.ProgramFilesFolder)">
|
||||
<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
|
||||
<Merge Id="CRT" Language="0" SourceFile="$(var.CRT)" DiskId="1" />
|
||||
<Directory Id="OpenSslDir" Name="OpenSSL" />
|
||||
<Directory Id="PlatformsDir" Name="Platforms" />
|
||||
<Merge DiskId="1" Id="CRT" Language="0" SourceFile="$(var.CRT)"/>
|
||||
<Directory Id="OpenSslDir" Name="OpenSSL"/>
|
||||
<Directory Id="PlatformsDir" Name="Platforms"/>
|
||||
</Directory>
|
||||
</Directory>
|
||||
<Directory Id="ProgramMenuFolder" />
|
||||
<Directory Id="ProgramMenuFolder"/>
|
||||
</Directory>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
|
||||
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
|
||||
|
||||
<Component Id="Core" Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD">
|
||||
|
||||
<File Source="$(var.BinPath)/synergyd.exe" KeyPath="yes" />
|
||||
|
||||
<ServiceInstall
|
||||
Id="ServiceInstall" Name="Synergy" DisplayName="$(var.Name)"
|
||||
Description="Controls the $(var.Name) foreground processes."
|
||||
Type="ownProcess" Start="auto" ErrorControl="normal">
|
||||
<util:ServiceConfig
|
||||
FirstFailureActionType='restart'
|
||||
SecondFailureActionType='restart'
|
||||
ThirdFailureActionType='restart'
|
||||
RestartServiceDelayInSeconds='1'
|
||||
ResetPeriodInDays='1'/>
|
||||
<ComponentGroup Directory="INSTALLFOLDER" Id="ProductComponents">
|
||||
<Component Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD" Id="Core">
|
||||
<File KeyPath="yes" Source="$(var.BinPath)/synergyd.exe"/>
|
||||
<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="Synergy" Start="auto" Type="ownProcess">
|
||||
<util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
|
||||
</ServiceInstall>
|
||||
|
||||
<ServiceControl
|
||||
Id="ServiceControl" Name="Synergy"
|
||||
Start="install" Stop="both" Remove="uninstall" />
|
||||
|
||||
<ServiceControl Id="ServiceControl" Name="Synergy" Remove="uninstall" Start="install" Stop="both"/>
|
||||
<File Source="$(var.BinPath)/synergys.exe">
|
||||
<fire:FirewallException Id="ServerFirewallException" Name="$(var.Name)" Scope="any" IgnoreFailure="yes" />
|
||||
<fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
|
||||
</File>
|
||||
|
||||
<File Source="$(var.BinPath)/synergyc.exe" />
|
||||
<File Source="$(var.BinPath)/syntool.exe" />
|
||||
<File Source="$(var.BinPath)/synwinhk.dll" />
|
||||
<File Source="$(var.BinPath)/libeay32.dll" />
|
||||
<File Source="$(var.BinPath)/ssleay32.dll" />
|
||||
|
||||
<File Source="$(var.BinPath)/synergyc.exe"/>
|
||||
<File Source="$(var.BinPath)/syntool.exe"/>
|
||||
<File Source="$(var.BinPath)/synwinhk.dll"/>
|
||||
<File Source="$(var.BinPath)/libeay32.dll"/>
|
||||
<File Source="$(var.BinPath)/ssleay32.dll"/>
|
||||
</Component>
|
||||
|
||||
<Component Id="Gui" Guid="BAC8149B-6287-45BF-9C27-43D71ED40214">
|
||||
<File Id="GuiProgram" Source="$(var.BinPath)/synergy.exe" KeyPath="yes">
|
||||
<Shortcut Id="GuiShortcut" Name="$(var.Name)" Directory="ProgramMenuFolder" Icon="synergy.ico" Advertise="yes" />
|
||||
<fire:FirewallException Id="GuiFirewallException" Name="$(var.Name)" Scope="any" IgnoreFailure="yes" />
|
||||
<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
|
||||
<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/synergy.exe">
|
||||
<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="synergy.ico" Id="GuiShortcut" Name="$(var.Name)"/>
|
||||
<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
|
||||
</File>
|
||||
<File Source="$(var.QtPath)\Qt5Core.dll" />
|
||||
<File Source="$(var.QtPath)\Qt5Gui.dll" />
|
||||
<File Source="$(var.QtPath)\Qt5Network.dll" />
|
||||
<File Source="$(var.QtPath)\Qt5Svg.dll" />
|
||||
<File Source="$(var.QtPath)\Qt5Widgets.dll" />
|
||||
<File Source="$(var.QtPath)\libGLESv2.dll" />
|
||||
<File Source="$(var.QtPath)\libEGL.dll" />
|
||||
</Component>
|
||||
|
||||
</ComponentGroup>
|
||||
|
||||
<ComponentGroup Id="ProductQtPluginComponents" Directory="PlatformsDir">
|
||||
<Component Id="QtPlatformPlugin" Guid="684EFA14-856B-440E-A5E6-E90E04E36B41">
|
||||
<File Source="$(var.QtPlatformPath)\qwindows.dll" />
|
||||
<File Source="$(var.QtPath)\Qt5Core.dll"/>
|
||||
<File Source="$(var.QtPath)\Qt5Gui.dll"/>
|
||||
<File Source="$(var.QtPath)\Qt5Network.dll"/>
|
||||
<File Source="$(var.QtPath)\Qt5Svg.dll"/>
|
||||
<File Source="$(var.QtPath)\Qt5Widgets.dll"/>
|
||||
<File Source="$(var.QtPath)\libGLESv2.dll"/>
|
||||
<File Source="$(var.QtPath)\libEGL.dll"/>
|
||||
</Component>
|
||||
</ComponentGroup>
|
||||
|
||||
<ComponentGroup Id="OpenSslComponents" Directory="OpenSslDir">
|
||||
<Component Id="OpenSsl" Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1">
|
||||
<File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/libeay32.dll" Id="OpenSslDll1" />
|
||||
<File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/ssleay32.dll" Id="OpenSslDll2" />
|
||||
<File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/openssl.exe" />
|
||||
<File Source="$(var.ResPath)/openssl/synergy.conf" />
|
||||
<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
|
||||
<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
|
||||
<File Source="$(var.QtPlatformPath)\qwindows.dll"/>
|
||||
</Component>
|
||||
</ComponentGroup>
|
||||
<ComponentGroup Directory="OpenSslDir" Id="OpenSslComponents">
|
||||
<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSsl">
|
||||
<File Id="OpenSslDll1" Source="$(var.ExtPath)/$(var.OpensslPath)/bin/libeay32.dll"/>
|
||||
<File Id="OpenSslDll2" Source="$(var.ExtPath)/$(var.OpensslPath)/bin/ssleay32.dll"/>
|
||||
<File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/openssl.exe"/>
|
||||
<File Source="$(var.ResPath)/openssl/synergy.conf"/>
|
||||
</Component>
|
||||
</ComponentGroup>
|
||||
|
||||
</Fragment>
|
||||
</Wix>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProductVersion>3.10</ProductVersion>
|
||||
<ProjectGuid>{d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17}</ProjectGuid>
|
||||
|
|
@ -24,8 +24,8 @@
|
|||
<HintPath>C:\Program Files (x86)\WiX Toolset v3.10\bin\WixUIExtension.dll</HintPath>
|
||||
<Name>WixUIExtension</Name>
|
||||
</WixExtension>
|
||||
<Compile Include="Product.wxs" />
|
||||
<Content Include="Include.wxi" />
|
||||
<Compile Include="Product.wxs"/>
|
||||
<Content Include="Include.wxi"/>
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" />
|
||||
<Import Project="$(WixTargetsPath)"/>
|
||||
</Project>
|
||||
Loading…
Reference in New Issue