From f540f269306a6cc66f8f009afde38acea22f22ee Mon Sep 17 00:00:00 2001 From: vadym Date: Wed, 24 Mar 2021 23:41:09 +0200 Subject: [PATCH 1/3] 1. corrected MSI build script --- contrib/msi/build-msi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 contrib/msi/build-msi.sh diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh old mode 100644 new mode 100755 index 57d4e81d..776ad1ce --- a/contrib/msi/build-msi.sh +++ b/contrib/msi/build-msi.sh @@ -27,9 +27,9 @@ then fi # Build Yggdrasil! -[ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 ./build -p -l "-aslr" -[ "${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}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 ./build +[ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=0 ./build +[ "${PKGARCH}" == "arm" ] && GOOS=windows GOARCH=arm CGO_ENABLED=0 ./build #[ "${PKGARCH}" == "arm64" ] && GOOS=windows GOARCH=arm64 CGO_ENABLED=0 ./build # Create the postinstall script From c6ceac432b031aaf15646c51348400db0002e5d5 Mon Sep 17 00:00:00 2001 From: vadym Date: Thu, 25 Mar 2021 12:57:22 +0200 Subject: [PATCH 2/3] Revert "1. corrected MSI build script" This reverts commit 3d9184866ca1c7f0b023a7a5417c8e92478f9f97. --- contrib/msi/build-msi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 contrib/msi/build-msi.sh diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh old mode 100755 new mode 100644 index 776ad1ce..57d4e81d --- a/contrib/msi/build-msi.sh +++ b/contrib/msi/build-msi.sh @@ -27,9 +27,9 @@ then fi # Build Yggdrasil! -[ "${PKGARCH}" == "x64" ] && GOOS=windows GOARCH=amd64 CGO_ENABLED=0 ./build -[ "${PKGARCH}" == "x86" ] && GOOS=windows GOARCH=386 CGO_ENABLED=0 ./build -[ "${PKGARCH}" == "arm" ] && GOOS=windows GOARCH=arm 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 -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 From 4e2eb53efacc5d49059c24db68eb570c968acb5d Mon Sep 17 00:00:00 2001 From: Vadym Vikulin Date: Wed, 24 Mar 2021 23:48:06 +0200 Subject: [PATCH 3/3] Update README.md --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d1d254a6..fd1546a2 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,16 @@ packages: 1. Install [Go](https://golang.org) (requires Go 1.16 or later) 2. Clone this repository -2. Run `./build` +3. Run `./build` Note that you can cross-compile for other platforms and architectures by specifying the `GOOS` and `GOARCH` environment variables, e.g. `GOOS=windows -./build` or `GOOS=linux GOARCH=mipsle ./build`. +./build` or `GOOS=linux GOARCH=mipsle ./build`. MSI build for 32/64bit platforms +can be done by following command: + +``` +PKGNAME=master PKGVERSION=0.3.16 contrib/msi/build-msi.sh x64 +``` ## Running