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
| @@ -5,7 +5,6 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | - | "github.com/bnema/purego" | |
| 9 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/glib" | |
| 11 | 10 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -39,6 +38,7 @@ type BreakpointCondition struct { | |||
| 39 | 38 | var xBreakpointConditionGLibType func() types.GType | |
| 40 | 39 | ||
| 41 | 40 | func BreakpointConditionGLibType() types.GType { | |
| 41 | + | core.LazyRegister(&xBreakpointConditionGLibType, "ADW", "adw_breakpoint_condition_get_type", false) | |
| 42 | 42 | return xBreakpointConditionGLibType() | |
| 43 | 43 | } | |
| 44 | 44 | ||
| @@ -59,6 +59,8 @@ var xNewBreakpointConditionAnd func(*BreakpointCondition, *BreakpointCondition) | |||
| 59 | 59 | // Creates a condition that triggers when @condition_1 and @condition_2 are both | |
| 60 | 60 | // true. | |
| 61 | 61 | func NewBreakpointConditionAnd(Condition1Var *BreakpointCondition, Condition2Var *BreakpointCondition) *BreakpointCondition { | |
| 62 | + | core.LazyRegister(&xNewBreakpointConditionAnd, "ADW", "adw_breakpoint_condition_new_and", false) | |
| 63 | + | ||
| 62 | 64 | cret := xNewBreakpointConditionAnd(Condition1Var, Condition2Var) | |
| 63 | 65 | if cret == 0 { | |
| 64 | 66 | return nil | |
| @@ -70,6 +72,8 @@ var xNewBreakpointConditionLength func(BreakpointConditionLengthType, float64, L | |||
| 70 | 72 | ||
| 71 | 73 | // Creates a condition that triggers on length changes. | |
| 72 | 74 | func NewBreakpointConditionLength(TypeVar BreakpointConditionLengthType, ValueVar float64, UnitVar LengthUnit) *BreakpointCondition { | |
| 75 | + | core.LazyRegister(&xNewBreakpointConditionLength, "ADW", "adw_breakpoint_condition_new_length", false) | |
| 76 | + | ||
| 73 | 77 | cret := xNewBreakpointConditionLength(TypeVar, ValueVar, UnitVar) | |
| 74 | 78 | if cret == 0 { | |
| 75 | 79 | return nil | |
| @@ -82,6 +86,8 @@ var xNewBreakpointConditionOr func(*BreakpointCondition, *BreakpointCondition) u | |||
| 82 | 86 | // Creates a condition that triggers when either @condition_1 or @condition_2 is | |
| 83 | 87 | // true. | |
| 84 | 88 | func NewBreakpointConditionOr(Condition1Var *BreakpointCondition, Condition2Var *BreakpointCondition) *BreakpointCondition { | |
| 89 | + | core.LazyRegister(&xNewBreakpointConditionOr, "ADW", "adw_breakpoint_condition_new_or", false) | |
| 90 | + | ||
| 85 | 91 | cret := xNewBreakpointConditionOr(Condition1Var, Condition2Var) | |
| 86 | 92 | if cret == 0 { | |
| 87 | 93 | return nil | |
| @@ -95,6 +101,8 @@ var xNewBreakpointConditionRatio func(BreakpointConditionRatioType, int, int) ui | |||
| 95 | 101 | // | |
| 96 | 102 | // The ratio is represented as @width divided by @height. | |
| 97 | 103 | func NewBreakpointConditionRatio(TypeVar BreakpointConditionRatioType, WidthVar int, HeightVar int) *BreakpointCondition { | |
| 104 | + | core.LazyRegister(&xNewBreakpointConditionRatio, "ADW", "adw_breakpoint_condition_new_ratio", false) | |
| 105 | + | ||
| 98 | 106 | cret := xNewBreakpointConditionRatio(TypeVar, WidthVar, HeightVar) | |
| 99 | 107 | if cret == 0 { | |
| 100 | 108 | return nil | |
| @@ -106,6 +114,8 @@ var xBreakpointConditionCopy func(uintptr) uintptr | |||
| 106 | 114 | ||
| 107 | 115 | // Copies @self. | |
| 108 | 116 | func (x *BreakpointCondition) Copy() *BreakpointCondition { | |
| 117 | + | core.LazyRegister(&xBreakpointConditionCopy, "ADW", "adw_breakpoint_condition_copy", false) | |
| 118 | + | ||
| 109 | 119 | cret := xBreakpointConditionCopy(x.GoPointer()) | |
| 110 | 120 | if cret == 0 { | |
| 111 | 121 | return nil | |
| @@ -117,6 +127,8 @@ var xBreakpointConditionFree func(uintptr) | |||
| 117 | 127 | ||
| 118 | 128 | // Frees @self. | |
| 119 | 129 | func (x *BreakpointCondition) Free() { | |
| 130 | + | core.LazyRegister(&xBreakpointConditionFree, "ADW", "adw_breakpoint_condition_free", false) | |
| 131 | + | ||
| 120 | 132 | xBreakpointConditionFree(x.GoPointer()) | |
| 121 | 133 | } | |
| 122 | 134 | ||
| @@ -126,6 +138,8 @@ var xBreakpointConditionToString func(uintptr) string | |||
| 126 | 138 | // | |
| 127 | 139 | // The returned string can be parsed by [func@BreakpointCondition.parse]. | |
| 128 | 140 | func (x *BreakpointCondition) ToString() string { | |
| 141 | + | core.LazyRegister(&xBreakpointConditionToString, "ADW", "adw_breakpoint_condition_to_string", false) | |
| 142 | + | ||
| 129 | 143 | cret := xBreakpointConditionToString(x.GoPointer()) | |
| 130 | 144 | return cret | |
| 131 | 145 | } | |
| @@ -140,6 +154,7 @@ type BreakpointConditionLengthType int | |||
| 140 | 154 | var xBreakpointConditionLengthTypeGLibType func() types.GType | |
| 141 | 155 | ||
| 142 | 156 | func BreakpointConditionLengthTypeGLibType() types.GType { | |
| 157 | + | core.LazyRegister(&xBreakpointConditionLengthTypeGLibType, "ADW", "adw_breakpoint_condition_length_type_get_type", false) | |
| 143 | 158 | return xBreakpointConditionLengthTypeGLibType() | |
| 144 | 159 | } | |
| 145 | 160 | ||
| @@ -169,6 +184,7 @@ type BreakpointConditionRatioType int | |||
| 169 | 184 | var xBreakpointConditionRatioTypeGLibType func() types.GType | |
| 170 | 185 | ||
| 171 | 186 | func BreakpointConditionRatioTypeGLibType() types.GType { | |
| 187 | + | core.LazyRegister(&xBreakpointConditionRatioTypeGLibType, "ADW", "adw_breakpoint_condition_ratio_type_get_type", false) | |
| 172 | 188 | return xBreakpointConditionRatioTypeGLibType() | |
| 173 | 189 | } | |
| 174 | 190 | ||
| @@ -240,6 +256,8 @@ var xBreakpointConditionParse func(string) uintptr | |||
| 240 | 256 | // | |
| 241 | 257 | // If parentheses are omitted, the first operator takes priority. | |
| 242 | 258 | func BreakpointConditionParse(StrVar string) *BreakpointCondition { | |
| 259 | + | core.LazyRegister(&xBreakpointConditionParse, "ADW", "adw_breakpoint_condition_parse", false) | |
| 260 | + | ||
| 243 | 261 | cret := xBreakpointConditionParse(StrVar) | |
| 244 | 262 | if cret == 0 { | |
| 245 | 263 | return nil | |
| @@ -302,6 +320,7 @@ type Breakpoint struct { | |||
| 302 | 320 | var xBreakpointGLibType func() types.GType | |
| 303 | 321 | ||
| 304 | 322 | func BreakpointGLibType() types.GType { | |
| 323 | + | core.LazyRegister(&xBreakpointGLibType, "ADW", "adw_breakpoint_get_type", false) | |
| 305 | 324 | return xBreakpointGLibType() | |
| 306 | 325 | } | |
| 307 | 326 | ||
| @@ -315,6 +334,7 @@ var xNewBreakpoint func(*BreakpointCondition) uintptr | |||
| 315 | 334 | ||
| 316 | 335 | // Creates a new `AdwBreakpoint` with @condition. | |
| 317 | 336 | func NewBreakpoint(ConditionVar *BreakpointCondition) *Breakpoint { | |
| 337 | + | core.LazyRegister(&xNewBreakpoint, "ADW", "adw_breakpoint_new", false) | |
| 318 | 338 | var cls *Breakpoint | |
| 319 | 339 | ||
| 320 | 340 | cret := xNewBreakpoint(ConditionVar) | |
| @@ -373,6 +393,8 @@ var xBreakpointAddSetter func(uintptr, uintptr, string, *gobject.Value) | |||
| 373 | 393 | // | |
| 374 | 394 | // ``` | |
| 375 | 395 | func (x *Breakpoint) AddSetter(ObjectVar *gobject.Object, PropertyVar string, ValueVar *gobject.Value) { | |
| 396 | + | core.LazyRegister(&xBreakpointAddSetter, "ADW", "adw_breakpoint_add_setter", false) | |
| 397 | + | ||
| 376 | 398 | xBreakpointAddSetter(x.GoPointer(), ObjectVar.GoPointer(), PropertyVar, ValueVar) | |
| 377 | 399 | } | |
| 378 | 400 | ||
| @@ -394,6 +416,8 @@ var xBreakpointAddSetters func(uintptr, uintptr, string, ...interface{}) | |||
| 394 | 416 | // | |
| 395 | 417 | // ``` | |
| 396 | 418 | func (x *Breakpoint) AddSetters(FirstObjectVar *gobject.Object, FirstPropertyVar string, varArgs ...interface{}) { | |
| 419 | + | core.LazyRegister(&xBreakpointAddSetters, "ADW", "adw_breakpoint_add_setters", false) | |
| 420 | + | ||
| 397 | 421 | xBreakpointAddSetters(x.GoPointer(), FirstObjectVar.GoPointer(), FirstPropertyVar, varArgs...) | |
| 398 | 422 | } | |
| 399 | 423 | ||
| @@ -403,6 +427,8 @@ var xBreakpointAddSettersValist func(uintptr, uintptr, string, []interface{}) | |||
| 403 | 427 | // | |
| 404 | 428 | // See [method@Breakpoint.add_setters]. | |
| 405 | 429 | func (x *Breakpoint) AddSettersValist(FirstObjectVar *gobject.Object, FirstPropertyVar string, ArgsVar []interface{}) { | |
| 430 | + | core.LazyRegister(&xBreakpointAddSettersValist, "ADW", "adw_breakpoint_add_setters_valist", false) | |
| 431 | + | ||
| 406 | 432 | xBreakpointAddSettersValist(x.GoPointer(), FirstObjectVar.GoPointer(), FirstPropertyVar, ArgsVar) | |
| 407 | 433 | } | |
| 408 | 434 | ||
| @@ -416,6 +442,8 @@ var xBreakpointAddSettersv func(uintptr, int, uintptr, []string, uintptr) | |||
| 416 | 442 | // | |
| 417 | 443 | // This function is meant to be used by language bindings. | |
| 418 | 444 | func (x *Breakpoint) AddSettersv(NSettersVar int, ObjectsVar uintptr, NamesVar []string, ValuesVar uintptr) { | |
| 445 | + | core.LazyRegister(&xBreakpointAddSettersv, "ADW", "adw_breakpoint_add_settersv", false) | |
| 446 | + | ||
| 419 | 447 | xBreakpointAddSettersv(x.GoPointer(), NSettersVar, ObjectsVar, NamesVar, ValuesVar) | |
| 420 | 448 | } | |
| 421 | 449 | ||
| @@ -423,6 +451,8 @@ var xBreakpointGetCondition func(uintptr) uintptr | |||
| 423 | 451 | ||
| 424 | 452 | // Gets the condition for @self. | |
| 425 | 453 | func (x *Breakpoint) GetCondition() *BreakpointCondition { | |
| 454 | + | core.LazyRegister(&xBreakpointGetCondition, "ADW", "adw_breakpoint_get_condition", false) | |
| 455 | + | ||
| 426 | 456 | cret := xBreakpointGetCondition(x.GoPointer()) | |
| 427 | 457 | if cret == 0 { | |
| 428 | 458 | return nil | |
| @@ -434,6 +464,8 @@ var xBreakpointSetCondition func(uintptr, *BreakpointCondition) | |||
| 434 | 464 | ||
| 435 | 465 | // Sets the condition for @self. | |
| 436 | 466 | func (x *Breakpoint) SetCondition(ConditionVar *BreakpointCondition) { | |
| 467 | + | core.LazyRegister(&xBreakpointSetCondition, "ADW", "adw_breakpoint_set_condition", false) | |
| 468 | + | ||
| 437 | 469 | xBreakpointSetCondition(x.GoPointer(), ConditionVar) | |
| 438 | 470 | } | |
| 439 | 471 | ||
| @@ -527,40 +559,4 @@ func (x *Breakpoint) GetBuildableId() string { | |||
| 527 | 559 | func init() { | |
| 528 | 560 | core.SetPackageName("ADW", "libadwaita-1") | |
| 529 | 561 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 530 | - | var libs []uintptr | |
| 531 | - | for _, libPath := range core.GetPaths("ADW") { | |
| 532 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 533 | - | if err != nil { | |
| 534 | - | panic(err) | |
| 535 | - | } | |
| 536 | - | libs = append(libs, lib) | |
| 537 | - | } | |
| 538 | - | ||
| 539 | - | core.PuregoSafeRegister(&xBreakpointConditionLengthTypeGLibType, libs, "adw_breakpoint_condition_length_type_get_type") | |
| 540 | - | ||
| 541 | - | core.PuregoSafeRegister(&xBreakpointConditionRatioTypeGLibType, libs, "adw_breakpoint_condition_ratio_type_get_type") | |
| 542 | - | ||
| 543 | - | core.PuregoSafeRegister(&xBreakpointConditionParse, libs, "adw_breakpoint_condition_parse") | |
| 544 | - | ||
| 545 | - | core.PuregoSafeRegister(&xBreakpointConditionGLibType, libs, "adw_breakpoint_condition_get_type") | |
| 546 | - | ||
| 547 | - | core.PuregoSafeRegister(&xNewBreakpointConditionAnd, libs, "adw_breakpoint_condition_new_and") | |
| 548 | - | core.PuregoSafeRegister(&xNewBreakpointConditionLength, libs, "adw_breakpoint_condition_new_length") | |
| 549 | - | core.PuregoSafeRegister(&xNewBreakpointConditionOr, libs, "adw_breakpoint_condition_new_or") | |
| 550 | - | core.PuregoSafeRegister(&xNewBreakpointConditionRatio, libs, "adw_breakpoint_condition_new_ratio") | |
| 551 | - | ||
| 552 | - | core.PuregoSafeRegister(&xBreakpointConditionCopy, libs, "adw_breakpoint_condition_copy") | |
| 553 | - | core.PuregoSafeRegister(&xBreakpointConditionFree, libs, "adw_breakpoint_condition_free") | |
| 554 | - | core.PuregoSafeRegister(&xBreakpointConditionToString, libs, "adw_breakpoint_condition_to_string") | |
| 555 | - | ||
| 556 | - | core.PuregoSafeRegister(&xBreakpointGLibType, libs, "adw_breakpoint_get_type") | |
| 557 | - | ||
| 558 | - | core.PuregoSafeRegister(&xNewBreakpoint, libs, "adw_breakpoint_new") | |
| 559 | - | ||
| 560 | - | core.PuregoSafeRegister(&xBreakpointAddSetter, libs, "adw_breakpoint_add_setter") | |
| 561 | - | core.PuregoSafeRegister(&xBreakpointAddSetters, libs, "adw_breakpoint_add_setters") | |
| 562 | - | core.PuregoSafeRegister(&xBreakpointAddSettersValist, libs, "adw_breakpoint_add_setters_valist") | |
| 563 | - | core.PuregoSafeRegister(&xBreakpointAddSettersv, libs, "adw_breakpoint_add_settersv") | |
| 564 | - | core.PuregoSafeRegister(&xBreakpointGetCondition, libs, "adw_breakpoint_get_condition") | |
| 565 | - | core.PuregoSafeRegister(&xBreakpointSetCondition, libs, "adw_breakpoint_set_condition") | |
| 566 | 562 | } | |
| @@ -5,7 +5,6 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | - | "github.com/bnema/purego" | |||
| 9 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 10 | "github.com/bnema/puregotk/v4/glib" | 9 | "github.com/bnema/puregotk/v4/glib" | ||
| 11 | "github.com/bnema/puregotk/v4/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -39,6 +38,7 @@ type BreakpointCondition struct { | |||||
| 39 | var xBreakpointConditionGLibType func() types.GType | 38 | var xBreakpointConditionGLibType func() types.GType | ||
| 40 | 39 | ||||
| 41 | func BreakpointConditionGLibType() types.GType { | 40 | func BreakpointConditionGLibType() types.GType { | ||
| 41 | + | core.LazyRegister(&xBreakpointConditionGLibType, "ADW", "adw_breakpoint_condition_get_type", false) | |||
| 42 | return xBreakpointConditionGLibType() | 42 | return xBreakpointConditionGLibType() | ||
| 43 | } | 43 | } | ||
| 44 | 44 | ||||
| @@ -59,6 +59,8 @@ var xNewBreakpointConditionAnd func(*BreakpointCondition, *BreakpointCondition) | |||||
| 59 | // Creates a condition that triggers when @condition_1 and @condition_2 are both | 59 | // Creates a condition that triggers when @condition_1 and @condition_2 are both | ||
| 60 | // true. | 60 | // true. | ||
| 61 | func NewBreakpointConditionAnd(Condition1Var *BreakpointCondition, Condition2Var *BreakpointCondition) *BreakpointCondition { | 61 | func NewBreakpointConditionAnd(Condition1Var *BreakpointCondition, Condition2Var *BreakpointCondition) *BreakpointCondition { | ||
| 62 | + | core.LazyRegister(&xNewBreakpointConditionAnd, "ADW", "adw_breakpoint_condition_new_and", false) | |||
| 63 | + | ||||
| 62 | cret := xNewBreakpointConditionAnd(Condition1Var, Condition2Var) | 64 | cret := xNewBreakpointConditionAnd(Condition1Var, Condition2Var) | ||
| 63 | if cret == 0 { | 65 | if cret == 0 { | ||
| 64 | return nil | 66 | return nil | ||
| @@ -70,6 +72,8 @@ var xNewBreakpointConditionLength func(BreakpointConditionLengthType, float64, L | |||||
| 70 | 72 | ||||
| 71 | // Creates a condition that triggers on length changes. | 73 | // Creates a condition that triggers on length changes. | ||
| 72 | func NewBreakpointConditionLength(TypeVar BreakpointConditionLengthType, ValueVar float64, UnitVar LengthUnit) *BreakpointCondition { | 74 | func NewBreakpointConditionLength(TypeVar BreakpointConditionLengthType, ValueVar float64, UnitVar LengthUnit) *BreakpointCondition { | ||
| 75 | + | core.LazyRegister(&xNewBreakpointConditionLength, "ADW", "adw_breakpoint_condition_new_length", false) | |||
| 76 | + | ||||
| 73 | cret := xNewBreakpointConditionLength(TypeVar, ValueVar, UnitVar) | 77 | cret := xNewBreakpointConditionLength(TypeVar, ValueVar, UnitVar) | ||
| 74 | if cret == 0 { | 78 | if cret == 0 { | ||
| 75 | return nil | 79 | return nil | ||
| @@ -82,6 +86,8 @@ var xNewBreakpointConditionOr func(*BreakpointCondition, *BreakpointCondition) u | |||||
| 82 | // Creates a condition that triggers when either @condition_1 or @condition_2 is | 86 | // Creates a condition that triggers when either @condition_1 or @condition_2 is | ||
| 83 | // true. | 87 | // true. | ||
| 84 | func NewBreakpointConditionOr(Condition1Var *BreakpointCondition, Condition2Var *BreakpointCondition) *BreakpointCondition { | 88 | func NewBreakpointConditionOr(Condition1Var *BreakpointCondition, Condition2Var *BreakpointCondition) *BreakpointCondition { | ||
| 89 | + | core.LazyRegister(&xNewBreakpointConditionOr, "ADW", "adw_breakpoint_condition_new_or", false) | |||
| 90 | + | ||||
| 85 | cret := xNewBreakpointConditionOr(Condition1Var, Condition2Var) | 91 | cret := xNewBreakpointConditionOr(Condition1Var, Condition2Var) | ||
| 86 | if cret == 0 { | 92 | if cret == 0 { | ||
| 87 | return nil | 93 | return nil | ||
| @@ -95,6 +101,8 @@ var xNewBreakpointConditionRatio func(BreakpointConditionRatioType, int, int) ui | |||||
| 95 | // | 101 | // | ||
| 96 | // The ratio is represented as @width divided by @height. | 102 | // The ratio is represented as @width divided by @height. | ||
| 97 | func NewBreakpointConditionRatio(TypeVar BreakpointConditionRatioType, WidthVar int, HeightVar int) *BreakpointCondition { | 103 | func NewBreakpointConditionRatio(TypeVar BreakpointConditionRatioType, WidthVar int, HeightVar int) *BreakpointCondition { | ||
| 104 | + | core.LazyRegister(&xNewBreakpointConditionRatio, "ADW", "adw_breakpoint_condition_new_ratio", false) | |||
| 105 | + | ||||
| 98 | cret := xNewBreakpointConditionRatio(TypeVar, WidthVar, HeightVar) | 106 | cret := xNewBreakpointConditionRatio(TypeVar, WidthVar, HeightVar) | ||
| 99 | if cret == 0 { | 107 | if cret == 0 { | ||
| 100 | return nil | 108 | return nil | ||
| @@ -106,6 +114,8 @@ var xBreakpointConditionCopy func(uintptr) uintptr | |||||
| 106 | 114 | ||||
| 107 | // Copies @self. | 115 | // Copies @self. | ||
| 108 | func (x *BreakpointCondition) Copy() *BreakpointCondition { | 116 | func (x *BreakpointCondition) Copy() *BreakpointCondition { | ||
| 117 | + | core.LazyRegister(&xBreakpointConditionCopy, "ADW", "adw_breakpoint_condition_copy", false) | |||
| 118 | + | ||||
| 109 | cret := xBreakpointConditionCopy(x.GoPointer()) | 119 | cret := xBreakpointConditionCopy(x.GoPointer()) | ||
| 110 | if cret == 0 { | 120 | if cret == 0 { | ||
| 111 | return nil | 121 | return nil | ||
| @@ -117,6 +127,8 @@ var xBreakpointConditionFree func(uintptr) | |||||
| 117 | 127 | ||||
| 118 | // Frees @self. | 128 | // Frees @self. | ||
| 119 | func (x *BreakpointCondition) Free() { | 129 | func (x *BreakpointCondition) Free() { | ||
| 130 | + | core.LazyRegister(&xBreakpointConditionFree, "ADW", "adw_breakpoint_condition_free", false) | |||
| 131 | + | ||||
| 120 | xBreakpointConditionFree(x.GoPointer()) | 132 | xBreakpointConditionFree(x.GoPointer()) | ||
| 121 | } | 133 | } | ||
| 122 | 134 | ||||
| @@ -126,6 +138,8 @@ var xBreakpointConditionToString func(uintptr) string | |||||
| 126 | // | 138 | // | ||
| 127 | // The returned string can be parsed by [func@BreakpointCondition.parse]. | 139 | // The returned string can be parsed by [func@BreakpointCondition.parse]. | ||
| 128 | func (x *BreakpointCondition) ToString() string { | 140 | func (x *BreakpointCondition) ToString() string { | ||
| 141 | + | core.LazyRegister(&xBreakpointConditionToString, "ADW", "adw_breakpoint_condition_to_string", false) | |||
| 142 | + | ||||
| 129 | cret := xBreakpointConditionToString(x.GoPointer()) | 143 | cret := xBreakpointConditionToString(x.GoPointer()) | ||
| 130 | return cret | 144 | return cret | ||
| 131 | } | 145 | } | ||
| @@ -140,6 +154,7 @@ type BreakpointConditionLengthType int | |||||
| 140 | var xBreakpointConditionLengthTypeGLibType func() types.GType | 154 | var xBreakpointConditionLengthTypeGLibType func() types.GType | ||
| 141 | 155 | ||||
| 142 | func BreakpointConditionLengthTypeGLibType() types.GType { | 156 | func BreakpointConditionLengthTypeGLibType() types.GType { | ||
| 157 | + | core.LazyRegister(&xBreakpointConditionLengthTypeGLibType, "ADW", "adw_breakpoint_condition_length_type_get_type", false) | |||
| 143 | return xBreakpointConditionLengthTypeGLibType() | 158 | return xBreakpointConditionLengthTypeGLibType() | ||
| 144 | } | 159 | } | ||
| 145 | 160 | ||||
| @@ -169,6 +184,7 @@ type BreakpointConditionRatioType int | |||||
| 169 | var xBreakpointConditionRatioTypeGLibType func() types.GType | 184 | var xBreakpointConditionRatioTypeGLibType func() types.GType | ||
| 170 | 185 | ||||
| 171 | func BreakpointConditionRatioTypeGLibType() types.GType { | 186 | func BreakpointConditionRatioTypeGLibType() types.GType { | ||
| 187 | + | core.LazyRegister(&xBreakpointConditionRatioTypeGLibType, "ADW", "adw_breakpoint_condition_ratio_type_get_type", false) | |||
| 172 | return xBreakpointConditionRatioTypeGLibType() | 188 | return xBreakpointConditionRatioTypeGLibType() | ||
| 173 | } | 189 | } | ||
| 174 | 190 | ||||
| @@ -240,6 +256,8 @@ var xBreakpointConditionParse func(string) uintptr | |||||
| 240 | // | 256 | // | ||
| 241 | // If parentheses are omitted, the first operator takes priority. | 257 | // If parentheses are omitted, the first operator takes priority. | ||
| 242 | func BreakpointConditionParse(StrVar string) *BreakpointCondition { | 258 | func BreakpointConditionParse(StrVar string) *BreakpointCondition { | ||
| 259 | + | core.LazyRegister(&xBreakpointConditionParse, "ADW", "adw_breakpoint_condition_parse", false) | |||
| 260 | + | ||||
| 243 | cret := xBreakpointConditionParse(StrVar) | 261 | cret := xBreakpointConditionParse(StrVar) | ||
| 244 | if cret == 0 { | 262 | if cret == 0 { | ||
| 245 | return nil | 263 | return nil | ||
| @@ -302,6 +320,7 @@ type Breakpoint struct { | |||||
| 302 | var xBreakpointGLibType func() types.GType | 320 | var xBreakpointGLibType func() types.GType | ||
| 303 | 321 | ||||
| 304 | func BreakpointGLibType() types.GType { | 322 | func BreakpointGLibType() types.GType { | ||
| 323 | + | core.LazyRegister(&xBreakpointGLibType, "ADW", "adw_breakpoint_get_type", false) | |||
| 305 | return xBreakpointGLibType() | 324 | return xBreakpointGLibType() | ||
| 306 | } | 325 | } | ||
| 307 | 326 | ||||
| @@ -315,6 +334,7 @@ var xNewBreakpoint func(*BreakpointCondition) uintptr | |||||
| 315 | 334 | ||||
| 316 | // Creates a new `AdwBreakpoint` with @condition. | 335 | // Creates a new `AdwBreakpoint` with @condition. | ||
| 317 | func NewBreakpoint(ConditionVar *BreakpointCondition) *Breakpoint { | 336 | func NewBreakpoint(ConditionVar *BreakpointCondition) *Breakpoint { | ||
| 337 | + | core.LazyRegister(&xNewBreakpoint, "ADW", "adw_breakpoint_new", false) | |||
| 318 | var cls *Breakpoint | 338 | var cls *Breakpoint | ||
| 319 | 339 | ||||
| 320 | cret := xNewBreakpoint(ConditionVar) | 340 | cret := xNewBreakpoint(ConditionVar) | ||
| @@ -373,6 +393,8 @@ var xBreakpointAddSetter func(uintptr, uintptr, string, *gobject.Value) | |||||
| 373 | // | 393 | // | ||
| 374 | // ``` | 394 | // ``` | ||
| 375 | func (x *Breakpoint) AddSetter(ObjectVar *gobject.Object, PropertyVar string, ValueVar *gobject.Value) { | 395 | func (x *Breakpoint) AddSetter(ObjectVar *gobject.Object, PropertyVar string, ValueVar *gobject.Value) { | ||
| 396 | + | core.LazyRegister(&xBreakpointAddSetter, "ADW", "adw_breakpoint_add_setter", false) | |||
| 397 | + | ||||
| 376 | xBreakpointAddSetter(x.GoPointer(), ObjectVar.GoPointer(), PropertyVar, ValueVar) | 398 | xBreakpointAddSetter(x.GoPointer(), ObjectVar.GoPointer(), PropertyVar, ValueVar) | ||
| 377 | } | 399 | } | ||
| 378 | 400 | ||||
| @@ -394,6 +416,8 @@ var xBreakpointAddSetters func(uintptr, uintptr, string, ...interface{}) | |||||
| 394 | // | 416 | // | ||
| 395 | // ``` | 417 | // ``` | ||
| 396 | func (x *Breakpoint) AddSetters(FirstObjectVar *gobject.Object, FirstPropertyVar string, varArgs ...interface{}) { | 418 | func (x *Breakpoint) AddSetters(FirstObjectVar *gobject.Object, FirstPropertyVar string, varArgs ...interface{}) { | ||
| 419 | + | core.LazyRegister(&xBreakpointAddSetters, "ADW", "adw_breakpoint_add_setters", false) | |||
| 420 | + | ||||
| 397 | xBreakpointAddSetters(x.GoPointer(), FirstObjectVar.GoPointer(), FirstPropertyVar, varArgs...) | 421 | xBreakpointAddSetters(x.GoPointer(), FirstObjectVar.GoPointer(), FirstPropertyVar, varArgs...) | ||
| 398 | } | 422 | } | ||
| 399 | 423 | ||||
| @@ -403,6 +427,8 @@ var xBreakpointAddSettersValist func(uintptr, uintptr, string, []interface{}) | |||||
| 403 | // | 427 | // | ||
| 404 | // See [method@Breakpoint.add_setters]. | 428 | // See [method@Breakpoint.add_setters]. | ||
| 405 | func (x *Breakpoint) AddSettersValist(FirstObjectVar *gobject.Object, FirstPropertyVar string, ArgsVar []interface{}) { | 429 | func (x *Breakpoint) AddSettersValist(FirstObjectVar *gobject.Object, FirstPropertyVar string, ArgsVar []interface{}) { | ||
| 430 | + | core.LazyRegister(&xBreakpointAddSettersValist, "ADW", "adw_breakpoint_add_setters_valist", false) | |||
| 431 | + | ||||
| 406 | xBreakpointAddSettersValist(x.GoPointer(), FirstObjectVar.GoPointer(), FirstPropertyVar, ArgsVar) | 432 | xBreakpointAddSettersValist(x.GoPointer(), FirstObjectVar.GoPointer(), FirstPropertyVar, ArgsVar) | ||
| 407 | } | 433 | } | ||
| 408 | 434 | ||||
| @@ -416,6 +442,8 @@ var xBreakpointAddSettersv func(uintptr, int, uintptr, []string, uintptr) | |||||
| 416 | // | 442 | // | ||
| 417 | // This function is meant to be used by language bindings. | 443 | // This function is meant to be used by language bindings. | ||
| 418 | func (x *Breakpoint) AddSettersv(NSettersVar int, ObjectsVar uintptr, NamesVar []string, ValuesVar uintptr) { | 444 | func (x *Breakpoint) AddSettersv(NSettersVar int, ObjectsVar uintptr, NamesVar []string, ValuesVar uintptr) { | ||
| 445 | + | core.LazyRegister(&xBreakpointAddSettersv, "ADW", "adw_breakpoint_add_settersv", false) | |||
| 446 | + | ||||
| 419 | xBreakpointAddSettersv(x.GoPointer(), NSettersVar, ObjectsVar, NamesVar, ValuesVar) | 447 | xBreakpointAddSettersv(x.GoPointer(), NSettersVar, ObjectsVar, NamesVar, ValuesVar) | ||
| 420 | } | 448 | } | ||
| 421 | 449 | ||||
| @@ -423,6 +451,8 @@ var xBreakpointGetCondition func(uintptr) uintptr | |||||
| 423 | 451 | ||||
| 424 | // Gets the condition for @self. | 452 | // Gets the condition for @self. | ||
| 425 | func (x *Breakpoint) GetCondition() *BreakpointCondition { | 453 | func (x *Breakpoint) GetCondition() *BreakpointCondition { | ||
| 454 | + | core.LazyRegister(&xBreakpointGetCondition, "ADW", "adw_breakpoint_get_condition", false) | |||
| 455 | + | ||||
| 426 | cret := xBreakpointGetCondition(x.GoPointer()) | 456 | cret := xBreakpointGetCondition(x.GoPointer()) | ||
| 427 | if cret == 0 { | 457 | if cret == 0 { | ||
| 428 | return nil | 458 | return nil | ||
| @@ -434,6 +464,8 @@ var xBreakpointSetCondition func(uintptr, *BreakpointCondition) | |||||
| 434 | 464 | ||||
| 435 | // Sets the condition for @self. | 465 | // Sets the condition for @self. | ||
| 436 | func (x *Breakpoint) SetCondition(ConditionVar *BreakpointCondition) { | 466 | func (x *Breakpoint) SetCondition(ConditionVar *BreakpointCondition) { | ||
| 467 | + | core.LazyRegister(&xBreakpointSetCondition, "ADW", "adw_breakpoint_set_condition", false) | |||
| 468 | + | ||||
| 437 | xBreakpointSetCondition(x.GoPointer(), ConditionVar) | 469 | xBreakpointSetCondition(x.GoPointer(), ConditionVar) | ||
| 438 | } | 470 | } | ||
| 439 | 471 | ||||
| @@ -527,40 +559,4 @@ func (x *Breakpoint) GetBuildableId() string { | |||||
| 527 | func init() { | 559 | func init() { | ||
| 528 | core.SetPackageName("ADW", "libadwaita-1") | 560 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 529 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 561 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 530 | - | var libs []uintptr | |||
| 531 | - | for _, libPath := range core.GetPaths("ADW") { | |||
| 532 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 533 | - | if err != nil { | |||
| 534 | - | panic(err) | |||
| 535 | - | } | |||
| 536 | - | libs = append(libs, lib) | |||
| 537 | - | } | |||
| 538 | - | ||||
| 539 | - | core.PuregoSafeRegister(&xBreakpointConditionLengthTypeGLibType, libs, "adw_breakpoint_condition_length_type_get_type") | |||
| 540 | - | ||||
| 541 | - | core.PuregoSafeRegister(&xBreakpointConditionRatioTypeGLibType, libs, "adw_breakpoint_condition_ratio_type_get_type") | |||
| 542 | - | ||||
| 543 | - | core.PuregoSafeRegister(&xBreakpointConditionParse, libs, "adw_breakpoint_condition_parse") | |||
| 544 | - | ||||
| 545 | - | core.PuregoSafeRegister(&xBreakpointConditionGLibType, libs, "adw_breakpoint_condition_get_type") | |||
| 546 | - | ||||
| 547 | - | core.PuregoSafeRegister(&xNewBreakpointConditionAnd, libs, "adw_breakpoint_condition_new_and") | |||
| 548 | - | core.PuregoSafeRegister(&xNewBreakpointConditionLength, libs, "adw_breakpoint_condition_new_length") | |||
| 549 | - | core.PuregoSafeRegister(&xNewBreakpointConditionOr, libs, "adw_breakpoint_condition_new_or") | |||
| 550 | - | core.PuregoSafeRegister(&xNewBreakpointConditionRatio, libs, "adw_breakpoint_condition_new_ratio") | |||
| 551 | - | ||||
| 552 | - | core.PuregoSafeRegister(&xBreakpointConditionCopy, libs, "adw_breakpoint_condition_copy") | |||
| 553 | - | core.PuregoSafeRegister(&xBreakpointConditionFree, libs, "adw_breakpoint_condition_free") | |||
| 554 | - | core.PuregoSafeRegister(&xBreakpointConditionToString, libs, "adw_breakpoint_condition_to_string") | |||
| 555 | - | ||||
| 556 | - | core.PuregoSafeRegister(&xBreakpointGLibType, libs, "adw_breakpoint_get_type") | |||
| 557 | - | ||||
| 558 | - | core.PuregoSafeRegister(&xNewBreakpoint, libs, "adw_breakpoint_new") | |||
| 559 | - | ||||
| 560 | - | core.PuregoSafeRegister(&xBreakpointAddSetter, libs, "adw_breakpoint_add_setter") | |||
| 561 | - | core.PuregoSafeRegister(&xBreakpointAddSetters, libs, "adw_breakpoint_add_setters") | |||
| 562 | - | core.PuregoSafeRegister(&xBreakpointAddSettersValist, libs, "adw_breakpoint_add_setters_valist") | |||
| 563 | - | core.PuregoSafeRegister(&xBreakpointAddSettersv, libs, "adw_breakpoint_add_settersv") | |||
| 564 | - | core.PuregoSafeRegister(&xBreakpointGetCondition, libs, "adw_breakpoint_get_condition") | |||
| 565 | - | core.PuregoSafeRegister(&xBreakpointSetCondition, libs, "adw_breakpoint_set_condition") | |||
| 566 | } | 562 | } | ||