rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reindent WiX XML

This commit is contained in:
Andrew Nelless 2017-02-07 14:05:16 +00:00
parent 7161e28cf6
commit b9d12e2197
3 changed files with 159 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/setup/win32/Include.wxi
View File

@ -1,36 +1,29 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Include> <Include>
<?define Name="Synergy" ?>
<?define Name="Synergy" ?> <?define Author="Symless Ltd" ?>
<?define Author="Symless Ltd" ?> <?define BinPath="../../../bin/$(var.Configuration)" ?>
<?define ResPath="../../../res" ?>
<?define BinPath="../../../bin/$(var.Configuration)" ?> <?define ExtPath="../../../ext" ?>
<?define ResPath="../../../res" ?> <?ifndef Version ?>
<?define ExtPath="../../../ext" ?> <?define Version="1.0.0" ?>
<?endif ?>
<?ifndef Version ?> <?define UpgradeGuid32="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
<?define Version="1.0.0" ?> <?define UpgradeGuid64="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
<?endif?> <?if $(var.Platform) = "x64" ?>
<?define ProgramFilesFolder="ProgramFiles64Folder" ?>
<?define UpgradeGuid32="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?> <?define PlatformSimpleName="64-bit" ?>
<?define UpgradeGuid64="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?> <?define UpgradeGuid="$(var.UpgradeGuid64)" ?>
<?define var.OpensslPath="openssl/win64" ?>
<?if $(var.Platform) = "x64" ?> <?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?>
<?define ProgramFilesFolder="ProgramFiles64Folder" ?> <?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?>
<?define PlatformSimpleName="64-bit" ?> <?else ?>
<?define UpgradeGuid="$(var.UpgradeGuid64)" ?> <?define ProgramFilesFolder="ProgramFilesFolder" ?>
<?define var.OpensslPath="openssl/win64" ?> <?define PlatformSimpleName="32-bit" ?>
<?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?> <?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
<?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?> <?define var.OpensslPath="openssl/win32" ?>
<?else?> <?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
<?define ProgramFilesFolder="ProgramFilesFolder" ?> <?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
<?define PlatformSimpleName="32-bit" ?> <?endif ?>
<?define UpgradeGuid="$(var.UpgradeGuid32)" ?> <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
<?define var.OpensslPath="openssl/win32" ?> </Include>
<?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
<?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
<?endif?>
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
</Include>

265
src/setup/win32/Product.wxs
View File

@ -1,163 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix <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">
xmlns="http://schemas.microsoft.com/wix/2006/wi" <?include Include.wxi?>
xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension" <Product Id="*" Language="1033" Manufacturer="$(var.Author)" Name="$(var.Name) ($(var.PlatformSimpleName))" UpgradeCode="$(var.UpgradeGuid)" Version="$(var.Version)">
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="301"/>
<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed."/>
<?include Include.wxi?> <MediaTemplate EmbedCab="yes"/>
<UIRef Id="WixUI_InstallDir"/>
<Product <!-- causes ICE61 warning, but stops user from installing many instances from nightly builds. -->
Id="*" <Upgrade Id="$(var.UpgradeGuid)">
UpgradeCode="$(var.UpgradeGuid)" <UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE"/>
Name="$(var.Name) ($(var.PlatformSimpleName))" </Upgrade>
Language="1033" <Feature Id="ProductFeature" Title="$(var.Name)">
Version="$(var.Version)" <ComponentGroupRef Id="ProductComponents"/>
Manufacturer="$(var.Author)"> <ComponentGroupRef Id="OpenSslComponents"/>
<ComponentGroupRef Id="ProductQtPluginComponents"/>
<Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" /> <MergeRef Id="CRT"/>
<MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed." /> <ComponentRef Id="RegistryEntries"/>
<MediaTemplate EmbedCab="yes" /> </Feature>
<UIRef Id="WixUI_InstallDir" /> <DirectoryRef Id="TARGETDIR">
<Component Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67" Id="RegistryEntries">
<!-- causes ICE61 warning, but stops user from installing many instances from nightly builds. --> <RegistryKey Action="createAndRemoveOnUninstall" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
<Upgrade Id="$(var.UpgradeGuid)"> <RegistryValue Name="[INSTALLFOLDER]synergys.exe" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
<UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE" /> </RegistryKey>
</Upgrade> <Condition><![CDATA[Installed OR (VersionNT &gt;= 602)]]></Condition>
</Component>
<Feature Id="ProductFeature" Title="$(var.Name)"> </DirectoryRef>
<ComponentGroupRef Id="ProductComponents" /> <Icon Id="synergy.ico" SourceFile="$(var.ResPath)/synergy.ico"/>
<ComponentGroupRef Id="OpenSslComponents" /> <WixVariable Id="WixUILicenseRtf" Value="$(var.ResPath)\License.rtf"/>
<ComponentGroupRef Id="ProductQtPluginComponents" /> <WixVariable Id="WixUIBannerBmp" Value="$(var.ResPath)\banner.bmp"/>
<MergeRef Id="CRT" /> <WixVariable Id="WixUIDialogBmp" Value="$(var.ResPath)\dialog.bmp"/>
<ComponentRef Id="RegistryEntries" /> <Property Id="ARPPRODUCTICON" Value="synergy.ico"/>
</Feature> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
<DirectoryRef Id="TARGETDIR"> <Property Id="LEGACY_UNINSTALL_EXISTS">
<Component Id="RegistryEntries" Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67"> <RegistrySearch Id="LegacyRegistrySearch" Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Synergy" Name="UninstallString" Root="HKLM" Type="file" Win64="no">
<RegistryKey Root="HKLM" <FileSearch Id="LegacyFileSearch" Name="uninstall.exe"/>
Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" </RegistrySearch>
Action="createAndRemoveOnUninstall"> </Property>
<RegistryValue Type="string" Name="[INSTALLFOLDER]synergys.exe" Value="~ HIGHDPIAWARE WIN7RTM"/> <Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing.">NOT LEGACY_UNINSTALL_EXISTS
</RegistryKey> </Condition>
<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
<Condition> <UI>
<![CDATA[Installed OR (VersionNT >= 602)]]> <Publish Control="Finish" Dialog="ExitDialog" Event="DoAction" Value="StartGui">NOT Installed</Publish>
</Condition> </UI>
</Component> </Product>
</DirectoryRef> <Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Icon Id="synergy.ico" SourceFile="$(var.ResPath)/synergy.ico"/> <Directory Id="$(var.ProgramFilesFolder)">
<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
<WixVariable Id="WixUILicenseRtf" Value="$(var.ResPath)\License.rtf" /> <Merge DiskId="1" Id="CRT" Language="0" SourceFile="$(var.CRT)"/>
<WixVariable Id="WixUIBannerBmp" Value="$(var.ResPath)\banner.bmp" /> <Directory Id="OpenSslDir" Name="OpenSSL"/>
<WixVariable Id="WixUIDialogBmp" Value="$(var.ResPath)\dialog.bmp" /> <Directory Id="PlatformsDir" Name="Platforms"/>
</Directory>
<Property Id="ARPPRODUCTICON" Value="synergy.ico" /> </Directory>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" /> <Directory Id="ProgramMenuFolder"/>
<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" /> </Directory>
</Fragment>
<Property Id="LEGACY_UNINSTALL_EXISTS"> <Fragment>
<RegistrySearch <ComponentGroup Directory="INSTALLFOLDER" Id="ProductComponents">
Id="LegacyRegistrySearch" Root="HKLM" <Component Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD" Id="Core">
Key="SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Synergy" <File KeyPath="yes" Source="$(var.BinPath)/synergyd.exe"/>
Name="UninstallString" Win64="no" Type="file"> <ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="Synergy" Start="auto" Type="ownProcess">
<FileSearch Id="LegacyFileSearch" Name="uninstall.exe" /> <util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
</RegistrySearch> </ServiceInstall>
</Property> <ServiceControl Id="ServiceControl" Name="Synergy" Remove="uninstall" Start="install" Stop="both"/>
<File Source="$(var.BinPath)/synergys.exe">
<Condition Message="An existing installation of $(var.Name) was detected, please uninstall it before continuing."> <fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
NOT LEGACY_UNINSTALL_EXISTS </File>
</Condition> <File Source="$(var.BinPath)/synergyc.exe"/>
<File Source="$(var.BinPath)/syntool.exe"/>
<CustomAction Id="StartGui" FileKey="GuiProgram" ExeCommand="" Return="asyncNoWait" /> <File Source="$(var.BinPath)/synwinhk.dll"/>
<UI> <File Source="$(var.BinPath)/libeay32.dll"/>
<Publish Dialog="ExitDialog" <File Source="$(var.BinPath)/ssleay32.dll"/>
Control="Finish" </Component>
Event="DoAction" <Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
Value="StartGui">NOT Installed</Publish> <File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/synergy.exe">
</UI> <Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="synergy.ico" Id="GuiShortcut" Name="$(var.Name)"/>
<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
</Product> </File>
<File Source="$(var.QtPath)\Qt5Core.dll"/>
<Fragment> <File Source="$(var.QtPath)\Qt5Gui.dll"/>
<Directory Id="TARGETDIR" Name="SourceDir"> <File Source="$(var.QtPath)\Qt5Network.dll"/>
<Directory Id="$(var.ProgramFilesFolder)"> <File Source="$(var.QtPath)\Qt5Svg.dll"/>
<Directory Id="INSTALLFOLDER" Name="$(var.Name)"> <File Source="$(var.QtPath)\Qt5Widgets.dll"/>
<Merge Id="CRT" Language="0" SourceFile="$(var.CRT)" DiskId="1" /> <File Source="$(var.QtPath)\libGLESv2.dll"/>
<Directory Id="OpenSslDir" Name="OpenSSL" /> <File Source="$(var.QtPath)\libEGL.dll"/>
<Directory Id="PlatformsDir" Name="Platforms" /> </Component>
</Directory> </ComponentGroup>
</Directory> <ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
<Directory Id="ProgramMenuFolder" /> <Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
</Directory> <File Source="$(var.QtPlatformPath)\qwindows.dll"/>
</Fragment> </Component>
</ComponentGroup>
<Fragment> <ComponentGroup Directory="OpenSslDir" Id="OpenSslComponents">
<Component Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1" Id="OpenSsl">
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> <File Id="OpenSslDll1" Source="$(var.ExtPath)/$(var.OpensslPath)/bin/libeay32.dll"/>
<File Id="OpenSslDll2" Source="$(var.ExtPath)/$(var.OpensslPath)/bin/ssleay32.dll"/>
<Component Id="Core" Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD"> <File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/openssl.exe"/>
<File Source="$(var.ResPath)/openssl/synergy.conf"/>
<File Source="$(var.BinPath)/synergyd.exe" KeyPath="yes" /> </Component>
</ComponentGroup>
<ServiceInstall </Fragment>
Id="ServiceInstall" Name="Synergy" DisplayName="$(var.Name)" </Wix>
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'/>
</ServiceInstall>
<ServiceControl
Id="ServiceControl" Name="Synergy"
Start="install" Stop="both" Remove="uninstall" />
<File Source="$(var.BinPath)/synergys.exe">
<fire:FirewallException Id="ServerFirewallException" Name="$(var.Name)" Scope="any" IgnoreFailure="yes" />
</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" />
</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" />
</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" />
</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" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>

58
src/setup/win32/synergy.wixproj
View File

@ -1,31 +1,31 @@
<?xml version="1.0" encoding="utf-8"?> <?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> <PropertyGroup>
<ProductVersion>3.10</ProductVersion> <ProductVersion>3.10</ProductVersion>
<ProjectGuid>{d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17}</ProjectGuid> <ProjectGuid>{d4ba9f39-6a35-4c8f-9cb2-67fcbe5cab17}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<OutputName>synergy</OutputName> <OutputName>synergy</OutputName>
<OutputType>Package</OutputType> <OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<OutputPath>..\..\..\bin\$(Configuration)\</OutputPath> <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>..\..\..\build\wix\obj\$(Configuration)\</IntermediateOutputPath> <IntermediateOutputPath>..\..\..\build\wix\obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<WixExtension Include="WixFirewallExtension"> <WixExtension Include="WixFirewallExtension">
<HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath> <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
<Name>WixFirewallExtension</Name> <Name>WixFirewallExtension</Name>
</WixExtension> </WixExtension>
<WixExtension Include="WixUtilExtension"> <WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath> <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name> <Name>WixUtilExtension</Name>
</WixExtension> </WixExtension>
<WixExtension Include="WixUIExtension"> <WixExtension Include="WixUIExtension">
<HintPath>C:\Program Files (x86)\WiX Toolset v3.10\bin\WixUIExtension.dll</HintPath> <HintPath>C:\Program Files (x86)\WiX Toolset v3.10\bin\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name> <Name>WixUIExtension</Name>
</WixExtension> </WixExtension>
<Compile Include="Product.wxs" /> <Compile Include="Product.wxs"/>
<Content Include="Include.wxi" /> <Content Include="Include.wxi"/>
</ItemGroup> </ItemGroup>
<Import Project="$(WixTargetsPath)" /> <Import Project="$(WixTargetsPath)"/>
</Project> </Project>