Browse Source

Setup for release builds

tags/v2.0.0
NGnius (Graham) 4 years ago
parent
commit
b75161e0b1
4 changed files with 39 additions and 8 deletions
  1. +1
    -1
      rxsm/go.mod
  2. +2
    -0
      rxsm/go.sum
  3. +6
    -7
      rxsm/rxsm.go
  4. +30
    -0
      scripts/docker-build-win.sh

+ 1
- 1
rxsm/go.mod View File

@@ -7,7 +7,7 @@ require (
github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f // indirect
github.com/stretchr/testify v1.4.0 // indirect
github.com/therecipe/qt v0.0.0-20190914193131-4c875570321e
github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20190914193131-4c875570321e // indirect
github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20190924211142-521980c88788 // indirect
golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 // indirect
golang.org/x/net v0.0.0-20190916140828-c8589233b77d // indirect
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3 // indirect


+ 2
- 0
rxsm/go.sum View File

@@ -56,6 +56,8 @@ github.com/therecipe/qt v0.0.0-20190914193131-4c875570321e h1:ralwiYe77HLSNZzbnn
github.com/therecipe/qt v0.0.0-20190914193131-4c875570321e/go.mod h1:SUUR2j3aE1z6/g76SdD6NwACEpvCxb3fvG82eKbD6us=
github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20190914193131-4c875570321e h1:Bl9W/h6HkObONpu3jsL9jmrPQMhB0+fmuXApSJEmDuc=
github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20190914193131-4c875570321e/go.mod h1:mH55Ek7AZcdns5KPp99O0bg+78el64YCYWHiQKrOdt4=
github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20190924211142-521980c88788 h1:FfkdQ1ypwbc96fnOoO09/f1Sl1rn+GVlj5X2KXlMv8w=
github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20190924211142-521980c88788/go.mod h1:mH55Ek7AZcdns5KPp99O0bg+78el64YCYWHiQKrOdt4=
github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=


+ 6
- 7
rxsm/rxsm.go View File

@@ -10,12 +10,11 @@ import (
"runtime"
"strconv"
"archive/zip"
"syscall"
)
const (
RXSMVersion string = "v2.0.0"
RXSMPlatformStream string = "test"
RXSMPlatformStream string = "release"
UpdateSteps int = 2
DownloadTempFile = "rxsm-update.zip"
)
@@ -74,12 +73,12 @@ func main() {
exitVal = 0
}
if IsUpdating {
pid, forkErr := installRXSMUpdate()
process, forkErr := installRXSMUpdate()
if forkErr != nil {
log.Println("Install failed")
log.Println(forkErr)
} else {
log.Println("Forked install binary to", pid)
log.Println("Forked install binary to pid", process.Pid)
}
}
log.Println("rxsm terminated")
@@ -198,10 +197,10 @@ func downloadRXSMUpdate(statusCallback func(progress int, description string)) {
IsUpdating = true
}
func installRXSMUpdate() (pid int, err error) {
func installRXSMUpdate() (process *os.Process, err error) {
if runtime.GOOS == "windows" {
return syscall.ForkExec("./rxsm-updater.exe", []string{".\\rxsm-updater.exe", "--wait", "1s", "--log", "--zip", DownloadTempFile}, nil)
return os.StartProcess(".\\rxsm-updater.exe", []string{".\\rxsm-updater.exe", "--wait", "1s", "--log", "--zip", DownloadTempFile}, nil)
} else {
return syscall.ForkExec("./rxsm-updater", []string{"./rxsm-updater", "--wait", "1s", "--log", "--zip", DownloadTempFile}, nil)
return os.StartProcess("./rxsm-updater", []string{"./rxsm-updater", "--wait", "1s", "--log", "--zip", DownloadTempFile}, nil)
}
}

+ 30
- 0
scripts/docker-build-win.sh View File

@@ -0,0 +1,30 @@
#!/bin/bash
rm -rf ./rxsm/deploy/windows
cd ./rxsm
$(go env GOPATH)/bin/qtdeploy -docker build windows_64_shared
if [ $? -ne 0 ]
then
exit $?
fi
# linux folder removal (patch)
if [ -d ./windows ]
then
rmdir ./windows
fi
rm -f moc* # auto generated files
mkdir ./deploy/windows/default_save
cd ..
# build auto-updater binary
cd ./rxsm-updater/rxsm-updater
GOOS=windows GOARCH=amd64 go build
cd ../..
cp ./rxsm-updater/rxsm-updater/rxsm-updater.exe ./rxsm/deploy/windows/rxsm-updater.exe
# copy resource files
cp ./resources/default_save/** ./rxsm/deploy/windows/default_save
mkdir ./rxsm/deploy/windows/icons
cp ./resources/exmods-icons/assets/*.svg ./rxsm/deploy/windows/icons
cp ./resources/exmods-icons/logos/rxsm-dual.svg ./rxsm/deploy/windows/icon.svg
cp ./resources/exmods-icons/logos/rxsm-dual-notext.svg ./rxsm/deploy/windows/icon-min.svg
cp ./resources/exmods-icons/assets/gear.svg ./rxsm/deploy/windows/settings.svg
cp README.md ./rxsm/deploy/windows/INFO.md
exit 0