Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/db.go +8 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/rows.go +13 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/loader/loader.go +23 -5 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/ports/in/ports_gen.go +3 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +51 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +53 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +20 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +21 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +120 -118 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +17 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +40 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +41 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +19 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +42 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmonitor.go +27 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpaintable.go +63 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +47 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +19 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +11 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksnapshot.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksurface.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktexture.go +27 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevel.go +157 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevellayout.go +24 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevelsize.go +9 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktypes.go +95 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkvulkancontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-animation.go +26 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-core.go +9 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-io.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-loader.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-transform.go +11 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf.go +102 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/main.go +5 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gaction.go +59 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactiongroup.go +96 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactionmap.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gappinfo.go +244 -116 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplication.go +79 -55 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplicationcommandline.go +31 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncinitable.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncresult.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedinputstream.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedoutputstream.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbytesicon.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcancellable.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcharsetconverter.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcontenttype.go +30 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverter.go +23 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverterinputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverteroutputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcredentials.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatagrambased.go +45 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatainputstream.go +31 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdataoutputstream.go +14 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusactiongroup.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusaddress.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusauthobserver.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusconnection.go +77 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbuserror.go +16 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterface.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterfaceskeleton.go +25 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusintrospection.go +54 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmenumodel.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmessage.go +88 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmethodinvocation.go +35 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnameowning.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnamewatching.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobject.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanager.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerclient.go +16 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerserver.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectproxy.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectskeleton.go +12 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusproxy.go +42 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusserver.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusutils.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontroller.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontrollerdbus.go +4 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdrive.go +214 -82 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsclientconnection.go +34 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsconnection.go +207 -80 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsserverconnection.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblem.go +6 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblemedicon.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfile.go +1148 -450 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileattribute.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileenumerator.go +34 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileicon.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinfo.go +138 -84 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinputstream.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileiostream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilemonitor.go +9 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilenamecompleter.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileoutputstream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilterinputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilteroutputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gicon.go +32 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddress.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddressmask.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetsocketaddress.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginitable.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginputstream.go +52 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioenums.go +90 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioerror.go +6 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giomodule.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioscheduler.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giostream.go +25 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giotypes.go +70 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giptosmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gipv6tclassmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/glistmodel.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gliststore.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gloadableicon.go +27 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryinputstream.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemorymonitor.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryoutputstream.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenu.go +62 -50 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenumodel.go +31 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmount.go +215 -86 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmountoperation.go +40 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativesocketaddress.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativevolumemonitor.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkaddress.go +11 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworking.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkmonitor.go +49 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkservice.go +12 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnotification.go +26 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/goutputstream.go +86 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpermission.go +33 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableinputstream.go +30 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableoutputstream.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableutils.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpowerprofilemonitor.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpropertyaction.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxy.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddress.go +16 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddressenumerator.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyresolver.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gremoteactiongroup.go +12 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresolver.go +75 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresource.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gseekable.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettings.go +99 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsbackend.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsschema.go +48 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleaction.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleactiongroup.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleasyncresult.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleiostream.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimplepermission.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleproxyresolver.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocket.go +87 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddress.go +11 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddressenumerator.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketclient.go +54 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnectable.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnection.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketcontrolmessage.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketlistener.go +18 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketservice.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsrvtarget.go +2 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocess.go +40 -39
| @@ -4,7 +4,6 @@ package gio | |||
| 4 | 4 | import ( | |
| 5 | 5 | "unsafe" | |
| 6 | 6 | ||
| 7 | - | "github.com/bnema/purego" | |
| 8 | 7 | "github.com/bnema/puregotk/pkg/core" | |
| 9 | 8 | "github.com/bnema/puregotk/v4/glib" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -81,6 +80,7 @@ type Subprocess struct { | |||
| 81 | 80 | var xSubprocessGLibType func() types.GType | |
| 82 | 81 | ||
| 83 | 82 | func SubprocessGLibType() types.GType { | |
| 83 | + | core.LazyRegister(&xSubprocessGLibType, "GIO", "g_subprocess_get_type", false) | |
| 84 | 84 | return xSubprocessGLibType() | |
| 85 | 85 | } | |
| 86 | 86 | ||
| @@ -100,6 +100,7 @@ var xNewSubprocess func(SubprocessFlags, **glib.Error, string, ...interface{}) u | |||
| 100 | 100 | // | |
| 101 | 101 | // The argument list must be terminated with %NULL. | |
| 102 | 102 | func NewSubprocess(FlagsVar SubprocessFlags, ErrorVar **glib.Error, Argv0Var string, varArgs ...interface{}) *Subprocess { | |
| 103 | + | core.LazyRegister(&xNewSubprocess, "GIO", "g_subprocess_new", false) | |
| 103 | 104 | var cls *Subprocess | |
| 104 | 105 | ||
| 105 | 106 | cret := xNewSubprocess(FlagsVar, ErrorVar, Argv0Var, varArgs...) | |
| @@ -118,6 +119,7 @@ var xNewSubprocessv func([]string, SubprocessFlags, **glib.Error) uintptr | |||
| 118 | 119 | // | |
| 119 | 120 | // The argument list is expected to be %NULL-terminated. | |
| 120 | 121 | func NewSubprocessv(ArgvVar []string, FlagsVar SubprocessFlags) (*Subprocess, error) { | |
| 122 | + | core.LazyRegister(&xNewSubprocessv, "GIO", "g_subprocess_newv", false) | |
| 121 | 123 | var cls *Subprocess | |
| 122 | 124 | var cerr *glib.Error | |
| 123 | 125 | ||
| @@ -178,6 +180,7 @@ var xSubprocessCommunicate func(uintptr, *glib.Bytes, uintptr, **glib.Bytes, **g | |||
| 178 | 180 | // attempt to interact with the pipes while the operation is in progress | |
| 179 | 181 | // (either from another thread or if using the asynchronous version). | |
| 180 | 182 | func (x *Subprocess) Communicate(StdinBufVar *glib.Bytes, CancellableVar *Cancellable, StdoutBufVar **glib.Bytes, StderrBufVar **glib.Bytes) (bool, error) { | |
| 183 | + | core.LazyRegister(&xSubprocessCommunicate, "GIO", "g_subprocess_communicate", false) | |
| 181 | 184 | var cerr *glib.Error | |
| 182 | 185 | ||
| 183 | 186 | cret := xSubprocessCommunicate(x.GoPointer(), StdinBufVar, CancellableVar.GoPointer(), StdoutBufVar, StderrBufVar, &cerr) | |
| @@ -192,6 +195,8 @@ var xSubprocessCommunicateAsync func(uintptr, *glib.Bytes, uintptr, uintptr, uin | |||
| 192 | 195 | // Asynchronous version of g_subprocess_communicate(). Complete | |
| 193 | 196 | // invocation with g_subprocess_communicate_finish(). | |
| 194 | 197 | func (x *Subprocess) CommunicateAsync(StdinBufVar *glib.Bytes, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 198 | + | core.LazyRegister(&xSubprocessCommunicateAsync, "GIO", "g_subprocess_communicate_async", false) | |
| 199 | + | ||
| 195 | 200 | xSubprocessCommunicateAsync(x.GoPointer(), StdinBufVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 196 | 201 | } | |
| 197 | 202 | ||
| @@ -199,6 +204,7 @@ var xSubprocessCommunicateFinish func(uintptr, uintptr, **glib.Bytes, **glib.Byt | |||
| 199 | 204 | ||
| 200 | 205 | // Complete an invocation of g_subprocess_communicate_async(). | |
| 201 | 206 | func (x *Subprocess) CommunicateFinish(ResultVar AsyncResult, StdoutBufVar **glib.Bytes, StderrBufVar **glib.Bytes) (bool, error) { | |
| 207 | + | core.LazyRegister(&xSubprocessCommunicateFinish, "GIO", "g_subprocess_communicate_finish", false) | |
| 202 | 208 | var cerr *glib.Error | |
| 203 | 209 | ||
| 204 | 210 | cret := xSubprocessCommunicateFinish(x.GoPointer(), ResultVar.GoPointer(), StdoutBufVar, StderrBufVar, &cerr) | |
| @@ -216,6 +222,7 @@ var xSubprocessCommunicateUtf8 func(uintptr, uintptr, uintptr, *string, *string, | |||
| 216 | 222 | // On error, @stdout_buf and @stderr_buf will be set to undefined values and | |
| 217 | 223 | // should not be used. | |
| 218 | 224 | func (x *Subprocess) CommunicateUtf8(StdinBufVar *string, CancellableVar *Cancellable, StdoutBufVar *string, StderrBufVar *string) (bool, error) { | |
| 225 | + | core.LazyRegister(&xSubprocessCommunicateUtf8, "GIO", "g_subprocess_communicate_utf8", false) | |
| 219 | 226 | var cerr *glib.Error | |
| 220 | 227 | ||
| 221 | 228 | StdinBufVarPtr := core.GStrdupNullable(StdinBufVar) | |
| @@ -233,6 +240,8 @@ var xSubprocessCommunicateUtf8Async func(uintptr, uintptr, uintptr, uintptr, uin | |||
| 233 | 240 | // Asynchronous version of g_subprocess_communicate_utf8(). Complete | |
| 234 | 241 | // invocation with g_subprocess_communicate_utf8_finish(). | |
| 235 | 242 | func (x *Subprocess) CommunicateUtf8Async(StdinBufVar *string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 243 | + | core.LazyRegister(&xSubprocessCommunicateUtf8Async, "GIO", "g_subprocess_communicate_utf8_async", false) | |
| 244 | + | ||
| 236 | 245 | StdinBufVarPtr := core.GStrdupNullable(StdinBufVar) | |
| 237 | 246 | defer core.GFreeNullable(StdinBufVarPtr) | |
| 238 | 247 | ||
| @@ -243,6 +252,7 @@ var xSubprocessCommunicateUtf8Finish func(uintptr, uintptr, *string, *string, ** | |||
| 243 | 252 | ||
| 244 | 253 | // Complete an invocation of g_subprocess_communicate_utf8_async(). | |
| 245 | 254 | func (x *Subprocess) CommunicateUtf8Finish(ResultVar AsyncResult, StdoutBufVar *string, StderrBufVar *string) (bool, error) { | |
| 255 | + | core.LazyRegister(&xSubprocessCommunicateUtf8Finish, "GIO", "g_subprocess_communicate_utf8_finish", false) | |
| 246 | 256 | var cerr *glib.Error | |
| 247 | 257 | ||
| 248 | 258 | cret := xSubprocessCommunicateUtf8Finish(x.GoPointer(), ResultVar.GoPointer(), StdoutBufVar, StderrBufVar, &cerr) | |
| @@ -262,6 +272,8 @@ var xSubprocessForceExit func(uintptr) | |||
| 262 | 272 | // | |
| 263 | 273 | // On Unix, this function sends %SIGKILL. | |
| 264 | 274 | func (x *Subprocess) ForceExit() { | |
| 275 | + | core.LazyRegister(&xSubprocessForceExit, "GIO", "g_subprocess_force_exit", false) | |
| 276 | + | ||
| 265 | 277 | xSubprocessForceExit(x.GoPointer()) | |
| 266 | 278 | } | |
| 267 | 279 | ||
| @@ -276,6 +288,8 @@ var xSubprocessGetExitStatus func(uintptr) int | |||
| 276 | 288 | // It is an error to call this function before g_subprocess_wait() and | |
| 277 | 289 | // unless g_subprocess_get_if_exited() returned %TRUE. | |
| 278 | 290 | func (x *Subprocess) GetExitStatus() int { | |
| 291 | + | core.LazyRegister(&xSubprocessGetExitStatus, "GIO", "g_subprocess_get_exit_status", false) | |
| 292 | + | ||
| 279 | 293 | cret := xSubprocessGetExitStatus(x.GoPointer()) | |
| 280 | 294 | return cret | |
| 281 | 295 | } | |
| @@ -286,6 +300,8 @@ var xSubprocessGetIdentifier func(uintptr) string | |||
| 286 | 300 | // On Windows, returns the result of GetProcessId() also as a string. | |
| 287 | 301 | // If the subprocess has terminated, this will return %NULL. | |
| 288 | 302 | func (x *Subprocess) GetIdentifier() string { | |
| 303 | + | core.LazyRegister(&xSubprocessGetIdentifier, "GIO", "g_subprocess_get_identifier", false) | |
| 304 | + | ||
| 289 | 305 | cret := xSubprocessGetIdentifier(x.GoPointer()) | |
| 290 | 306 | return cret | |
| 291 | 307 | } | |
| @@ -300,6 +316,8 @@ var xSubprocessGetIfExited func(uintptr) bool | |||
| 300 | 316 | // It is an error to call this function before g_subprocess_wait() has | |
| 301 | 317 | // returned. | |
| 302 | 318 | func (x *Subprocess) GetIfExited() bool { | |
| 319 | + | core.LazyRegister(&xSubprocessGetIfExited, "GIO", "g_subprocess_get_if_exited", false) | |
| 320 | + | ||
| 303 | 321 | cret := xSubprocessGetIfExited(x.GoPointer()) | |
| 304 | 322 | return cret | |
| 305 | 323 | } | |
| @@ -313,6 +331,8 @@ var xSubprocessGetIfSignaled func(uintptr) bool | |||
| 313 | 331 | // It is an error to call this function before g_subprocess_wait() has | |
| 314 | 332 | // returned. | |
| 315 | 333 | func (x *Subprocess) GetIfSignaled() bool { | |
| 334 | + | core.LazyRegister(&xSubprocessGetIfSignaled, "GIO", "g_subprocess_get_if_signaled", false) | |
| 335 | + | ||
| 316 | 336 | cret := xSubprocessGetIfSignaled(x.GoPointer()) | |
| 317 | 337 | return cret | |
| 318 | 338 | } | |
| @@ -331,6 +351,8 @@ var xSubprocessGetStatus func(uintptr) int | |||
| 331 | 351 | // It is an error to call this function before g_subprocess_wait() has | |
| 332 | 352 | // returned. | |
| 333 | 353 | func (x *Subprocess) GetStatus() int { | |
| 354 | + | core.LazyRegister(&xSubprocessGetStatus, "GIO", "g_subprocess_get_status", false) | |
| 355 | + | ||
| 334 | 356 | cret := xSubprocessGetStatus(x.GoPointer()) | |
| 335 | 357 | return cret | |
| 336 | 358 | } | |
| @@ -343,6 +365,7 @@ var xSubprocessGetStderrPipe func(uintptr) uintptr | |||
| 343 | 365 | // The process must have been created with %G_SUBPROCESS_FLAGS_STDERR_PIPE, | |
| 344 | 366 | // otherwise %NULL will be returned. | |
| 345 | 367 | func (x *Subprocess) GetStderrPipe() *InputStream { | |
| 368 | + | core.LazyRegister(&xSubprocessGetStderrPipe, "GIO", "g_subprocess_get_stderr_pipe", false) | |
| 346 | 369 | var cls *InputStream | |
| 347 | 370 | ||
| 348 | 371 | cret := xSubprocessGetStderrPipe(x.GoPointer()) | |
| @@ -364,6 +387,7 @@ var xSubprocessGetStdinPipe func(uintptr) uintptr | |||
| 364 | 387 | // The process must have been created with %G_SUBPROCESS_FLAGS_STDIN_PIPE and | |
| 365 | 388 | // not %G_SUBPROCESS_FLAGS_STDIN_INHERIT, otherwise %NULL will be returned. | |
| 366 | 389 | func (x *Subprocess) GetStdinPipe() *OutputStream { | |
| 390 | + | core.LazyRegister(&xSubprocessGetStdinPipe, "GIO", "g_subprocess_get_stdin_pipe", false) | |
| 367 | 391 | var cls *OutputStream | |
| 368 | 392 | ||
| 369 | 393 | cret := xSubprocessGetStdinPipe(x.GoPointer()) | |
| @@ -385,6 +409,7 @@ var xSubprocessGetStdoutPipe func(uintptr) uintptr | |||
| 385 | 409 | // The process must have been created with %G_SUBPROCESS_FLAGS_STDOUT_PIPE, | |
| 386 | 410 | // otherwise %NULL will be returned. | |
| 387 | 411 | func (x *Subprocess) GetStdoutPipe() *InputStream { | |
| 412 | + | core.LazyRegister(&xSubprocessGetStdoutPipe, "GIO", "g_subprocess_get_stdout_pipe", false) | |
| 388 | 413 | var cls *InputStream | |
| 389 | 414 | ||
| 390 | 415 | cret := xSubprocessGetStdoutPipe(x.GoPointer()) | |
| @@ -407,6 +432,8 @@ var xSubprocessGetSuccessful func(uintptr) bool | |||
| 407 | 432 | // It is an error to call this function before g_subprocess_wait() has | |
| 408 | 433 | // returned. | |
| 409 | 434 | func (x *Subprocess) GetSuccessful() bool { | |
| 435 | + | core.LazyRegister(&xSubprocessGetSuccessful, "GIO", "g_subprocess_get_successful", false) | |
| 436 | + | ||
| 410 | 437 | cret := xSubprocessGetSuccessful(x.GoPointer()) | |
| 411 | 438 | return cret | |
| 412 | 439 | } | |
| @@ -421,6 +448,8 @@ var xSubprocessGetTermSig func(uintptr) int | |||
| 421 | 448 | // It is an error to call this function before g_subprocess_wait() and | |
| 422 | 449 | // unless g_subprocess_get_if_signaled() returned %TRUE. | |
| 423 | 450 | func (x *Subprocess) GetTermSig() int { | |
| 451 | + | core.LazyRegister(&xSubprocessGetTermSig, "GIO", "g_subprocess_get_term_sig", false) | |
| 452 | + | ||
| 424 | 453 | cret := xSubprocessGetTermSig(x.GoPointer()) | |
| 425 | 454 | return cret | |
| 426 | 455 | } | |
| @@ -435,6 +464,8 @@ var xSubprocessSendSignal func(uintptr, int) | |||
| 435 | 464 | // | |
| 436 | 465 | // This API is not available on Windows. | |
| 437 | 466 | func (x *Subprocess) SendSignal(SignalNumVar int) { | |
| 467 | + | core.LazyRegister(&xSubprocessSendSignal, "GIO", "g_subprocess_send_signal", false) | |
| 468 | + | ||
| 438 | 469 | xSubprocessSendSignal(x.GoPointer(), SignalNumVar) | |
| 439 | 470 | } | |
| 440 | 471 | ||
| @@ -452,6 +483,7 @@ var xSubprocessWait func(uintptr, uintptr, **glib.Error) bool | |||
| 452 | 483 | // Cancelling @cancellable doesn't kill the subprocess. Call | |
| 453 | 484 | // g_subprocess_force_exit() if it is desirable. | |
| 454 | 485 | func (x *Subprocess) Wait(CancellableVar *Cancellable) (bool, error) { | |
| 486 | + | core.LazyRegister(&xSubprocessWait, "GIO", "g_subprocess_wait", false) | |
| 455 | 487 | var cerr *glib.Error | |
| 456 | 488 | ||
| 457 | 489 | cret := xSubprocessWait(x.GoPointer(), CancellableVar.GoPointer(), &cerr) | |
| @@ -467,6 +499,8 @@ var xSubprocessWaitAsync func(uintptr, uintptr, uintptr, uintptr) | |||
| 467 | 499 | // | |
| 468 | 500 | // This is the asynchronous version of g_subprocess_wait(). | |
| 469 | 501 | func (x *Subprocess) WaitAsync(CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 502 | + | core.LazyRegister(&xSubprocessWaitAsync, "GIO", "g_subprocess_wait_async", false) | |
| 503 | + | ||
| 470 | 504 | xSubprocessWaitAsync(x.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 471 | 505 | } | |
| 472 | 506 | ||
| @@ -474,6 +508,7 @@ var xSubprocessWaitCheck func(uintptr, uintptr, **glib.Error) bool | |||
| 474 | 508 | ||
| 475 | 509 | // Combines g_subprocess_wait() with g_spawn_check_wait_status(). | |
| 476 | 510 | func (x *Subprocess) WaitCheck(CancellableVar *Cancellable) (bool, error) { | |
| 511 | + | core.LazyRegister(&xSubprocessWaitCheck, "GIO", "g_subprocess_wait_check", false) | |
| 477 | 512 | var cerr *glib.Error | |
| 478 | 513 | ||
| 479 | 514 | cret := xSubprocessWaitCheck(x.GoPointer(), CancellableVar.GoPointer(), &cerr) | |
| @@ -489,6 +524,8 @@ var xSubprocessWaitCheckAsync func(uintptr, uintptr, uintptr, uintptr) | |||
| 489 | 524 | // | |
| 490 | 525 | // This is the asynchronous version of g_subprocess_wait_check(). | |
| 491 | 526 | func (x *Subprocess) WaitCheckAsync(CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 527 | + | core.LazyRegister(&xSubprocessWaitCheckAsync, "GIO", "g_subprocess_wait_check_async", false) | |
| 528 | + | ||
| 492 | 529 | xSubprocessWaitCheckAsync(x.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 493 | 530 | } | |
| 494 | 531 | ||
| @@ -497,6 +534,7 @@ var xSubprocessWaitCheckFinish func(uintptr, uintptr, **glib.Error) bool | |||
| 497 | 534 | // Collects the result of a previous call to | |
| 498 | 535 | // g_subprocess_wait_check_async(). | |
| 499 | 536 | func (x *Subprocess) WaitCheckFinish(ResultVar AsyncResult) (bool, error) { | |
| 537 | + | core.LazyRegister(&xSubprocessWaitCheckFinish, "GIO", "g_subprocess_wait_check_finish", false) | |
| 500 | 538 | var cerr *glib.Error | |
| 501 | 539 | ||
| 502 | 540 | cret := xSubprocessWaitCheckFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| @@ -511,6 +549,7 @@ var xSubprocessWaitFinish func(uintptr, uintptr, **glib.Error) bool | |||
| 511 | 549 | // Collects the result of a previous call to | |
| 512 | 550 | // g_subprocess_wait_async(). | |
| 513 | 551 | func (x *Subprocess) WaitFinish(ResultVar AsyncResult) (bool, error) { | |
| 552 | + | core.LazyRegister(&xSubprocessWaitFinish, "GIO", "g_subprocess_wait_finish", false) | |
| 514 | 553 | var cerr *glib.Error | |
| 515 | 554 | ||
| 516 | 555 | cret := xSubprocessWaitFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| @@ -591,42 +630,4 @@ func (x *Subprocess) Init(CancellableVar *Cancellable) (bool, error) { | |||
| 591 | 630 | func init() { | |
| 592 | 631 | core.SetPackageName("GIO", "gio-2.0") | |
| 593 | 632 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | |
| 594 | - | var libs []uintptr | |
| 595 | - | for _, libPath := range core.GetPaths("GIO") { | |
| 596 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 597 | - | if err != nil { | |
| 598 | - | panic(err) | |
| 599 | - | } | |
| 600 | - | libs = append(libs, lib) | |
| 601 | - | } | |
| 602 | - | ||
| 603 | - | core.PuregoSafeRegister(&xSubprocessGLibType, libs, "g_subprocess_get_type") | |
| 604 | - | ||
| 605 | - | core.PuregoSafeRegister(&xNewSubprocess, libs, "g_subprocess_new") | |
| 606 | - | core.PuregoSafeRegister(&xNewSubprocessv, libs, "g_subprocess_newv") | |
| 607 | - | ||
| 608 | - | core.PuregoSafeRegister(&xSubprocessCommunicate, libs, "g_subprocess_communicate") | |
| 609 | - | core.PuregoSafeRegister(&xSubprocessCommunicateAsync, libs, "g_subprocess_communicate_async") | |
| 610 | - | core.PuregoSafeRegister(&xSubprocessCommunicateFinish, libs, "g_subprocess_communicate_finish") | |
| 611 | - | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8, libs, "g_subprocess_communicate_utf8") | |
| 612 | - | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8Async, libs, "g_subprocess_communicate_utf8_async") | |
| 613 | - | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8Finish, libs, "g_subprocess_communicate_utf8_finish") | |
| 614 | - | core.PuregoSafeRegister(&xSubprocessForceExit, libs, "g_subprocess_force_exit") | |
| 615 | - | core.PuregoSafeRegister(&xSubprocessGetExitStatus, libs, "g_subprocess_get_exit_status") | |
| 616 | - | core.PuregoSafeRegister(&xSubprocessGetIdentifier, libs, "g_subprocess_get_identifier") | |
| 617 | - | core.PuregoSafeRegister(&xSubprocessGetIfExited, libs, "g_subprocess_get_if_exited") | |
| 618 | - | core.PuregoSafeRegister(&xSubprocessGetIfSignaled, libs, "g_subprocess_get_if_signaled") | |
| 619 | - | core.PuregoSafeRegister(&xSubprocessGetStatus, libs, "g_subprocess_get_status") | |
| 620 | - | core.PuregoSafeRegister(&xSubprocessGetStderrPipe, libs, "g_subprocess_get_stderr_pipe") | |
| 621 | - | core.PuregoSafeRegister(&xSubprocessGetStdinPipe, libs, "g_subprocess_get_stdin_pipe") | |
| 622 | - | core.PuregoSafeRegister(&xSubprocessGetStdoutPipe, libs, "g_subprocess_get_stdout_pipe") | |
| 623 | - | core.PuregoSafeRegister(&xSubprocessGetSuccessful, libs, "g_subprocess_get_successful") | |
| 624 | - | core.PuregoSafeRegister(&xSubprocessGetTermSig, libs, "g_subprocess_get_term_sig") | |
| 625 | - | core.PuregoSafeRegister(&xSubprocessSendSignal, libs, "g_subprocess_send_signal") | |
| 626 | - | core.PuregoSafeRegister(&xSubprocessWait, libs, "g_subprocess_wait") | |
| 627 | - | core.PuregoSafeRegister(&xSubprocessWaitAsync, libs, "g_subprocess_wait_async") | |
| 628 | - | core.PuregoSafeRegister(&xSubprocessWaitCheck, libs, "g_subprocess_wait_check") | |
| 629 | - | core.PuregoSafeRegister(&xSubprocessWaitCheckAsync, libs, "g_subprocess_wait_check_async") | |
| 630 | - | core.PuregoSafeRegister(&xSubprocessWaitCheckFinish, libs, "g_subprocess_wait_check_finish") | |
| 631 | - | core.PuregoSafeRegister(&xSubprocessWaitFinish, libs, "g_subprocess_wait_finish") | |
| 632 | 633 | } | |
| @@ -4,7 +4,6 @@ package gio | |||||
| 4 | import ( | 4 | import ( | ||
| 5 | "unsafe" | 5 | "unsafe" | ||
| 6 | 6 | ||||
| 7 | - | "github.com/bnema/purego" | |||
| 8 | "github.com/bnema/puregotk/pkg/core" | 7 | "github.com/bnema/puregotk/pkg/core" | ||
| 9 | "github.com/bnema/puregotk/v4/glib" | 8 | "github.com/bnema/puregotk/v4/glib" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject" | 9 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -81,6 +80,7 @@ type Subprocess struct { | |||||
| 81 | var xSubprocessGLibType func() types.GType | 80 | var xSubprocessGLibType func() types.GType | ||
| 82 | 81 | ||||
| 83 | func SubprocessGLibType() types.GType { | 82 | func SubprocessGLibType() types.GType { | ||
| 83 | + | core.LazyRegister(&xSubprocessGLibType, "GIO", "g_subprocess_get_type", false) | |||
| 84 | return xSubprocessGLibType() | 84 | return xSubprocessGLibType() | ||
| 85 | } | 85 | } | ||
| 86 | 86 | ||||
| @@ -100,6 +100,7 @@ var xNewSubprocess func(SubprocessFlags, **glib.Error, string, ...interface{}) u | |||||
| 100 | // | 100 | // | ||
| 101 | // The argument list must be terminated with %NULL. | 101 | // The argument list must be terminated with %NULL. | ||
| 102 | func NewSubprocess(FlagsVar SubprocessFlags, ErrorVar **glib.Error, Argv0Var string, varArgs ...interface{}) *Subprocess { | 102 | func NewSubprocess(FlagsVar SubprocessFlags, ErrorVar **glib.Error, Argv0Var string, varArgs ...interface{}) *Subprocess { | ||
| 103 | + | core.LazyRegister(&xNewSubprocess, "GIO", "g_subprocess_new", false) | |||
| 103 | var cls *Subprocess | 104 | var cls *Subprocess | ||
| 104 | 105 | ||||
| 105 | cret := xNewSubprocess(FlagsVar, ErrorVar, Argv0Var, varArgs...) | 106 | cret := xNewSubprocess(FlagsVar, ErrorVar, Argv0Var, varArgs...) | ||
| @@ -118,6 +119,7 @@ var xNewSubprocessv func([]string, SubprocessFlags, **glib.Error) uintptr | |||||
| 118 | // | 119 | // | ||
| 119 | // The argument list is expected to be %NULL-terminated. | 120 | // The argument list is expected to be %NULL-terminated. | ||
| 120 | func NewSubprocessv(ArgvVar []string, FlagsVar SubprocessFlags) (*Subprocess, error) { | 121 | func NewSubprocessv(ArgvVar []string, FlagsVar SubprocessFlags) (*Subprocess, error) { | ||
| 122 | + | core.LazyRegister(&xNewSubprocessv, "GIO", "g_subprocess_newv", false) | |||
| 121 | var cls *Subprocess | 123 | var cls *Subprocess | ||
| 122 | var cerr *glib.Error | 124 | var cerr *glib.Error | ||
| 123 | 125 | ||||
| @@ -178,6 +180,7 @@ var xSubprocessCommunicate func(uintptr, *glib.Bytes, uintptr, **glib.Bytes, **g | |||||
| 178 | // attempt to interact with the pipes while the operation is in progress | 180 | // attempt to interact with the pipes while the operation is in progress | ||
| 179 | // (either from another thread or if using the asynchronous version). | 181 | // (either from another thread or if using the asynchronous version). | ||
| 180 | func (x *Subprocess) Communicate(StdinBufVar *glib.Bytes, CancellableVar *Cancellable, StdoutBufVar **glib.Bytes, StderrBufVar **glib.Bytes) (bool, error) { | 182 | func (x *Subprocess) Communicate(StdinBufVar *glib.Bytes, CancellableVar *Cancellable, StdoutBufVar **glib.Bytes, StderrBufVar **glib.Bytes) (bool, error) { | ||
| 183 | + | core.LazyRegister(&xSubprocessCommunicate, "GIO", "g_subprocess_communicate", false) | |||
| 181 | var cerr *glib.Error | 184 | var cerr *glib.Error | ||
| 182 | 185 | ||||
| 183 | cret := xSubprocessCommunicate(x.GoPointer(), StdinBufVar, CancellableVar.GoPointer(), StdoutBufVar, StderrBufVar, &cerr) | 186 | cret := xSubprocessCommunicate(x.GoPointer(), StdinBufVar, CancellableVar.GoPointer(), StdoutBufVar, StderrBufVar, &cerr) | ||
| @@ -192,6 +195,8 @@ var xSubprocessCommunicateAsync func(uintptr, *glib.Bytes, uintptr, uintptr, uin | |||||
| 192 | // Asynchronous version of g_subprocess_communicate(). Complete | 195 | // Asynchronous version of g_subprocess_communicate(). Complete | ||
| 193 | // invocation with g_subprocess_communicate_finish(). | 196 | // invocation with g_subprocess_communicate_finish(). | ||
| 194 | func (x *Subprocess) CommunicateAsync(StdinBufVar *glib.Bytes, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 197 | func (x *Subprocess) CommunicateAsync(StdinBufVar *glib.Bytes, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 198 | + | core.LazyRegister(&xSubprocessCommunicateAsync, "GIO", "g_subprocess_communicate_async", false) | |||
| 199 | + | ||||
| 195 | xSubprocessCommunicateAsync(x.GoPointer(), StdinBufVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 200 | xSubprocessCommunicateAsync(x.GoPointer(), StdinBufVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 196 | } | 201 | } | ||
| 197 | 202 | ||||
| @@ -199,6 +204,7 @@ var xSubprocessCommunicateFinish func(uintptr, uintptr, **glib.Bytes, **glib.Byt | |||||
| 199 | 204 | ||||
| 200 | // Complete an invocation of g_subprocess_communicate_async(). | 205 | // Complete an invocation of g_subprocess_communicate_async(). | ||
| 201 | func (x *Subprocess) CommunicateFinish(ResultVar AsyncResult, StdoutBufVar **glib.Bytes, StderrBufVar **glib.Bytes) (bool, error) { | 206 | func (x *Subprocess) CommunicateFinish(ResultVar AsyncResult, StdoutBufVar **glib.Bytes, StderrBufVar **glib.Bytes) (bool, error) { | ||
| 207 | + | core.LazyRegister(&xSubprocessCommunicateFinish, "GIO", "g_subprocess_communicate_finish", false) | |||
| 202 | var cerr *glib.Error | 208 | var cerr *glib.Error | ||
| 203 | 209 | ||||
| 204 | cret := xSubprocessCommunicateFinish(x.GoPointer(), ResultVar.GoPointer(), StdoutBufVar, StderrBufVar, &cerr) | 210 | cret := xSubprocessCommunicateFinish(x.GoPointer(), ResultVar.GoPointer(), StdoutBufVar, StderrBufVar, &cerr) | ||
| @@ -216,6 +222,7 @@ var xSubprocessCommunicateUtf8 func(uintptr, uintptr, uintptr, *string, *string, | |||||
| 216 | // On error, @stdout_buf and @stderr_buf will be set to undefined values and | 222 | // On error, @stdout_buf and @stderr_buf will be set to undefined values and | ||
| 217 | // should not be used. | 223 | // should not be used. | ||
| 218 | func (x *Subprocess) CommunicateUtf8(StdinBufVar *string, CancellableVar *Cancellable, StdoutBufVar *string, StderrBufVar *string) (bool, error) { | 224 | func (x *Subprocess) CommunicateUtf8(StdinBufVar *string, CancellableVar *Cancellable, StdoutBufVar *string, StderrBufVar *string) (bool, error) { | ||
| 225 | + | core.LazyRegister(&xSubprocessCommunicateUtf8, "GIO", "g_subprocess_communicate_utf8", false) | |||
| 219 | var cerr *glib.Error | 226 | var cerr *glib.Error | ||
| 220 | 227 | ||||
| 221 | StdinBufVarPtr := core.GStrdupNullable(StdinBufVar) | 228 | StdinBufVarPtr := core.GStrdupNullable(StdinBufVar) | ||
| @@ -233,6 +240,8 @@ var xSubprocessCommunicateUtf8Async func(uintptr, uintptr, uintptr, uintptr, uin | |||||
| 233 | // Asynchronous version of g_subprocess_communicate_utf8(). Complete | 240 | // Asynchronous version of g_subprocess_communicate_utf8(). Complete | ||
| 234 | // invocation with g_subprocess_communicate_utf8_finish(). | 241 | // invocation with g_subprocess_communicate_utf8_finish(). | ||
| 235 | func (x *Subprocess) CommunicateUtf8Async(StdinBufVar *string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 242 | func (x *Subprocess) CommunicateUtf8Async(StdinBufVar *string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 243 | + | core.LazyRegister(&xSubprocessCommunicateUtf8Async, "GIO", "g_subprocess_communicate_utf8_async", false) | |||
| 244 | + | ||||
| 236 | StdinBufVarPtr := core.GStrdupNullable(StdinBufVar) | 245 | StdinBufVarPtr := core.GStrdupNullable(StdinBufVar) | ||
| 237 | defer core.GFreeNullable(StdinBufVarPtr) | 246 | defer core.GFreeNullable(StdinBufVarPtr) | ||
| 238 | 247 | ||||
| @@ -243,6 +252,7 @@ var xSubprocessCommunicateUtf8Finish func(uintptr, uintptr, *string, *string, ** | |||||
| 243 | 252 | ||||
| 244 | // Complete an invocation of g_subprocess_communicate_utf8_async(). | 253 | // Complete an invocation of g_subprocess_communicate_utf8_async(). | ||
| 245 | func (x *Subprocess) CommunicateUtf8Finish(ResultVar AsyncResult, StdoutBufVar *string, StderrBufVar *string) (bool, error) { | 254 | func (x *Subprocess) CommunicateUtf8Finish(ResultVar AsyncResult, StdoutBufVar *string, StderrBufVar *string) (bool, error) { | ||
| 255 | + | core.LazyRegister(&xSubprocessCommunicateUtf8Finish, "GIO", "g_subprocess_communicate_utf8_finish", false) | |||
| 246 | var cerr *glib.Error | 256 | var cerr *glib.Error | ||
| 247 | 257 | ||||
| 248 | cret := xSubprocessCommunicateUtf8Finish(x.GoPointer(), ResultVar.GoPointer(), StdoutBufVar, StderrBufVar, &cerr) | 258 | cret := xSubprocessCommunicateUtf8Finish(x.GoPointer(), ResultVar.GoPointer(), StdoutBufVar, StderrBufVar, &cerr) | ||
| @@ -262,6 +272,8 @@ var xSubprocessForceExit func(uintptr) | |||||
| 262 | // | 272 | // | ||
| 263 | // On Unix, this function sends %SIGKILL. | 273 | // On Unix, this function sends %SIGKILL. | ||
| 264 | func (x *Subprocess) ForceExit() { | 274 | func (x *Subprocess) ForceExit() { | ||
| 275 | + | core.LazyRegister(&xSubprocessForceExit, "GIO", "g_subprocess_force_exit", false) | |||
| 276 | + | ||||
| 265 | xSubprocessForceExit(x.GoPointer()) | 277 | xSubprocessForceExit(x.GoPointer()) | ||
| 266 | } | 278 | } | ||
| 267 | 279 | ||||
| @@ -276,6 +288,8 @@ var xSubprocessGetExitStatus func(uintptr) int | |||||
| 276 | // It is an error to call this function before g_subprocess_wait() and | 288 | // It is an error to call this function before g_subprocess_wait() and | ||
| 277 | // unless g_subprocess_get_if_exited() returned %TRUE. | 289 | // unless g_subprocess_get_if_exited() returned %TRUE. | ||
| 278 | func (x *Subprocess) GetExitStatus() int { | 290 | func (x *Subprocess) GetExitStatus() int { | ||
| 291 | + | core.LazyRegister(&xSubprocessGetExitStatus, "GIO", "g_subprocess_get_exit_status", false) | |||
| 292 | + | ||||
| 279 | cret := xSubprocessGetExitStatus(x.GoPointer()) | 293 | cret := xSubprocessGetExitStatus(x.GoPointer()) | ||
| 280 | return cret | 294 | return cret | ||
| 281 | } | 295 | } | ||
| @@ -286,6 +300,8 @@ var xSubprocessGetIdentifier func(uintptr) string | |||||
| 286 | // On Windows, returns the result of GetProcessId() also as a string. | 300 | // On Windows, returns the result of GetProcessId() also as a string. | ||
| 287 | // If the subprocess has terminated, this will return %NULL. | 301 | // If the subprocess has terminated, this will return %NULL. | ||
| 288 | func (x *Subprocess) GetIdentifier() string { | 302 | func (x *Subprocess) GetIdentifier() string { | ||
| 303 | + | core.LazyRegister(&xSubprocessGetIdentifier, "GIO", "g_subprocess_get_identifier", false) | |||
| 304 | + | ||||
| 289 | cret := xSubprocessGetIdentifier(x.GoPointer()) | 305 | cret := xSubprocessGetIdentifier(x.GoPointer()) | ||
| 290 | return cret | 306 | return cret | ||
| 291 | } | 307 | } | ||
| @@ -300,6 +316,8 @@ var xSubprocessGetIfExited func(uintptr) bool | |||||
| 300 | // It is an error to call this function before g_subprocess_wait() has | 316 | // It is an error to call this function before g_subprocess_wait() has | ||
| 301 | // returned. | 317 | // returned. | ||
| 302 | func (x *Subprocess) GetIfExited() bool { | 318 | func (x *Subprocess) GetIfExited() bool { | ||
| 319 | + | core.LazyRegister(&xSubprocessGetIfExited, "GIO", "g_subprocess_get_if_exited", false) | |||
| 320 | + | ||||
| 303 | cret := xSubprocessGetIfExited(x.GoPointer()) | 321 | cret := xSubprocessGetIfExited(x.GoPointer()) | ||
| 304 | return cret | 322 | return cret | ||
| 305 | } | 323 | } | ||
| @@ -313,6 +331,8 @@ var xSubprocessGetIfSignaled func(uintptr) bool | |||||
| 313 | // It is an error to call this function before g_subprocess_wait() has | 331 | // It is an error to call this function before g_subprocess_wait() has | ||
| 314 | // returned. | 332 | // returned. | ||
| 315 | func (x *Subprocess) GetIfSignaled() bool { | 333 | func (x *Subprocess) GetIfSignaled() bool { | ||
| 334 | + | core.LazyRegister(&xSubprocessGetIfSignaled, "GIO", "g_subprocess_get_if_signaled", false) | |||
| 335 | + | ||||
| 316 | cret := xSubprocessGetIfSignaled(x.GoPointer()) | 336 | cret := xSubprocessGetIfSignaled(x.GoPointer()) | ||
| 317 | return cret | 337 | return cret | ||
| 318 | } | 338 | } | ||
| @@ -331,6 +351,8 @@ var xSubprocessGetStatus func(uintptr) int | |||||
| 331 | // It is an error to call this function before g_subprocess_wait() has | 351 | // It is an error to call this function before g_subprocess_wait() has | ||
| 332 | // returned. | 352 | // returned. | ||
| 333 | func (x *Subprocess) GetStatus() int { | 353 | func (x *Subprocess) GetStatus() int { | ||
| 354 | + | core.LazyRegister(&xSubprocessGetStatus, "GIO", "g_subprocess_get_status", false) | |||
| 355 | + | ||||
| 334 | cret := xSubprocessGetStatus(x.GoPointer()) | 356 | cret := xSubprocessGetStatus(x.GoPointer()) | ||
| 335 | return cret | 357 | return cret | ||
| 336 | } | 358 | } | ||
| @@ -343,6 +365,7 @@ var xSubprocessGetStderrPipe func(uintptr) uintptr | |||||
| 343 | // The process must have been created with %G_SUBPROCESS_FLAGS_STDERR_PIPE, | 365 | // The process must have been created with %G_SUBPROCESS_FLAGS_STDERR_PIPE, | ||
| 344 | // otherwise %NULL will be returned. | 366 | // otherwise %NULL will be returned. | ||
| 345 | func (x *Subprocess) GetStderrPipe() *InputStream { | 367 | func (x *Subprocess) GetStderrPipe() *InputStream { | ||
| 368 | + | core.LazyRegister(&xSubprocessGetStderrPipe, "GIO", "g_subprocess_get_stderr_pipe", false) | |||
| 346 | var cls *InputStream | 369 | var cls *InputStream | ||
| 347 | 370 | ||||
| 348 | cret := xSubprocessGetStderrPipe(x.GoPointer()) | 371 | cret := xSubprocessGetStderrPipe(x.GoPointer()) | ||
| @@ -364,6 +387,7 @@ var xSubprocessGetStdinPipe func(uintptr) uintptr | |||||
| 364 | // The process must have been created with %G_SUBPROCESS_FLAGS_STDIN_PIPE and | 387 | // The process must have been created with %G_SUBPROCESS_FLAGS_STDIN_PIPE and | ||
| 365 | // not %G_SUBPROCESS_FLAGS_STDIN_INHERIT, otherwise %NULL will be returned. | 388 | // not %G_SUBPROCESS_FLAGS_STDIN_INHERIT, otherwise %NULL will be returned. | ||
| 366 | func (x *Subprocess) GetStdinPipe() *OutputStream { | 389 | func (x *Subprocess) GetStdinPipe() *OutputStream { | ||
| 390 | + | core.LazyRegister(&xSubprocessGetStdinPipe, "GIO", "g_subprocess_get_stdin_pipe", false) | |||
| 367 | var cls *OutputStream | 391 | var cls *OutputStream | ||
| 368 | 392 | ||||
| 369 | cret := xSubprocessGetStdinPipe(x.GoPointer()) | 393 | cret := xSubprocessGetStdinPipe(x.GoPointer()) | ||
| @@ -385,6 +409,7 @@ var xSubprocessGetStdoutPipe func(uintptr) uintptr | |||||
| 385 | // The process must have been created with %G_SUBPROCESS_FLAGS_STDOUT_PIPE, | 409 | // The process must have been created with %G_SUBPROCESS_FLAGS_STDOUT_PIPE, | ||
| 386 | // otherwise %NULL will be returned. | 410 | // otherwise %NULL will be returned. | ||
| 387 | func (x *Subprocess) GetStdoutPipe() *InputStream { | 411 | func (x *Subprocess) GetStdoutPipe() *InputStream { | ||
| 412 | + | core.LazyRegister(&xSubprocessGetStdoutPipe, "GIO", "g_subprocess_get_stdout_pipe", false) | |||
| 388 | var cls *InputStream | 413 | var cls *InputStream | ||
| 389 | 414 | ||||
| 390 | cret := xSubprocessGetStdoutPipe(x.GoPointer()) | 415 | cret := xSubprocessGetStdoutPipe(x.GoPointer()) | ||
| @@ -407,6 +432,8 @@ var xSubprocessGetSuccessful func(uintptr) bool | |||||
| 407 | // It is an error to call this function before g_subprocess_wait() has | 432 | // It is an error to call this function before g_subprocess_wait() has | ||
| 408 | // returned. | 433 | // returned. | ||
| 409 | func (x *Subprocess) GetSuccessful() bool { | 434 | func (x *Subprocess) GetSuccessful() bool { | ||
| 435 | + | core.LazyRegister(&xSubprocessGetSuccessful, "GIO", "g_subprocess_get_successful", false) | |||
| 436 | + | ||||
| 410 | cret := xSubprocessGetSuccessful(x.GoPointer()) | 437 | cret := xSubprocessGetSuccessful(x.GoPointer()) | ||
| 411 | return cret | 438 | return cret | ||
| 412 | } | 439 | } | ||
| @@ -421,6 +448,8 @@ var xSubprocessGetTermSig func(uintptr) int | |||||
| 421 | // It is an error to call this function before g_subprocess_wait() and | 448 | // It is an error to call this function before g_subprocess_wait() and | ||
| 422 | // unless g_subprocess_get_if_signaled() returned %TRUE. | 449 | // unless g_subprocess_get_if_signaled() returned %TRUE. | ||
| 423 | func (x *Subprocess) GetTermSig() int { | 450 | func (x *Subprocess) GetTermSig() int { | ||
| 451 | + | core.LazyRegister(&xSubprocessGetTermSig, "GIO", "g_subprocess_get_term_sig", false) | |||
| 452 | + | ||||
| 424 | cret := xSubprocessGetTermSig(x.GoPointer()) | 453 | cret := xSubprocessGetTermSig(x.GoPointer()) | ||
| 425 | return cret | 454 | return cret | ||
| 426 | } | 455 | } | ||
| @@ -435,6 +464,8 @@ var xSubprocessSendSignal func(uintptr, int) | |||||
| 435 | // | 464 | // | ||
| 436 | // This API is not available on Windows. | 465 | // This API is not available on Windows. | ||
| 437 | func (x *Subprocess) SendSignal(SignalNumVar int) { | 466 | func (x *Subprocess) SendSignal(SignalNumVar int) { | ||
| 467 | + | core.LazyRegister(&xSubprocessSendSignal, "GIO", "g_subprocess_send_signal", false) | |||
| 468 | + | ||||
| 438 | xSubprocessSendSignal(x.GoPointer(), SignalNumVar) | 469 | xSubprocessSendSignal(x.GoPointer(), SignalNumVar) | ||
| 439 | } | 470 | } | ||
| 440 | 471 | ||||
| @@ -452,6 +483,7 @@ var xSubprocessWait func(uintptr, uintptr, **glib.Error) bool | |||||
| 452 | // Cancelling @cancellable doesn't kill the subprocess. Call | 483 | // Cancelling @cancellable doesn't kill the subprocess. Call | ||
| 453 | // g_subprocess_force_exit() if it is desirable. | 484 | // g_subprocess_force_exit() if it is desirable. | ||
| 454 | func (x *Subprocess) Wait(CancellableVar *Cancellable) (bool, error) { | 485 | func (x *Subprocess) Wait(CancellableVar *Cancellable) (bool, error) { | ||
| 486 | + | core.LazyRegister(&xSubprocessWait, "GIO", "g_subprocess_wait", false) | |||
| 455 | var cerr *glib.Error | 487 | var cerr *glib.Error | ||
| 456 | 488 | ||||
| 457 | cret := xSubprocessWait(x.GoPointer(), CancellableVar.GoPointer(), &cerr) | 489 | cret := xSubprocessWait(x.GoPointer(), CancellableVar.GoPointer(), &cerr) | ||
| @@ -467,6 +499,8 @@ var xSubprocessWaitAsync func(uintptr, uintptr, uintptr, uintptr) | |||||
| 467 | // | 499 | // | ||
| 468 | // This is the asynchronous version of g_subprocess_wait(). | 500 | // This is the asynchronous version of g_subprocess_wait(). | ||
| 469 | func (x *Subprocess) WaitAsync(CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 501 | func (x *Subprocess) WaitAsync(CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 502 | + | core.LazyRegister(&xSubprocessWaitAsync, "GIO", "g_subprocess_wait_async", false) | |||
| 503 | + | ||||
| 470 | xSubprocessWaitAsync(x.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 504 | xSubprocessWaitAsync(x.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 471 | } | 505 | } | ||
| 472 | 506 | ||||
| @@ -474,6 +508,7 @@ var xSubprocessWaitCheck func(uintptr, uintptr, **glib.Error) bool | |||||
| 474 | 508 | ||||
| 475 | // Combines g_subprocess_wait() with g_spawn_check_wait_status(). | 509 | // Combines g_subprocess_wait() with g_spawn_check_wait_status(). | ||
| 476 | func (x *Subprocess) WaitCheck(CancellableVar *Cancellable) (bool, error) { | 510 | func (x *Subprocess) WaitCheck(CancellableVar *Cancellable) (bool, error) { | ||
| 511 | + | core.LazyRegister(&xSubprocessWaitCheck, "GIO", "g_subprocess_wait_check", false) | |||
| 477 | var cerr *glib.Error | 512 | var cerr *glib.Error | ||
| 478 | 513 | ||||
| 479 | cret := xSubprocessWaitCheck(x.GoPointer(), CancellableVar.GoPointer(), &cerr) | 514 | cret := xSubprocessWaitCheck(x.GoPointer(), CancellableVar.GoPointer(), &cerr) | ||
| @@ -489,6 +524,8 @@ var xSubprocessWaitCheckAsync func(uintptr, uintptr, uintptr, uintptr) | |||||
| 489 | // | 524 | // | ||
| 490 | // This is the asynchronous version of g_subprocess_wait_check(). | 525 | // This is the asynchronous version of g_subprocess_wait_check(). | ||
| 491 | func (x *Subprocess) WaitCheckAsync(CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 526 | func (x *Subprocess) WaitCheckAsync(CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 527 | + | core.LazyRegister(&xSubprocessWaitCheckAsync, "GIO", "g_subprocess_wait_check_async", false) | |||
| 528 | + | ||||
| 492 | xSubprocessWaitCheckAsync(x.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 529 | xSubprocessWaitCheckAsync(x.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 493 | } | 530 | } | ||
| 494 | 531 | ||||
| @@ -497,6 +534,7 @@ var xSubprocessWaitCheckFinish func(uintptr, uintptr, **glib.Error) bool | |||||
| 497 | // Collects the result of a previous call to | 534 | // Collects the result of a previous call to | ||
| 498 | // g_subprocess_wait_check_async(). | 535 | // g_subprocess_wait_check_async(). | ||
| 499 | func (x *Subprocess) WaitCheckFinish(ResultVar AsyncResult) (bool, error) { | 536 | func (x *Subprocess) WaitCheckFinish(ResultVar AsyncResult) (bool, error) { | ||
| 537 | + | core.LazyRegister(&xSubprocessWaitCheckFinish, "GIO", "g_subprocess_wait_check_finish", false) | |||
| 500 | var cerr *glib.Error | 538 | var cerr *glib.Error | ||
| 501 | 539 | ||||
| 502 | cret := xSubprocessWaitCheckFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | 540 | cret := xSubprocessWaitCheckFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | ||
| @@ -511,6 +549,7 @@ var xSubprocessWaitFinish func(uintptr, uintptr, **glib.Error) bool | |||||
| 511 | // Collects the result of a previous call to | 549 | // Collects the result of a previous call to | ||
| 512 | // g_subprocess_wait_async(). | 550 | // g_subprocess_wait_async(). | ||
| 513 | func (x *Subprocess) WaitFinish(ResultVar AsyncResult) (bool, error) { | 551 | func (x *Subprocess) WaitFinish(ResultVar AsyncResult) (bool, error) { | ||
| 552 | + | core.LazyRegister(&xSubprocessWaitFinish, "GIO", "g_subprocess_wait_finish", false) | |||
| 514 | var cerr *glib.Error | 553 | var cerr *glib.Error | ||
| 515 | 554 | ||||
| 516 | cret := xSubprocessWaitFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | 555 | cret := xSubprocessWaitFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | ||
| @@ -591,42 +630,4 @@ func (x *Subprocess) Init(CancellableVar *Cancellable) (bool, error) { | |||||
| 591 | func init() { | 630 | func init() { | ||
| 592 | core.SetPackageName("GIO", "gio-2.0") | 631 | core.SetPackageName("GIO", "gio-2.0") | ||
| 593 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | 632 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | ||
| 594 | - | var libs []uintptr | |||
| 595 | - | for _, libPath := range core.GetPaths("GIO") { | |||
| 596 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 597 | - | if err != nil { | |||
| 598 | - | panic(err) | |||
| 599 | - | } | |||
| 600 | - | libs = append(libs, lib) | |||
| 601 | - | } | |||
| 602 | - | ||||
| 603 | - | core.PuregoSafeRegister(&xSubprocessGLibType, libs, "g_subprocess_get_type") | |||
| 604 | - | ||||
| 605 | - | core.PuregoSafeRegister(&xNewSubprocess, libs, "g_subprocess_new") | |||
| 606 | - | core.PuregoSafeRegister(&xNewSubprocessv, libs, "g_subprocess_newv") | |||
| 607 | - | ||||
| 608 | - | core.PuregoSafeRegister(&xSubprocessCommunicate, libs, "g_subprocess_communicate") | |||
| 609 | - | core.PuregoSafeRegister(&xSubprocessCommunicateAsync, libs, "g_subprocess_communicate_async") | |||
| 610 | - | core.PuregoSafeRegister(&xSubprocessCommunicateFinish, libs, "g_subprocess_communicate_finish") | |||
| 611 | - | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8, libs, "g_subprocess_communicate_utf8") | |||
| 612 | - | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8Async, libs, "g_subprocess_communicate_utf8_async") | |||
| 613 | - | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8Finish, libs, "g_subprocess_communicate_utf8_finish") | |||
| 614 | - | core.PuregoSafeRegister(&xSubprocessForceExit, libs, "g_subprocess_force_exit") | |||
| 615 | - | core.PuregoSafeRegister(&xSubprocessGetExitStatus, libs, "g_subprocess_get_exit_status") | |||
| 616 | - | core.PuregoSafeRegister(&xSubprocessGetIdentifier, libs, "g_subprocess_get_identifier") | |||
| 617 | - | core.PuregoSafeRegister(&xSubprocessGetIfExited, libs, "g_subprocess_get_if_exited") | |||
| 618 | - | core.PuregoSafeRegister(&xSubprocessGetIfSignaled, libs, "g_subprocess_get_if_signaled") | |||
| 619 | - | core.PuregoSafeRegister(&xSubprocessGetStatus, libs, "g_subprocess_get_status") | |||
| 620 | - | core.PuregoSafeRegister(&xSubprocessGetStderrPipe, libs, "g_subprocess_get_stderr_pipe") | |||
| 621 | - | core.PuregoSafeRegister(&xSubprocessGetStdinPipe, libs, "g_subprocess_get_stdin_pipe") | |||
| 622 | - | core.PuregoSafeRegister(&xSubprocessGetStdoutPipe, libs, "g_subprocess_get_stdout_pipe") | |||
| 623 | - | core.PuregoSafeRegister(&xSubprocessGetSuccessful, libs, "g_subprocess_get_successful") | |||
| 624 | - | core.PuregoSafeRegister(&xSubprocessGetTermSig, libs, "g_subprocess_get_term_sig") | |||
| 625 | - | core.PuregoSafeRegister(&xSubprocessSendSignal, libs, "g_subprocess_send_signal") | |||
| 626 | - | core.PuregoSafeRegister(&xSubprocessWait, libs, "g_subprocess_wait") | |||
| 627 | - | core.PuregoSafeRegister(&xSubprocessWaitAsync, libs, "g_subprocess_wait_async") | |||
| 628 | - | core.PuregoSafeRegister(&xSubprocessWaitCheck, libs, "g_subprocess_wait_check") | |||
| 629 | - | core.PuregoSafeRegister(&xSubprocessWaitCheckAsync, libs, "g_subprocess_wait_check_async") | |||
| 630 | - | core.PuregoSafeRegister(&xSubprocessWaitCheckFinish, libs, "g_subprocess_wait_check_finish") | |||
| 631 | - | core.PuregoSafeRegister(&xSubprocessWaitFinish, libs, "g_subprocess_wait_finish") | |||
| 632 | } | 633 | } | ||