1. Corrected WebView resources structure

This commit is contained in:
vadym 2022-11-30 21:46:16 +02:00
parent 68a5d63b9c
commit 9fba67bfd5

View file

@ -165,14 +165,6 @@ cat > wix.xml << EOF
<Directory Id="${PKGINSTFOLDER}" Name="PFiles">
<Directory Id="MeshInstallFolder" Name="RiV-mesh">
<Directory Id="WebViewUIFolder" Name="ui" >
<Component Id="WebViewResources" Guid="a4a5a50a-a336-4789-bf61-ca76fe217e3f">
<File
Id="WebViewHtmlFile"
Name="index.html"
DiskId="1"
Source="${PKGUIFOLDER}index.html" />
</Component>
</Directory>
<Directory Id="AssetsFolder" Name="assets" >
<Component Id="AssetsResources" Guid="6e9af115-daa0-4aac-8e6a-5ba65e720a4d">
<File
@ -201,6 +193,14 @@ cat > wix.xml << EOF
Source="${PKGFONTSRESOURCESFOLDER}fa-solid-900.woff2" />
</Component>
</Directory>
<Component Id="WebViewResources" Guid="a4a5a50a-a336-4789-bf61-ca76fe217e3f">
<File
Id="WebViewHtmlFile"
Name="index.html"
DiskId="1"
Source="${PKGUIFOLDER}index.html" />
</Component>
</Directory>
<Component Id="MainExecutable" Guid="c2119231-2aa3-4962-867a-9759c87beb24">
<File
Id="Mesh"
@ -328,7 +328,8 @@ cat > wix.xml << EOF
Name="RiV-mesh"
Description="RiV-mesh is IoT E2E encrypted network"
Directory="DesktopFolder"
Target="[MeshInstallFolder]mesh-ui.exe ui\index.html"
Target="[MeshInstallFolder]mesh-ui.exe"
Arguments="ui\index.html"
WorkingDirectory="MeshInstallFolder"/>
<RegistryValue Root="HKCU" Key="Software\RiV-chain\RiV-mesh" Name="installed" Type="integer" Value="1" KeyPath="yes" />
<RegistryValue Id="MerAs.rst" Root="HKMU" Action="write"