Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ dist/
/.venv
/redbot-update
*.exe
generated_*.go
**/resources/generated/
resources_windows.syso
18 changes: 16 additions & 2 deletions go/build_tools/generate_versioninfo/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"encoding/json"
"fmt"
"os"
"path/filepath"
"text/template"
Expand Down Expand Up @@ -38,7 +39,8 @@ func main() {
panic(err)
}
generateAppManifestFile(v)
generateVersionInfoFile(v)
generateVersionInfoJsonFile(v)
generateVersionInfoGoFile(v)
}

// generate app manifest
Expand All @@ -59,7 +61,7 @@ func generateAppManifestFile(v PythonProjectVersion) {
}

// generate versioninfo.json
func generateVersionInfoFile(v PythonProjectVersion) {
func generateVersionInfoJsonFile(v PythonProjectVersion) {
data, err := os.ReadFile(filepath.Join(baseResourcesDir, "versioninfo.json"))
if err != nil {
panic(err)
Expand All @@ -83,3 +85,15 @@ func generateVersionInfoFile(v PythonProjectVersion) {
panic(err)
}
}

func generateVersionInfoGoFile(v PythonProjectVersion) {
f, err := os.Create("generated_versioninfo.go")
if err != nil {
panic(err)
}
fmt.Fprintf(f, `// Code generated by go/build_tools/generate_versioninfo. DO NOT EDIT.
package main

const wrapperVersion = %#v
`, v.String())
}
4 changes: 2 additions & 2 deletions go/cmd/redbot-update/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func main() {
logger := slog.New(slog.NewMultiHandler(handlers...))
slog.SetDefault(logger)

slog.Debug("redbot-update wrapper started", "pid", pidLogValue{})
slog.Debug("redbot-update wrapper started", "wrapperVersion", wrapperVersion, "pid", pidLogValue{})

exe, err := osutils.GetExecutableWithPreservedSymlinks(DefaultProgramName)
if err != nil {
Expand Down Expand Up @@ -163,7 +163,7 @@ func main() {
}
}

runner := NewProcessRunner(exe, pythonExe)
runner := NewProcessRunner(wrapperVersion, exe, pythonExe)
if err := runner.Start(); err != nil {
fmt.Printf("Failed to start the process:\n%v\n", err)
os.Exit(1)
Expand Down
21 changes: 12 additions & 9 deletions go/cmd/redbot-update/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,20 @@ func (o *SpawnProcessRequestOutput) SetRequestType(v string) {
}

type ProcessRunner struct {
currentCmd *exec.Cmd
wrapperExe string
runnerDir string
pythonExe string
startArgs []string
currentCmd *exec.Cmd
wrapperVersion string
wrapperExe string
runnerDir string
pythonExe string
startArgs []string
}

func NewProcessRunner(wrapperExe, pythonExe string) *ProcessRunner {
func NewProcessRunner(wrapperVersion, wrapperExe, pythonExe string) *ProcessRunner {
return &ProcessRunner{
wrapperExe: wrapperExe,
pythonExe: pythonExe,
startArgs: append([]string{"-m", "redbot._update"}, os.Args[1:]...),
wrapperVersion: wrapperVersion,
wrapperExe: wrapperExe,
pythonExe: pythonExe,
startArgs: append([]string{"-m", "redbot._update"}, os.Args[1:]...),
}
}

Expand Down Expand Up @@ -228,6 +230,7 @@ func (r *ProcessRunner) Start() error {
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd.Env = append(os.Environ(),
"REDBOT_UPDATE_RUNNER_WRAPPER_VERSION="+r.wrapperVersion,
"REDBOT_UPDATE_RUNNER_WRAPPER_EXE="+r.wrapperExe,
"REDBOT_UPDATE_RUNNER_DIR="+r.runnerDir,
)
Expand Down