mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-11-22 01:20:29 +00:00
Update build-msi.sh
This commit is contained in:
parent
45d6a1e6e5
commit
3b669a15ed
@ -11,7 +11,7 @@
|
|||||||
PKGARCH=$1
|
PKGARCH=$1
|
||||||
if [ "${PKGARCH}" == "" ];
|
if [ "${PKGARCH}" == "" ];
|
||||||
then
|
then
|
||||||
echo "tell me the architecture: x86 or x64"
|
echo "tell me the architecture: x86, x64 or arm"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -48,8 +48,10 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Build Yggdrasil!
|
# Build Yggdrasil!
|
||||||
[ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 ./build
|
[ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 ./build -p -l "-aslr"
|
||||||
[ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=0 ./build
|
[ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=0 ./build -p -l "-aslr"
|
||||||
|
[ "${PKGARCH}" == "arm" ] && GOOS=windows GOARCH=arm CGO_ENABLED=0 ./build -p -l "-aslr"
|
||||||
|
#[ "${PKGARCH}" == "arm64" ] && GOOS=windows GOARCH=arm64 CGO_ENABLED=0 ./build
|
||||||
|
|
||||||
# Create the postinstall script
|
# Create the postinstall script
|
||||||
cat > updateconfig.bat << EOF
|
cat > updateconfig.bat << EOF
|
||||||
@ -72,12 +74,16 @@ PKGVERSIONMS=$(echo $PKGVERSION | tr - .)
|
|||||||
PKGGUID="54a3294e-a441-4322-aefb-3bb40dd022bb" PKGINSTFOLDER="ProgramFilesFolder"
|
PKGGUID="54a3294e-a441-4322-aefb-3bb40dd022bb" PKGINSTFOLDER="ProgramFilesFolder"
|
||||||
|
|
||||||
# Download the Wintun driver
|
# Download the Wintun driver
|
||||||
|
curl -o wintun.zip https://www.wintun.net/builds/wintun-0.11.zip
|
||||||
|
unzip wintun.zip
|
||||||
if [ $PKGARCH = "x64" ]; then
|
if [ $PKGARCH = "x64" ]; then
|
||||||
PKGMSMNAME=wintun-x64.msm
|
PKGWINTUNDLL=wintun/bin/amd64/wintun.dll
|
||||||
curl -o ${PKGMSMNAME} https://www.wintun.net/builds/wintun-amd64-0.7.msm || (echo "couldn't get wintun"; exit 1)
|
|
||||||
elif [ $PKGARCH = "x86" ]; then
|
elif [ $PKGARCH = "x86" ]; then
|
||||||
PKGMSMNAME=wintun-x86.msm
|
PKGWINTUNDLL=wintun/bin/x86/wintun.dll
|
||||||
curl -o ${PKGMSMNAME} https://www.wintun.net/builds/wintun-x86-0.7.msm || (echo "couldn't get wintun"; exit 1)
|
elif [ $PKGARCH = "arm" ]; then
|
||||||
|
PKGWINTUNDLL=wintun/bin/arm/wintun.dll
|
||||||
|
#elif [ $PKGARCH = "arm64" ]; then
|
||||||
|
# PKGWINTUNDLL=wintun/bin/arm64/wintun.dll
|
||||||
else
|
else
|
||||||
echo "wasn't sure which architecture to get wintun for"
|
echo "wasn't sure which architecture to get wintun for"
|
||||||
exit 1
|
exit 1
|
||||||
@ -100,6 +106,7 @@ cat > wix.xml << EOF
|
|||||||
Language="1033"
|
Language="1033"
|
||||||
Codepage="1252"
|
Codepage="1252"
|
||||||
Version="${PKGVERSIONMS}"
|
Version="${PKGVERSIONMS}"
|
||||||
|
Platform="${PKGARCH}"
|
||||||
Manufacturer="github.com/yggdrasil-network">
|
Manufacturer="github.com/yggdrasil-network">
|
||||||
|
|
||||||
<Package
|
<Package
|
||||||
@ -136,6 +143,12 @@ cat > wix.xml << EOF
|
|||||||
Source="yggdrasil.exe"
|
Source="yggdrasil.exe"
|
||||||
KeyPath="yes" />
|
KeyPath="yes" />
|
||||||
|
|
||||||
|
<File
|
||||||
|
Id="Wintun"
|
||||||
|
Name="wintun.dll"
|
||||||
|
DiskId="1"
|
||||||
|
Source="${PKGWINTUNDLL}" />
|
||||||
|
|
||||||
<ServiceInstall
|
<ServiceInstall
|
||||||
Id="ServiceInstaller"
|
Id="ServiceInstaller"
|
||||||
Account="LocalSystem"
|
Account="LocalSystem"
|
||||||
@ -176,12 +189,6 @@ cat > wix.xml << EOF
|
|||||||
</Component>
|
</Component>
|
||||||
</Directory>
|
</Directory>
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
<Merge
|
|
||||||
Id="Wintun"
|
|
||||||
Language="0"
|
|
||||||
DiskId="1"
|
|
||||||
SourceFile="${PKGMSMNAME}" />
|
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
<Feature Id="YggdrasilFeature" Title="Yggdrasil" Level="1">
|
<Feature Id="YggdrasilFeature" Title="Yggdrasil" Level="1">
|
||||||
@ -190,13 +197,6 @@ cat > wix.xml << EOF
|
|||||||
<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"
|
||||||
|
Loading…
Reference in New Issue
Block a user