cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-10 02:50:27 +00:00
Code Releases Activity

Merge pull request #634 from yggdrasil-network/moremsifixes

Browse Source 
MSI bugfixes
This commit is contained in:
Neil Alexander 2019-12-10 11:44:06 +00:00 committed by GitHub
commit b1bd84540f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
contrib/msi/build-msi.sh
View File

@ -83,12 +83,18 @@ else
exit 1 exit 1
fi fi
if [ $PKGNAME != "master" ]; then
PKGDISPLAYNAME="Yggdrasil Network (${PKGNAME} branch)"
else
PKGDISPLAYNAME="Yggdrasil Network"
fi
# Generate the wix.xml file # Generate the wix.xml file
cat > wix.xml << EOF cat > wix.xml << EOF
<?xml version="1.0" encoding="windows-1252"?> <?xml version="1.0" encoding="windows-1252"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product <Product
Name="Yggdrasil (${PKGNAME} branch)" Name="${PKGDISPLAYNAME}"
Id="*" Id="*"
UpgradeCode="${PKGGUID}" UpgradeCode="${PKGGUID}"
Language="1033" Language="1033"
@ -100,7 +106,7 @@ cat > wix.xml << EOF
Id="*" Id="*"
Keywords="Installer" Keywords="Installer"
Description="Yggdrasil Network Installer" Description="Yggdrasil Network Installer"
Comments="This is the Yggdrasil Network router for Windows." Comments="Yggdrasil Network standalone router for Windows."
Manufacturer="github.com/yggdrasil-network" Manufacturer="github.com/yggdrasil-network"
InstallerVersion="200" InstallerVersion="200"
InstallScope="perMachine" InstallScope="perMachine"
@ -115,7 +121,8 @@ cat > wix.xml << EOF
<Media <Media
Id="1" Id="1"
Cabinet="Media.cab" Cabinet="Media.cab"
EmbedCab="yes" /> EmbedCab="yes"
CompressionLevel="high" />
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="${PKGINSTFOLDER}" Name="PFiles"> <Directory Id="${PKGINSTFOLDER}" Name="PFiles">
@ -177,13 +184,19 @@ cat > wix.xml << EOF
SourceFile="${PKGMSMNAME}" /> SourceFile="${PKGMSMNAME}" />
</Directory> </Directory>
<Feature Id="Complete" Level="1"> <Feature Id="YggdrasilFeature" Title="Yggdrasil" Level="1">
<MergeRef Id="Wintun" />
<ComponentRef Id="MainExecutable" /> <ComponentRef Id="MainExecutable" />
<ComponentRef Id="CtrlExecutable" /> <ComponentRef Id="CtrlExecutable" />
<ComponentRef Id="ConfigScript" /> <ComponentRef Id="ConfigScript" />
</Feature> </Feature>
<Feature Id="WintunFeature" Title="Wintun" Level="1">
<Condition Level="0">
UPGRADINGPRODUCTCODE
</Condition>
<MergeRef Id="Wintun" />
</Feature>
<CustomAction <CustomAction
Id="UpdateGenerateConfig" Id="UpdateGenerateConfig"
Directory="YggdrasilInstallFolder" Directory="YggdrasilInstallFolder"