Fix for error CNDL0005 : The Component element contains an unexpected child element 'Directory'

This commit is contained in:
vadym 2022-11-30 19:45:11 +02:00
parent 1fe323149b
commit c0353d100b

View file

@ -161,6 +161,15 @@ cat > wix.xml << EOF
<Directory Id="CopyWebViewUIFolder" SourceName="SourceDir"/> <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" >
<Component Id="WebViewReslources" Guid="a4a5a50a-a336-4789-bf61-ca76fe217e3f">
<File
Id="WebViewHtmlFile"
Name="index.html"
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"
@ -195,15 +204,6 @@ cat > wix.xml << EOF
Stop="both" Stop="both"
Remove="uninstall" /> Remove="uninstall" />
</Component> </Component>
<Component Id="WebViewReslources" Guid="a4a5a50a-a336-4789-bf61-ca76fe217e3f">
<Directory Id="WebViewUIFolder" Name="ui" >
<File
Id="WebViewHtmlFile"
Name="index.html"
DiskId="1"
Source="${PKGWEBVIEWFILE}" />
</Directory>
</Component>
<Component Id="CtrlExecutable" Guid="a916b730-974d-42a1-b687-d9d504cbb86a"> <Component Id="CtrlExecutable" Guid="a916b730-974d-42a1-b687-d9d504cbb86a">
<File <File
Id="Meshctl" Id="Meshctl"