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

Added OpenSSL component to installer #4546

This commit is contained in:
Nick Bolton 2015-04-20 14:35:52 +01:00
parent 05b833d1b6
commit 453638fa39
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@
<Feature Id="ProductFeature" Title="$(var.Name)"> <Feature Id="ProductFeature" Title="$(var.Name)">
<ComponentGroupRef Id="ProductComponents" /> <ComponentGroupRef Id="ProductComponents" />
<ComponentGroupRef Id="OpenSslComponents" />
<MergeRef Id="CRT" /> <MergeRef Id="CRT" />
</Feature> </Feature>
@ -61,6 +62,7 @@
<Directory Id="$(var.ProgramFilesFolder)"> <Directory Id="$(var.ProgramFilesFolder)">
<Directory Id="INSTALLFOLDER" Name="$(var.Name)"> <Directory Id="INSTALLFOLDER" Name="$(var.Name)">
<Merge Id="CRT" Language="0" SourceFile="$(var.CRT)" DiskId="1" /> <Merge Id="CRT" Language="0" SourceFile="$(var.CRT)" DiskId="1" />
<Directory Id="OpenSslDir" Name="OpenSSL" />
</Directory> </Directory>
</Directory> </Directory>
<Directory Id="ProgramMenuFolder" /> <Directory Id="ProgramMenuFolder" />
@ -68,6 +70,7 @@
</Fragment> </Fragment>
<Fragment> <Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id="Core" Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD"> <Component Id="Core" Guid="EC9AD3B0-277C-4157-B5C8-5FD5B6A5F4AD">
@ -112,5 +115,14 @@
</Component> </Component>
</ComponentGroup> </ComponentGroup>
<ComponentGroup Id="OpenSslComponents" Directory="OpenSslDir">
<Component Id="OpenSsl" Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1">
<File Source="$(var.ExtPath)/openssl/out32dll/libeay32.dll" Id="OpenSslDll1" />
<File Source="$(var.ExtPath)/openssl/out32dll/ssleay32.dll" Id="OpenSslDll2" />
<File Source="$(var.ExtPath)/openssl/out32dll/openssl.exe" />
<File Source="$(var.ResPath)/openssl/synergy.conf" />
</Component>
</ComponentGroup>
</Fragment> </Fragment>
</Wix> </Wix>