This commit is contained in:
vadym 2022-12-20 09:59:12 +02:00
parent 0bfa83f019
commit 0689c2019e

View file

@ -157,8 +157,6 @@ cat > wix.xml << EOF
<Property Id="ARPPRODUCTICON" Value="icon.ico" /> <Property Id="ARPPRODUCTICON" Value="icon.ico" />
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="DesktopFolder" SourceName="Desktop"/>
<Directory Id="SystemFolder" Name="SystemFolder" />
<Directory Id="${PKGINSTFOLDER}" Name="PFiles"> <Directory Id="${PKGINSTFOLDER}" Name="PFiles">
<Directory Id="MeshInstallFolder" Name="RiV-mesh"> <Directory Id="MeshInstallFolder" Name="RiV-mesh">
<Component Id="MainExecutable" Guid="c2119231-2aa3-4962-867a-9759c87beb24"> <Component Id="MainExecutable" Guid="c2119231-2aa3-4962-867a-9759c87beb24">
@ -229,6 +227,11 @@ cat > wix.xml << EOF
KeyPath="yes"/> KeyPath="yes"/>
</Component> </Component>
</Directory> </Directory>
</Directory>
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="RiV-mesh"/>
<Directory Id="DesktopFolder" Name="Desktop"/>
<Directory Id="StartupFolder" Name="Startup"/>
</Directory> </Directory>
</Directory> </Directory>
@ -261,27 +264,27 @@ cat > wix.xml << EOF
<Property Id="ASSISTANCE_START_VIA_REGISTRY">1</Property> <Property Id="ASSISTANCE_START_VIA_REGISTRY">1</Property>
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom <CustomSystemFolder
Action="UpdateGenerateConfig" Action="UpdateGenerateConfig"
Before="StartServices"> Before="StartServices">
NOT Installed AND NOT REMOVE NOT Installed AND NOT REMOVE
</Custom> </Custom>
</InstallExecuteSequence> </InstallExecuteSequence>
<DirectoryRef Id="MeshInstallFolder"> <DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="cmpDesktopShortcut" Guid="e32e4d07-abf8-4c37-a2c3-1ca4b4f98adc" > <Component Id="ApplicationShortcut" Guid="e32e4d07-abf8-4c37-a2c3-1ca4b4f98adc" >
<Shortcut Id="RiVMeshDesktopShortcut"
Name="RiV-mesh"
Description="RiV-mesh is IoT E2E encrypted network"
Directory="DesktopFolder"
Target="cscript.exe"
Arguments="[MeshInstallFolder]mesh-ui-ie.js"
WorkingDirectory="MeshInstallFolder"/>
<Shortcut Id="ApplicationStartMenuShortcut" <Shortcut Id="ApplicationStartMenuShortcut"
Name="RiV-mesh" Name="RiV-mesh"
Description="RiV-mesh is IoT E2E encrypted network" Description="RiV-mesh is IoT E2E encrypted network"
Target="cscript.exe" Target="cscript.exe"
Arguments="[MeshInstallFolder]mesh-ui-ie.js" Arguments="[MeshInstallFolder]mesh-ui-ie.js"
WorkingDirectory="MeshInstallFolder"/> WorkingDirectory="MeshInstallFolder"/>
<Shortcut Id="DesktopShortcut"
Name="RiV-mesh"
Description="RiV-mesh is IoT E2E encrypted network"
Directory="DesktopFolder"
Target="cscript.exe"
Arguments="[MeshInstallFolder]mesh-ui-ie.js"
WorkingDirectory="MeshInstallFolder"/>
<RemoveFolder Id="MeshInstallFolder" On="uninstall"/> <RemoveFolder Id="MeshInstallFolder" On="uninstall"/>
<RegistryValue Root="HKCU" <RegistryValue Root="HKCU"
Key="Software\RiV-chain\RiV-mesh" Key="Software\RiV-chain\RiV-mesh"
@ -302,7 +305,7 @@ cat > wix.xml << EOF
<ComponentRef Id="MainExecutable" /> <ComponentRef Id="MainExecutable" />
<ComponentRef Id="UIExecutable" /> <ComponentRef Id="UIExecutable" />
<ComponentRef Id="CtrlExecutable" /> <ComponentRef Id="CtrlExecutable" />
<ComponentRef Id="cmpDesktopShortcut" /> <ComponentRef Id="ApplicationShortcut" />
<ComponentRef Id="ConfigScript" /> <ComponentRef Id="ConfigScript" />
</Feature> </Feature>
</Product> </Product>