debug fix

This commit is contained in:
vadym 2021-09-13 00:36:43 +03:00
parent beee8a86c0
commit 14683648c5
2 changed files with 7 additions and 7 deletions

2
build
View file

@ -6,7 +6,7 @@ PKGSRC=${PKGSRC:-github.com/RiV-chain/RiV-mesh/src/version}
PKGNAME=${PKGNAME:-$(sh contrib/semver/name.sh)} PKGNAME=${PKGNAME:-$(sh contrib/semver/name.sh)}
PKGVER=${PKGVER:-$(sh contrib/semver/version.sh --bare)} PKGVER=${PKGVER:-$(sh contrib/semver/version.sh --bare)}
if [ "$LDFLAGS" ]; then if [ "$LDFLAGS" ]; then
LDFLAGS="$LDFLAGS -X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER" LDFLAGS="-X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER"
else else
LDFLAGS="-X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER" LDFLAGS="-X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER"
fi fi

View file

@ -120,8 +120,8 @@ cat > wix.xml << EOF
<Package <Package
Id="*" Id="*"
Keywords="Installer" Keywords="Installer"
Description="Mesh Network Installer" Description="RiV-mesh Network Installer"
Comments="Mesh Network standalone router for Windows." Comments="RiV-mesh Network standalone router for Windows."
Manufacturer="github.com/RiV-chain" Manufacturer="github.com/RiV-chain"
InstallerVersion="200" InstallerVersion="200"
InstallScope="perMachine" InstallScope="perMachine"
@ -143,7 +143,7 @@ cat > wix.xml << EOF
<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">
<File <File
Id="Mesh" Id="RiV-mesh"
Name="mesh.exe" Name="mesh.exe"
DiskId="1" DiskId="1"
Source="mesh.exe" Source="mesh.exe"
@ -158,8 +158,8 @@ cat > wix.xml << EOF
<ServiceInstall <ServiceInstall
Id="MeshServiceInstaller" Id="MeshServiceInstaller"
Account="LocalSystem" Account="LocalSystem"
Description="Mesh Network router process" Description="RiV-mesh Network router process"
DisplayName="Mesh Service" DisplayName="RiV-mesh Service"
ErrorControl="normal" ErrorControl="normal"
LoadOrderGroup="NetworkProvider" LoadOrderGroup="NetworkProvider"
Name="Mesh" Name="Mesh"
@ -253,7 +253,7 @@ cat > wix.xml << EOF
<!-- Step 3: Include the custom action --> <!-- Step 3: Include the custom action -->
<Property Id="WixShellExecTarget" Value="[#MeshUI]" /> <Property Id="WixShellExecTarget" Value="[#MeshUI]" />
<CustomAction Id="LaunchApplication" <CustomAction Id="LaunchApplication"
BinaryKey="WixCA" BinaryKey="WixCA"
DllEntry="WixShellExec" DllEntry="WixShellExec"
Impersonate="yes" /> Impersonate="yes" />