yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 03:05:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

1. added all WebView resources to win.xml file RIVM-2

Browse source
This commit is contained in:
vadym 2022-11-30 21:16:42 +02:00
parent c0353d100b
commit 95bb7abea3
1 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

42
contrib/msi/build-msi-gui.sh
View file

@ -158,11 +158,10 @@ cat > wix.xml << EOF
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="DesktopFolder" SourceName="Desktop"/> <Directory Id="DesktopFolder" SourceName="Desktop"/>
<Directory Id="CopyWebViewUIFolder" SourceName="SourceDir"/>
<Directory Id="${PKGINSTFOLDER}" Name="PFiles"> <Directory Id="${PKGINSTFOLDER}" Name="PFiles">
<Directory Id="MeshInstallFolder" Name="RiV-mesh"> <Directory Id="MeshInstallFolder" Name="RiV-mesh">
<Directory Id="WebViewUIFolder" Name="ui" > <Directory Id="WebViewUIFolder" Name="ui" >
<Component Id="WebViewReslources" Guid="a4a5a50a-a336-4789-bf61-ca76fe217e3f"> <Component Id="WebViewResources" Guid="a4a5a50a-a336-4789-bf61-ca76fe217e3f">
<File <File
Id="WebViewHtmlFile" Id="WebViewHtmlFile"
Name="index.html" Name="index.html"
@ -170,6 +169,35 @@ cat > wix.xml << EOF
Source="${PKGWEBVIEWFILE}" /> Source="${PKGWEBVIEWFILE}" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="AssetsFolder" Name="assets" >
<Component Id="AssetsResources" Guid="6e9af115-daa0-4aac-8e6a-5ba65e720a4d">
<File
Id="AllMinCssFile"
Name="all.min.css"
DiskId="1"
Source="${PKGWEBVIEWFILE}" />
<File
Id="BulmaswatchCssFile"
Name="bulmaswatch.min.css"
DiskId="1"
Source="${PKGWEBVIEWFILE}" />
<File
Id="BulmaswatchCssMapFile"
Name="bulmaswatch.min.css.map"
DiskId="1"
Source="${PKGWEBVIEWFILE}" />
</Component>
</Directory>
<Directory Id="WebfontsFolder" Name="webfonts" >
<Component Id="FontsResources" Guid="4ffeb20b-61a8-4c7f-ba16-0d0c8e43b09a">
<File
Id="FontFile"
Name="fa-solid-900.woff2"
DiskId="1"
Source="${PKGWEBVIEWFILE}" />
</Component>
</Directory>
<Component Id="MainExecutable" Guid="c2119231-2aa3-4962-867a-9759c87beb24"> <Component Id="MainExecutable" Guid="c2119231-2aa3-4962-867a-9759c87beb24">
<File <File
Id="Mesh" Id="Mesh"
@ -177,13 +205,11 @@ cat > wix.xml << EOF
DiskId="1" DiskId="1"
Source="mesh.exe" Source="mesh.exe"
KeyPath="yes" /> KeyPath="yes" />
<File <File
Id="Wintun" Id="Wintun"
Name="wintun.dll" Name="wintun.dll"
DiskId="1" DiskId="1"
Source="${PKGWINTUNDLL}" /> Source="${PKGWINTUNDLL}" />
<ServiceInstall <ServiceInstall
Id="MeshServiceInstaller" Id="MeshServiceInstaller"
Account="LocalSystem" Account="LocalSystem"
@ -196,7 +222,6 @@ cat > wix.xml << EOF
Type="ownProcess" Type="ownProcess"
Arguments='-useconffile "%ALLUSERSPROFILE%\\RiV-mesh\\mesh.conf" -logto "%ALLUSERSPROFILE%\\RiV-mesh\\mesh.log"' Arguments='-useconffile "%ALLUSERSPROFILE%\\RiV-mesh\\mesh.conf" -logto "%ALLUSERSPROFILE%\\RiV-mesh\\mesh.log"'
Vital="yes" /> Vital="yes" />
<ServiceControl <ServiceControl
Id="MeshServiceControl" Id="MeshServiceControl"
Name="Mesh" Name="Mesh"
@ -251,7 +276,8 @@ cat > wix.xml << EOF
<Feature Id="MeshFeature" Title="Mesh" Level="1"> <Feature Id="MeshFeature" Title="Mesh" Level="1">
<ComponentRef Id="MainExecutable" /> <ComponentRef Id="MainExecutable" />
<ComponentRef Id="WebViewReslources" /> <ComponentRef Id="WebViewResources" />
<ComponentRef Id="AssetsResources" />
<ComponentRef Id="UIExecutable" /> <ComponentRef Id="UIExecutable" />
<ComponentRef Id="CtrlExecutable" /> <ComponentRef Id="CtrlExecutable" />
<ComponentRef Id="cmpDesktopShortcut" /> <ComponentRef Id="cmpDesktopShortcut" />
@ -298,13 +324,13 @@ cat > wix.xml << EOF
Name="RiV-mesh" Name="RiV-mesh"
Description="RiV-mesh is IoT E2E encrypted network" Description="RiV-mesh is IoT E2E encrypted network"
Directory="DesktopFolder" Directory="DesktopFolder"
Target="[MeshInstallFolder]mesh-ui.exe ui\index.html" Target="[MeshInstallFolder]mesh-ui.exe -ui\index.html"
WorkingDirectory="MeshInstallFolder"/> WorkingDirectory="MeshInstallFolder"/>
<RegistryValue Root="HKCU" Key="Software\RiV-chain\RiV-mesh" Name="installed" Type="integer" Value="1" KeyPath="yes" /> <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" <RegistryValue Id="MerAs.rst" Root="HKMU" Action="write"
Key="Software\Microsoft\Windows\CurrentVersion\Run" Key="Software\Microsoft\Windows\CurrentVersion\Run"
Name="RiV-mesh client" Name="RiV-mesh client"
Value="[MeshInstallFolder]mesh-ui.exe ui\index.html" Value="[MeshInstallFolder]mesh-ui.exe -ui\index.html"
Type="string" /> Type="string" />
<Condition>ASSISTANCE_START_VIA_REGISTRY</Condition> <Condition>ASSISTANCE_START_VIA_REGISTRY</Condition>
</Component> </Component>