From 68a36b3b67ec82cdd3f77e88e40d1043cbab5000 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Wed, 19 Sep 2018 18:23:50 -0400
Subject: New upstream version 2.1.2+dfsg

---
 dist/wix/Barrier.sln     |  27 ------------
 dist/wix/Barrier.wixproj |  31 --------------
 dist/wix/Include.wxi.in  |  25 ------------
 dist/wix/Product.wxs     | 104 -----------------------------------------------
 4 files changed, 187 deletions(-)
 delete mode 100644 dist/wix/Barrier.sln
 delete mode 100644 dist/wix/Barrier.wixproj
 delete mode 100644 dist/wix/Include.wxi.in
 delete mode 100644 dist/wix/Product.wxs

(limited to 'dist/wix')

diff --git a/dist/wix/Barrier.sln b/dist/wix/Barrier.sln
deleted file mode 100644
index c163c62..0000000
--- a/dist/wix/Barrier.sln
+++ /dev/null
@@ -1,27 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Barrier", "Barrier.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Debug|x64 = Debug|x64
-		Release|x86 = Release|x86
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.ActiveCfg = Debug|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.Build.0 = Debug|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.Build.0 = Debug|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.ActiveCfg = Release|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.Build.0 = Release|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/dist/wix/Barrier.wixproj b/dist/wix/Barrier.wixproj
deleted file mode 100644
index ffc7701..0000000
--- a/dist/wix/Barrier.wixproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-        <SchemaVersion>2.0</SchemaVersion>
-        <OutputName>Barrier</OutputName>
-        <OutputType>Package</OutputType>
-        <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-        <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-        <OutputPath>bin\$(Configuration)\</OutputPath>
-        <IntermediateOutputPath>wix\obj\$(Configuration)\</IntermediateOutputPath>
-    </PropertyGroup>
-    <ItemGroup>
-        <WixExtension Include="WixFirewallExtension">
-            <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
-            <Name>WixFirewallExtension</Name>
-        </WixExtension>
-        <WixExtension Include="WixUtilExtension">
-            <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-            <Name>WixUtilExtension</Name>
-        </WixExtension>
-        <WixExtension Include="WixUIExtension">
-            <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-            <Name>WixUIExtension</Name>
-        </WixExtension>
-        <Compile Include="Product.wxs"/>
-        <Content Include="Include.wxi"/>
-    </ItemGroup>
-    <Import Project="$(WixTargetsPath)"/>
-</Project>
\ No newline at end of file
diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in
deleted file mode 100644
index 652d203..0000000
--- a/dist/wix/Include.wxi.in
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include>
-    <?define Name="Barrier" ?>
-    <?define Version="@BARRIER_VERSION@" ?>
-    <?define QtVersion="@QT_VERSION@" ?>
-    <?define Author="Debauchee Open Source Group" ?>
-    <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
-    <?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?>
-    <?define ExtPath="@CMAKE_CURRENT_SOURCE_DIR@/ext" ?>
-    <?if $(var.Platform) = "x64" ?>
-        <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
-        <?define PlatformSimpleName="64-bit" ?>
-        <?define UpgradeGuid="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
-        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015_64" ?>
-    <?else ?>
-        <?define ProgramFilesFolder="ProgramFilesFolder" ?>
-        <?define PlatformSimpleName="32-bit" ?>
-        <?define UpgradeGuid="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
-        <?define QtPath="E:\Qt\$(var.QtVersion)\msvc2015" ?>
-    <?endif ?>
-    <?define QtBinPath="$(var.QtPath)\bin" ?>
-    <?define QtPlatformPath="$(var.QtPath)\plugins\platforms" ?>
-    <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
-    <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
-</Include>
diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs
deleted file mode 100644
index 1abc21e..0000000
--- a/dist/wix/Product.wxs
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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">
-	<?include Include.wxi?>
-	<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"/>
-		</Upgrade>
-		<Feature Id="ProductFeature" Title="$(var.Name)">
-			<ComponentGroupRef Id="ProductComponents"/>
-			<ComponentGroupRef Id="ProductQtPluginComponents"/>
-			<ComponentRef Id="RegistryEntries"/>
-		</Feature>
-		<DirectoryRef Id="TARGETDIR">
-			<Component Guid="7CF3564D-1F8E-4D3D-9781-E1EE22D5BD67" Id="RegistryEntries">
-				<RegistryKey ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
-					<RegistryValue Name="[INSTALLFOLDER]barriers.exe" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
-				</RegistryKey>
-				<!-- Windows 8 and later only -->
-				<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
-			</Component>
-		</DirectoryRef>
-		<Icon Id="barrier.ico" SourceFile="$(var.ResPath)/barrier.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="barrier.ico"/>
-		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
-		<Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable"/>
-    </Condition>
-		<CustomAction ExeCommand="" FileKey="GuiProgram" Id="StartGui" Return="asyncNoWait"/>
-		<UI>
-			<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)">
-					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
-					<Directory Id="PlatformsDir" Name="Platforms"/>
-				</Directory>
-			</Directory>
-			<Directory Id="ProgramMenuFolder"/>
-		</Directory>
-	</Fragment>
-	<Fragment>
-		<ComponentGroup Directory="INSTALLFOLDER" Id="ProductComponents">
-			<Component Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD" Id="Core">
-				<File KeyPath="yes" Source="$(var.BinPath)/barrierd.exe"/>
-				<ServiceInstall Description="Controls the $(var.Name) foreground processes." DisplayName="$(var.Name)" ErrorControl="normal" Id="ServiceInstall" Name="Barrier" Start="auto" Type="ownProcess">
-					<util:ServiceConfig FirstFailureActionType="restart" ResetPeriodInDays="1" RestartServiceDelayInSeconds="1" SecondFailureActionType="restart" ThirdFailureActionType="restart"/>
-				</ServiceInstall>
-				<ServiceControl Id="ServiceControl" Name="Barrier" Remove="uninstall" Start="install" Stop="both"/>
-				<File Source="$(var.BinPath)/barriers.exe">
-					<fire:FirewallException Id="ServerFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
-				</File>
-				<File Source="$(var.BinPath)/barrierc.exe"/>
-				<File Source="$(var.OpenSSLBinPath)/libeay32.dll"/>
-				<File Source="$(var.OpenSSLBinPath)/ssleay32.dll"/>
-				<File Source="$(var.OpenSSLBinPath)/openssl.exe"/>
-				<File Source="$(var.ResPath)/openssl/barrier.conf"/>
-			</Component>
-			<Component Guid="BAC8149B-6287-45BF-9C27-43D71ED40214" Id="Gui">
-				<File Id="GuiProgram" KeyPath="yes" Source="$(var.BinPath)/barrier.exe">
-					<Shortcut Advertise="yes" Directory="ProgramMenuFolder" Icon="barrier.ico" Id="GuiShortcut" Name="$(var.Name)"/>
-					<fire:FirewallException Id="GuiFirewallException" IgnoreFailure="yes" Name="$(var.Name)" Scope="any"/>
-				</File>
-				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.QtBinPath)\Qt5Cored.dll"/>
-				<File Source="$(var.QtBinPath)\Qt5Guid.dll"/>
-				<File Source="$(var.QtBinPath)\Qt5Networkd.dll"/>
-				<File Source="$(var.QtBinPath)\Qt5Svgd.dll"/>
-				<File Source="$(var.QtBinPath)\Qt5Widgetsd.dll"/>
-				<File Source="$(var.QtBinPath)\libGLESv2d.dll"/>
-				<File Source="$(var.QtBinPath)\libEGLd.dll"/>
-				<!-- Hacky -->
-				<File Source="C:\Program Files (x86)\Windows Kits\10\bin\$(var.Platform)\ucrt\ucrtbased.dll"/>
-				<?else ?>
-				<File Source="$(var.QtBinPath)\Qt5Core.dll"/>
-				<File Source="$(var.QtBinPath)\Qt5Gui.dll"/>
-				<File Source="$(var.QtBinPath)\Qt5Network.dll"/>
-				<File Source="$(var.QtBinPath)\Qt5Svg.dll"/>
-				<File Source="$(var.QtBinPath)\Qt5Widgets.dll"/>
-				<File Source="$(var.QtBinPath)\libGLESv2.dll"/>
-				<File Source="$(var.QtBinPath)\libEGL.dll"/>
-				<?endif ?>
-			</Component>
-		</ComponentGroup>
-		<ComponentGroup Directory="PlatformsDir" Id="ProductQtPluginComponents">
-			<Component Guid="684EFA14-856B-440E-A5E6-E90E04E36B41" Id="QtPlatformPlugin">
-				<?if $(var.Configuration) = "Debug" ?>
-				<File Source="$(var.QtPlatformPath)\qwindowsd.dll"/>
-				<?else ?>
-				<File Source="$(var.QtPlatformPath)\qwindows.dll"/>
-				<?endif ?>
-			</Component>
-		</ComponentGroup>
-	</Fragment>
-</Wix>
-- 
cgit v1.2.3