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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocesslauncher.go +34 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtask.go +70 -52 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpconnection.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpwrapperconnection.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtestdbus.go +16 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthemedicon.go +10 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedresolver.go +7 -0 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedsocketservice.go +2 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsbackend.go +69 -33 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlscertificate.go +25 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsclientconnection.go +55 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsconnection.go +56 -46 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsdatabase.go +51 -48 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsfiledatabase.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsinteraction.go +27 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlspassword.go +20 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsserverconnection.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixconnection.go +11 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixcredentialsmessage.go +6 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixfdlist.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixsocketaddress.go +14 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvfs.go +18 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolume.go +143 -58 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolumemonitor.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibcompressor.go +9 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibdecompressor.go +3 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/main.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gallocator.go +32 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/garray.go +82 -59 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gasyncqueue.go +56 -39 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gatomic.go +43 -34 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbacktrace.go +5 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbase64.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbitlock.go +23 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbookmarkfile.go +69 -61 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcache.go +10 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcharset.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gchecksum.go +23 -25 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcompletion.go +14 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gconvert.go +25 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdataset.go +36 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdate.go +103 -65 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdatetime.go +107 -66 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdir.go +12 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/genviron.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gerror.go +30 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gfileutils.go +45 -38
| @@ -1,10 +1,7 @@ | |||
| 1 | 1 | // Package glib was automatically generated by github.com/bnema/puregotk DO NOT EDIT | |
| 2 | 2 | package glib | |
| 3 | 3 | ||
| 4 | - | import ( | |
| 5 | - | "github.com/bnema/purego" | |
| 6 | - | "github.com/bnema/puregotk/pkg/core" | |
| 7 | - | ) | |
| 4 | + | import "github.com/bnema/puregotk/pkg/core" | |
| 8 | 5 | ||
| 9 | 6 | // Flags to pass to g_file_set_contents_full() to affect its safety and | |
| 10 | 7 | // performance. | |
| @@ -170,6 +167,8 @@ var xBasename func(string) string | |||
| 170 | 167 | // components. It returns a pointer into the given file name | |
| 171 | 168 | // string. | |
| 172 | 169 | func Basename(FileNameVar string) string { | |
| 170 | + | core.LazyRegister(&xBasename, "GLIB", "g_basename", false) | |
| 171 | + | ||
| 173 | 172 | cret := xBasename(FileNameVar) | |
| 174 | 173 | return cret | |
| 175 | 174 | } | |
| @@ -195,6 +194,8 @@ var xBuildFilename func(string, ...interface{}) string | |||
| 195 | 194 | // If you are building a path programmatically you may want to use | |
| 196 | 195 | // #GPathBuf instead. | |
| 197 | 196 | func BuildFilename(FirstElementVar string, varArgs ...interface{}) string { | |
| 197 | + | core.LazyRegister(&xBuildFilename, "GLIB", "g_build_filename", false) | |
| 198 | + | ||
| 198 | 199 | cret := xBuildFilename(FirstElementVar, varArgs...) | |
| 199 | 200 | return cret | |
| 200 | 201 | } | |
| @@ -210,6 +211,8 @@ var xBuildFilenameValist func(string, []interface{}) string | |||
| 210 | 211 | // This function is mainly meant for implementing other variadic arguments | |
| 211 | 212 | // functions. | |
| 212 | 213 | func BuildFilenameValist(FirstElementVar string, ArgsVar []interface{}) string { | |
| 214 | + | core.LazyRegister(&xBuildFilenameValist, "GLIB", "g_build_filename_valist", false) | |
| 215 | + | ||
| 213 | 216 | cret := xBuildFilenameValist(FirstElementVar, ArgsVar) | |
| 214 | 217 | return cret | |
| 215 | 218 | } | |
| @@ -226,6 +229,8 @@ var xBuildFilenamev func([]string) string | |||
| 226 | 229 | // If you are building a path programmatically you may want to use | |
| 227 | 230 | // #GPathBuf instead. | |
| 228 | 231 | func BuildFilenamev(ArgsVar []string) string { | |
| 232 | + | core.LazyRegister(&xBuildFilenamev, "GLIB", "g_build_filenamev", false) | |
| 233 | + | ||
| 229 | 234 | cret := xBuildFilenamev(ArgsVar) | |
| 230 | 235 | return cret | |
| 231 | 236 | } | |
| @@ -261,6 +266,8 @@ var xBuildPath func(string, string, ...interface{}) string | |||
| 261 | 266 | // copies of the separator, elements consisting only of copies | |
| 262 | 267 | // of the separator are ignored. | |
| 263 | 268 | func BuildPath(SeparatorVar string, FirstElementVar string, varArgs ...interface{}) string { | |
| 269 | + | core.LazyRegister(&xBuildPath, "GLIB", "g_build_path", false) | |
| 270 | + | ||
| 264 | 271 | cret := xBuildPath(SeparatorVar, FirstElementVar, varArgs...) | |
| 265 | 272 | return cret | |
| 266 | 273 | } | |
| @@ -272,6 +279,8 @@ var xBuildPathv func(string, []string) string | |||
| 272 | 279 | // | |
| 273 | 280 | // This function is mainly meant for language bindings. | |
| 274 | 281 | func BuildPathv(SeparatorVar string, ArgsVar []string) string { | |
| 282 | + | core.LazyRegister(&xBuildPathv, "GLIB", "g_build_pathv", false) | |
| 283 | + | ||
| 275 | 284 | cret := xBuildPathv(SeparatorVar, ArgsVar) | |
| 276 | 285 | return cret | |
| 277 | 286 | } | |
| @@ -293,6 +302,8 @@ var xCanonicalizeFilename func(string, uintptr) string | |||
| 293 | 302 | // | |
| 294 | 303 | // No file system I/O is done. | |
| 295 | 304 | func CanonicalizeFilename(FilenameVar string, RelativeToVar *string) string { | |
| 305 | + | core.LazyRegister(&xCanonicalizeFilename, "GLIB", "g_canonicalize_filename", false) | |
| 306 | + | ||
| 296 | 307 | RelativeToVarPtr := core.GStrdupNullable(RelativeToVar) | |
| 297 | 308 | defer core.GFreeNullable(RelativeToVarPtr) | |
| 298 | 309 | ||
| @@ -314,6 +325,7 @@ var xDirMakeTmp func(uintptr, **Error) string | |||
| 314 | 325 | // Note that in contrast to g_mkdtemp() (and mkdtemp()) @tmpl is not | |
| 315 | 326 | // modified, and might thus be a read-only literal string. | |
| 316 | 327 | func DirMakeTmp(TmplVar *string) (string, error) { | |
| 328 | + | core.LazyRegister(&xDirMakeTmp, "GLIB", "g_dir_make_tmp", false) | |
| 317 | 329 | var cerr *Error | |
| 318 | 330 | ||
| 319 | 331 | TmplVarPtr := core.GStrdupNullable(TmplVar) | |
| @@ -338,6 +350,8 @@ var xFileErrorFromErrno func(int) FileError | |||
| 338 | 350 | // from a function that manipulates files. So you would use | |
| 339 | 351 | // g_file_error_from_errno() when constructing a #GError. | |
| 340 | 352 | func FileErrorFromErrno(ErrNoVar int) FileError { | |
| 353 | + | core.LazyRegister(&xFileErrorFromErrno, "GLIB", "g_file_error_from_errno", false) | |
| 354 | + | ||
| 341 | 355 | cret := xFileErrorFromErrno(ErrNoVar) | |
| 342 | 356 | return cret | |
| 343 | 357 | } | |
| @@ -355,6 +369,7 @@ var xFileGetContents func(string, *[]byte, *uint, **Error) bool | |||
| 355 | 369 | // codes are those in the #GFileError enumeration. In the error case, | |
| 356 | 370 | // @contents is set to %NULL and @length is set to zero. | |
| 357 | 371 | func FileGetContents(FilenameVar string, ContentsVar *[]byte, LengthVar *uint) (bool, error) { | |
| 372 | + | core.LazyRegister(&xFileGetContents, "GLIB", "g_file_get_contents", false) | |
| 358 | 373 | var cerr *Error | |
| 359 | 374 | ||
| 360 | 375 | cret := xFileGetContents(FilenameVar, ContentsVar, LengthVar, &cerr) | |
| @@ -383,6 +398,7 @@ var xFileOpenTmp func(uintptr, *string, **Error) int | |||
| 383 | 398 | // when not needed any longer. The returned name is in the GLib file | |
| 384 | 399 | // name encoding. | |
| 385 | 400 | func FileOpenTmp(TmplVar *string, NameUsedVar *string) (int, error) { | |
| 401 | + | core.LazyRegister(&xFileOpenTmp, "GLIB", "g_file_open_tmp", false) | |
| 386 | 402 | var cerr *Error | |
| 387 | 403 | ||
| 388 | 404 | TmplVarPtr := core.GStrdupNullable(TmplVar) | |
| @@ -424,6 +440,7 @@ var xFileReadLink func(string, **Error) string | |||
| 424 | 440 | // | |
| 425 | 441 | // ]| | |
| 426 | 442 | func FileReadLink(FilenameVar string) (string, error) { | |
| 443 | + | core.LazyRegister(&xFileReadLink, "GLIB", "g_file_read_link", false) | |
| 427 | 444 | var cerr *Error | |
| 428 | 445 | ||
| 429 | 446 | cret := xFileReadLink(FilenameVar, &cerr) | |
| @@ -440,6 +457,7 @@ var xFileSetContents func(string, []byte, int, **Error) bool | |||
| 440 | 457 | // `G_FILE_SET_CONTENTS_CONSISTENT | G_FILE_SET_CONTENTS_ONLY_EXISTING` and | |
| 441 | 458 | // `mode` set to `0666`. | |
| 442 | 459 | func FileSetContents(FilenameVar string, ContentsVar []byte, LengthVar int) (bool, error) { | |
| 460 | + | core.LazyRegister(&xFileSetContents, "GLIB", "g_file_set_contents", false) | |
| 443 | 461 | var cerr *Error | |
| 444 | 462 | ||
| 445 | 463 | cret := xFileSetContents(FilenameVar, ContentsVar, LengthVar, &cerr) | |
| @@ -506,6 +524,7 @@ var xFileSetContentsFull func(string, []byte, int, FileSetContentsFlags, int, ** | |||
| 506 | 524 | // permissions from @mode. Otherwise, the permissions of the existing file will | |
| 507 | 525 | // remain unchanged. | |
| 508 | 526 | func FileSetContentsFull(FilenameVar string, ContentsVar []byte, LengthVar int, FlagsVar FileSetContentsFlags, ModeVar int) (bool, error) { | |
| 527 | + | core.LazyRegister(&xFileSetContentsFull, "GLIB", "g_file_set_contents_full", false) | |
| 509 | 528 | var cerr *Error | |
| 510 | 529 | ||
| 511 | 530 | cret := xFileSetContentsFull(FilenameVar, ContentsVar, LengthVar, FlagsVar, ModeVar, &cerr) | |
| @@ -579,6 +598,8 @@ var xNewFileTest func(string, FileTest) bool | |||
| 579 | 598 | // its name indicates that it is executable, checking for well-known | |
| 580 | 599 | // extensions and those listed in the `PATHEXT` environment variable. | |
| 581 | 600 | func NewFileTest(FilenameVar string, TestVar FileTest) bool { | |
| 601 | + | core.LazyRegister(&xNewFileTest, "GLIB", "g_file_test", false) | |
| 602 | + | ||
| 582 | 603 | cret := xNewFileTest(FilenameVar, TestVar) | |
| 583 | 604 | return cret | |
| 584 | 605 | } | |
| @@ -596,6 +617,8 @@ var xGetCurrentDir func() string | |||
| 596 | 617 | // the current directory. This can make a difference in the case that | |
| 597 | 618 | // the current directory is the target of a symbolic link. | |
| 598 | 619 | func GetCurrentDir() string { | |
| 620 | + | core.LazyRegister(&xGetCurrentDir, "GLIB", "g_get_current_dir", false) | |
| 621 | + | ||
| 599 | 622 | cret := xGetCurrentDir() | |
| 600 | 623 | return cret | |
| 601 | 624 | } | |
| @@ -605,6 +628,8 @@ var xMkdirWithParents func(string, int) int | |||
| 605 | 628 | // Create a directory if it doesn't already exist. Create intermediate | |
| 606 | 629 | // parent directories as needed, too. | |
| 607 | 630 | func MkdirWithParents(PathnameVar string, ModeVar int) int { | |
| 631 | + | core.LazyRegister(&xMkdirWithParents, "GLIB", "g_mkdir_with_parents", false) | |
| 632 | + | ||
| 608 | 633 | cret := xMkdirWithParents(PathnameVar, ModeVar) | |
| 609 | 634 | return cret | |
| 610 | 635 | } | |
| @@ -628,6 +653,8 @@ var xMkdtemp func(string) string | |||
| 628 | 653 | // directory returned by g_get_tmp_dir(), you might want to use | |
| 629 | 654 | // g_dir_make_tmp() instead. | |
| 630 | 655 | func Mkdtemp(TmplVar string) string { | |
| 656 | + | core.LazyRegister(&xMkdtemp, "GLIB", "g_mkdtemp", false) | |
| 657 | + | ||
| 631 | 658 | cret := xMkdtemp(TmplVar) | |
| 632 | 659 | return cret | |
| 633 | 660 | } | |
| @@ -651,6 +678,8 @@ var xMkdtempFull func(string, int) string | |||
| 651 | 678 | // directory returned by g_get_tmp_dir(), you might want to use | |
| 652 | 679 | // g_dir_make_tmp() instead. | |
| 653 | 680 | func MkdtempFull(TmplVar string, ModeVar int) string { | |
| 681 | + | core.LazyRegister(&xMkdtempFull, "GLIB", "g_mkdtemp_full", false) | |
| 682 | + | ||
| 654 | 683 | cret := xMkdtempFull(TmplVar, ModeVar) | |
| 655 | 684 | return cret | |
| 656 | 685 | } | |
| @@ -669,6 +698,8 @@ var xMkstemp func(string) int | |||
| 669 | 698 | // didn't exist. The string should be in the GLib file name encoding. | |
| 670 | 699 | // Most importantly, on Windows it should be in UTF-8. | |
| 671 | 700 | func Mkstemp(TmplVar string) int { | |
| 701 | + | core.LazyRegister(&xMkstemp, "GLIB", "g_mkstemp", false) | |
| 702 | + | ||
| 672 | 703 | cret := xMkstemp(TmplVar) | |
| 673 | 704 | return cret | |
| 674 | 705 | } | |
| @@ -688,6 +719,8 @@ var xMkstempFull func(string, int, int) int | |||
| 688 | 719 | // The string should be in the GLib file name encoding. Most importantly, | |
| 689 | 720 | // on Windows it should be in UTF-8. | |
| 690 | 721 | func MkstempFull(TmplVar string, FlagsVar int, ModeVar int) int { | |
| 722 | + | core.LazyRegister(&xMkstempFull, "GLIB", "g_mkstemp_full", false) | |
| 723 | + | ||
| 691 | 724 | cret := xMkstempFull(TmplVar, FlagsVar, ModeVar) | |
| 692 | 725 | return cret | |
| 693 | 726 | } | |
| @@ -701,6 +734,8 @@ var xPathGetBasename func(string) string | |||
| 701 | 734 | // separators (and on Windows, possibly a drive letter), a single | |
| 702 | 735 | // separator is returned. If @file_name is empty, it gets ".". | |
| 703 | 736 | func PathGetBasename(FileNameVar string) string { | |
| 737 | + | core.LazyRegister(&xPathGetBasename, "GLIB", "g_path_get_basename", false) | |
| 738 | + | ||
| 704 | 739 | cret := xPathGetBasename(FileNameVar) | |
| 705 | 740 | return cret | |
| 706 | 741 | } | |
| @@ -714,6 +749,8 @@ var xPathGetDirname func(string) string | |||
| 714 | 749 | // If the file name has no directory components "." is returned. | |
| 715 | 750 | // The returned string should be freed when no longer needed. | |
| 716 | 751 | func PathGetDirname(FileNameVar string) string { | |
| 752 | + | core.LazyRegister(&xPathGetDirname, "GLIB", "g_path_get_dirname", false) | |
| 753 | + | ||
| 717 | 754 | cret := xPathGetDirname(FileNameVar) | |
| 718 | 755 | return cret | |
| 719 | 756 | } | |
| @@ -745,6 +782,8 @@ var xPathIsAbsolute func(string) bool | |||
| 745 | 782 | // either. Such paths should be avoided, or need to be handled using | |
| 746 | 783 | // Windows-specific code. | |
| 747 | 784 | func PathIsAbsolute(FileNameVar string) bool { | |
| 785 | + | core.LazyRegister(&xPathIsAbsolute, "GLIB", "g_path_is_absolute", false) | |
| 786 | + | ||
| 748 | 787 | cret := xPathIsAbsolute(FileNameVar) | |
| 749 | 788 | return cret | |
| 750 | 789 | } | |
| @@ -755,6 +794,8 @@ var xPathSkipRoot func(string) string | |||
| 755 | 794 | // i.e. after the "/" in UNIX or "C:\" under Windows. If @file_name | |
| 756 | 795 | // is not an absolute path it returns %NULL. | |
| 757 | 796 | func PathSkipRoot(FileNameVar string) string { | |
| 797 | + | core.LazyRegister(&xPathSkipRoot, "GLIB", "g_path_skip_root", false) | |
| 798 | + | ||
| 758 | 799 | cret := xPathSkipRoot(FileNameVar) | |
| 759 | 800 | return cret | |
| 760 | 801 | } | |
| @@ -762,38 +803,4 @@ func PathSkipRoot(FileNameVar string) string { | |||
| 762 | 803 | func init() { | |
| 763 | 804 | core.SetPackageName("GLIB", "glib-2.0") | |
| 764 | 805 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | |
| 765 | - | var libs []uintptr | |
| 766 | - | for _, libPath := range core.GetPaths("GLIB") { | |
| 767 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 768 | - | if err != nil { | |
| 769 | - | panic(err) | |
| 770 | - | } | |
| 771 | - | libs = append(libs, lib) | |
| 772 | - | } | |
| 773 | - | ||
| 774 | - | core.PuregoSafeRegister(&xBasename, libs, "g_basename") | |
| 775 | - | core.PuregoSafeRegister(&xBuildFilename, libs, "g_build_filename") | |
| 776 | - | core.PuregoSafeRegister(&xBuildFilenameValist, libs, "g_build_filename_valist") | |
| 777 | - | core.PuregoSafeRegister(&xBuildFilenamev, libs, "g_build_filenamev") | |
| 778 | - | core.PuregoSafeRegister(&xBuildPath, libs, "g_build_path") | |
| 779 | - | core.PuregoSafeRegister(&xBuildPathv, libs, "g_build_pathv") | |
| 780 | - | core.PuregoSafeRegister(&xCanonicalizeFilename, libs, "g_canonicalize_filename") | |
| 781 | - | core.PuregoSafeRegister(&xDirMakeTmp, libs, "g_dir_make_tmp") | |
| 782 | - | core.PuregoSafeRegister(&xFileErrorFromErrno, libs, "g_file_error_from_errno") | |
| 783 | - | core.PuregoSafeRegister(&xFileGetContents, libs, "g_file_get_contents") | |
| 784 | - | core.PuregoSafeRegister(&xFileOpenTmp, libs, "g_file_open_tmp") | |
| 785 | - | core.PuregoSafeRegister(&xFileReadLink, libs, "g_file_read_link") | |
| 786 | - | core.PuregoSafeRegister(&xFileSetContents, libs, "g_file_set_contents") | |
| 787 | - | core.PuregoSafeRegister(&xFileSetContentsFull, libs, "g_file_set_contents_full") | |
| 788 | - | core.PuregoSafeRegister(&xNewFileTest, libs, "g_file_test") | |
| 789 | - | core.PuregoSafeRegister(&xGetCurrentDir, libs, "g_get_current_dir") | |
| 790 | - | core.PuregoSafeRegister(&xMkdirWithParents, libs, "g_mkdir_with_parents") | |
| 791 | - | core.PuregoSafeRegister(&xMkdtemp, libs, "g_mkdtemp") | |
| 792 | - | core.PuregoSafeRegister(&xMkdtempFull, libs, "g_mkdtemp_full") | |
| 793 | - | core.PuregoSafeRegister(&xMkstemp, libs, "g_mkstemp") | |
| 794 | - | core.PuregoSafeRegister(&xMkstempFull, libs, "g_mkstemp_full") | |
| 795 | - | core.PuregoSafeRegister(&xPathGetBasename, libs, "g_path_get_basename") | |
| 796 | - | core.PuregoSafeRegister(&xPathGetDirname, libs, "g_path_get_dirname") | |
| 797 | - | core.PuregoSafeRegister(&xPathIsAbsolute, libs, "g_path_is_absolute") | |
| 798 | - | core.PuregoSafeRegister(&xPathSkipRoot, libs, "g_path_skip_root") | |
| 799 | 806 | } | |
| @@ -1,10 +1,7 @@ | |||||
| 1 | // Package glib was automatically generated by github.com/bnema/puregotk DO NOT EDIT | 1 | // Package glib was automatically generated by github.com/bnema/puregotk DO NOT EDIT | ||
| 2 | package glib | 2 | package glib | ||
| 3 | 3 | ||||
| 4 | - | import ( | 4 | + | import "github.com/bnema/puregotk/pkg/core" |
| 5 | - | "github.com/bnema/purego" | |||
| 6 | - | "github.com/bnema/puregotk/pkg/core" | |||
| 7 | - | ) | |||
| 8 | 5 | ||||
| 9 | // Flags to pass to g_file_set_contents_full() to affect its safety and | 6 | // Flags to pass to g_file_set_contents_full() to affect its safety and | ||
| 10 | // performance. | 7 | // performance. | ||
| @@ -170,6 +167,8 @@ var xBasename func(string) string | |||||
| 170 | // components. It returns a pointer into the given file name | 167 | // components. It returns a pointer into the given file name | ||
| 171 | // string. | 168 | // string. | ||
| 172 | func Basename(FileNameVar string) string { | 169 | func Basename(FileNameVar string) string { | ||
| 170 | + | core.LazyRegister(&xBasename, "GLIB", "g_basename", false) | |||
| 171 | + | ||||
| 173 | cret := xBasename(FileNameVar) | 172 | cret := xBasename(FileNameVar) | ||
| 174 | return cret | 173 | return cret | ||
| 175 | } | 174 | } | ||
| @@ -195,6 +194,8 @@ var xBuildFilename func(string, ...interface{}) string | |||||
| 195 | // If you are building a path programmatically you may want to use | 194 | // If you are building a path programmatically you may want to use | ||
| 196 | // #GPathBuf instead. | 195 | // #GPathBuf instead. | ||
| 197 | func BuildFilename(FirstElementVar string, varArgs ...interface{}) string { | 196 | func BuildFilename(FirstElementVar string, varArgs ...interface{}) string { | ||
| 197 | + | core.LazyRegister(&xBuildFilename, "GLIB", "g_build_filename", false) | |||
| 198 | + | ||||
| 198 | cret := xBuildFilename(FirstElementVar, varArgs...) | 199 | cret := xBuildFilename(FirstElementVar, varArgs...) | ||
| 199 | return cret | 200 | return cret | ||
| 200 | } | 201 | } | ||
| @@ -210,6 +211,8 @@ var xBuildFilenameValist func(string, []interface{}) string | |||||
| 210 | // This function is mainly meant for implementing other variadic arguments | 211 | // This function is mainly meant for implementing other variadic arguments | ||
| 211 | // functions. | 212 | // functions. | ||
| 212 | func BuildFilenameValist(FirstElementVar string, ArgsVar []interface{}) string { | 213 | func BuildFilenameValist(FirstElementVar string, ArgsVar []interface{}) string { | ||
| 214 | + | core.LazyRegister(&xBuildFilenameValist, "GLIB", "g_build_filename_valist", false) | |||
| 215 | + | ||||
| 213 | cret := xBuildFilenameValist(FirstElementVar, ArgsVar) | 216 | cret := xBuildFilenameValist(FirstElementVar, ArgsVar) | ||
| 214 | return cret | 217 | return cret | ||
| 215 | } | 218 | } | ||
| @@ -226,6 +229,8 @@ var xBuildFilenamev func([]string) string | |||||
| 226 | // If you are building a path programmatically you may want to use | 229 | // If you are building a path programmatically you may want to use | ||
| 227 | // #GPathBuf instead. | 230 | // #GPathBuf instead. | ||
| 228 | func BuildFilenamev(ArgsVar []string) string { | 231 | func BuildFilenamev(ArgsVar []string) string { | ||
| 232 | + | core.LazyRegister(&xBuildFilenamev, "GLIB", "g_build_filenamev", false) | |||
| 233 | + | ||||
| 229 | cret := xBuildFilenamev(ArgsVar) | 234 | cret := xBuildFilenamev(ArgsVar) | ||
| 230 | return cret | 235 | return cret | ||
| 231 | } | 236 | } | ||
| @@ -261,6 +266,8 @@ var xBuildPath func(string, string, ...interface{}) string | |||||
| 261 | // copies of the separator, elements consisting only of copies | 266 | // copies of the separator, elements consisting only of copies | ||
| 262 | // of the separator are ignored. | 267 | // of the separator are ignored. | ||
| 263 | func BuildPath(SeparatorVar string, FirstElementVar string, varArgs ...interface{}) string { | 268 | func BuildPath(SeparatorVar string, FirstElementVar string, varArgs ...interface{}) string { | ||
| 269 | + | core.LazyRegister(&xBuildPath, "GLIB", "g_build_path", false) | |||
| 270 | + | ||||
| 264 | cret := xBuildPath(SeparatorVar, FirstElementVar, varArgs...) | 271 | cret := xBuildPath(SeparatorVar, FirstElementVar, varArgs...) | ||
| 265 | return cret | 272 | return cret | ||
| 266 | } | 273 | } | ||
| @@ -272,6 +279,8 @@ var xBuildPathv func(string, []string) string | |||||
| 272 | // | 279 | // | ||
| 273 | // This function is mainly meant for language bindings. | 280 | // This function is mainly meant for language bindings. | ||
| 274 | func BuildPathv(SeparatorVar string, ArgsVar []string) string { | 281 | func BuildPathv(SeparatorVar string, ArgsVar []string) string { | ||
| 282 | + | core.LazyRegister(&xBuildPathv, "GLIB", "g_build_pathv", false) | |||
| 283 | + | ||||
| 275 | cret := xBuildPathv(SeparatorVar, ArgsVar) | 284 | cret := xBuildPathv(SeparatorVar, ArgsVar) | ||
| 276 | return cret | 285 | return cret | ||
| 277 | } | 286 | } | ||
| @@ -293,6 +302,8 @@ var xCanonicalizeFilename func(string, uintptr) string | |||||
| 293 | // | 302 | // | ||
| 294 | // No file system I/O is done. | 303 | // No file system I/O is done. | ||
| 295 | func CanonicalizeFilename(FilenameVar string, RelativeToVar *string) string { | 304 | func CanonicalizeFilename(FilenameVar string, RelativeToVar *string) string { | ||
| 305 | + | core.LazyRegister(&xCanonicalizeFilename, "GLIB", "g_canonicalize_filename", false) | |||
| 306 | + | ||||
| 296 | RelativeToVarPtr := core.GStrdupNullable(RelativeToVar) | 307 | RelativeToVarPtr := core.GStrdupNullable(RelativeToVar) | ||
| 297 | defer core.GFreeNullable(RelativeToVarPtr) | 308 | defer core.GFreeNullable(RelativeToVarPtr) | ||
| 298 | 309 | ||||
| @@ -314,6 +325,7 @@ var xDirMakeTmp func(uintptr, **Error) string | |||||
| 314 | // Note that in contrast to g_mkdtemp() (and mkdtemp()) @tmpl is not | 325 | // Note that in contrast to g_mkdtemp() (and mkdtemp()) @tmpl is not | ||
| 315 | // modified, and might thus be a read-only literal string. | 326 | // modified, and might thus be a read-only literal string. | ||
| 316 | func DirMakeTmp(TmplVar *string) (string, error) { | 327 | func DirMakeTmp(TmplVar *string) (string, error) { | ||
| 328 | + | core.LazyRegister(&xDirMakeTmp, "GLIB", "g_dir_make_tmp", false) | |||
| 317 | var cerr *Error | 329 | var cerr *Error | ||
| 318 | 330 | ||||
| 319 | TmplVarPtr := core.GStrdupNullable(TmplVar) | 331 | TmplVarPtr := core.GStrdupNullable(TmplVar) | ||
| @@ -338,6 +350,8 @@ var xFileErrorFromErrno func(int) FileError | |||||
| 338 | // from a function that manipulates files. So you would use | 350 | // from a function that manipulates files. So you would use | ||
| 339 | // g_file_error_from_errno() when constructing a #GError. | 351 | // g_file_error_from_errno() when constructing a #GError. | ||
| 340 | func FileErrorFromErrno(ErrNoVar int) FileError { | 352 | func FileErrorFromErrno(ErrNoVar int) FileError { | ||
| 353 | + | core.LazyRegister(&xFileErrorFromErrno, "GLIB", "g_file_error_from_errno", false) | |||
| 354 | + | ||||
| 341 | cret := xFileErrorFromErrno(ErrNoVar) | 355 | cret := xFileErrorFromErrno(ErrNoVar) | ||
| 342 | return cret | 356 | return cret | ||
| 343 | } | 357 | } | ||
| @@ -355,6 +369,7 @@ var xFileGetContents func(string, *[]byte, *uint, **Error) bool | |||||
| 355 | // codes are those in the #GFileError enumeration. In the error case, | 369 | // codes are those in the #GFileError enumeration. In the error case, | ||
| 356 | // @contents is set to %NULL and @length is set to zero. | 370 | // @contents is set to %NULL and @length is set to zero. | ||
| 357 | func FileGetContents(FilenameVar string, ContentsVar *[]byte, LengthVar *uint) (bool, error) { | 371 | func FileGetContents(FilenameVar string, ContentsVar *[]byte, LengthVar *uint) (bool, error) { | ||
| 372 | + | core.LazyRegister(&xFileGetContents, "GLIB", "g_file_get_contents", false) | |||
| 358 | var cerr *Error | 373 | var cerr *Error | ||
| 359 | 374 | ||||
| 360 | cret := xFileGetContents(FilenameVar, ContentsVar, LengthVar, &cerr) | 375 | cret := xFileGetContents(FilenameVar, ContentsVar, LengthVar, &cerr) | ||
| @@ -383,6 +398,7 @@ var xFileOpenTmp func(uintptr, *string, **Error) int | |||||
| 383 | // when not needed any longer. The returned name is in the GLib file | 398 | // when not needed any longer. The returned name is in the GLib file | ||
| 384 | // name encoding. | 399 | // name encoding. | ||
| 385 | func FileOpenTmp(TmplVar *string, NameUsedVar *string) (int, error) { | 400 | func FileOpenTmp(TmplVar *string, NameUsedVar *string) (int, error) { | ||
| 401 | + | core.LazyRegister(&xFileOpenTmp, "GLIB", "g_file_open_tmp", false) | |||
| 386 | var cerr *Error | 402 | var cerr *Error | ||
| 387 | 403 | ||||
| 388 | TmplVarPtr := core.GStrdupNullable(TmplVar) | 404 | TmplVarPtr := core.GStrdupNullable(TmplVar) | ||
| @@ -424,6 +440,7 @@ var xFileReadLink func(string, **Error) string | |||||
| 424 | // | 440 | // | ||
| 425 | // ]| | 441 | // ]| | ||
| 426 | func FileReadLink(FilenameVar string) (string, error) { | 442 | func FileReadLink(FilenameVar string) (string, error) { | ||
| 443 | + | core.LazyRegister(&xFileReadLink, "GLIB", "g_file_read_link", false) | |||
| 427 | var cerr *Error | 444 | var cerr *Error | ||
| 428 | 445 | ||||
| 429 | cret := xFileReadLink(FilenameVar, &cerr) | 446 | cret := xFileReadLink(FilenameVar, &cerr) | ||
| @@ -440,6 +457,7 @@ var xFileSetContents func(string, []byte, int, **Error) bool | |||||
| 440 | // `G_FILE_SET_CONTENTS_CONSISTENT | G_FILE_SET_CONTENTS_ONLY_EXISTING` and | 457 | // `G_FILE_SET_CONTENTS_CONSISTENT | G_FILE_SET_CONTENTS_ONLY_EXISTING` and | ||
| 441 | // `mode` set to `0666`. | 458 | // `mode` set to `0666`. | ||
| 442 | func FileSetContents(FilenameVar string, ContentsVar []byte, LengthVar int) (bool, error) { | 459 | func FileSetContents(FilenameVar string, ContentsVar []byte, LengthVar int) (bool, error) { | ||
| 460 | + | core.LazyRegister(&xFileSetContents, "GLIB", "g_file_set_contents", false) | |||
| 443 | var cerr *Error | 461 | var cerr *Error | ||
| 444 | 462 | ||||
| 445 | cret := xFileSetContents(FilenameVar, ContentsVar, LengthVar, &cerr) | 463 | cret := xFileSetContents(FilenameVar, ContentsVar, LengthVar, &cerr) | ||
| @@ -506,6 +524,7 @@ var xFileSetContentsFull func(string, []byte, int, FileSetContentsFlags, int, ** | |||||
| 506 | // permissions from @mode. Otherwise, the permissions of the existing file will | 524 | // permissions from @mode. Otherwise, the permissions of the existing file will | ||
| 507 | // remain unchanged. | 525 | // remain unchanged. | ||
| 508 | func FileSetContentsFull(FilenameVar string, ContentsVar []byte, LengthVar int, FlagsVar FileSetContentsFlags, ModeVar int) (bool, error) { | 526 | func FileSetContentsFull(FilenameVar string, ContentsVar []byte, LengthVar int, FlagsVar FileSetContentsFlags, ModeVar int) (bool, error) { | ||
| 527 | + | core.LazyRegister(&xFileSetContentsFull, "GLIB", "g_file_set_contents_full", false) | |||
| 509 | var cerr *Error | 528 | var cerr *Error | ||
| 510 | 529 | ||||
| 511 | cret := xFileSetContentsFull(FilenameVar, ContentsVar, LengthVar, FlagsVar, ModeVar, &cerr) | 530 | cret := xFileSetContentsFull(FilenameVar, ContentsVar, LengthVar, FlagsVar, ModeVar, &cerr) | ||
| @@ -579,6 +598,8 @@ var xNewFileTest func(string, FileTest) bool | |||||
| 579 | // its name indicates that it is executable, checking for well-known | 598 | // its name indicates that it is executable, checking for well-known | ||
| 580 | // extensions and those listed in the `PATHEXT` environment variable. | 599 | // extensions and those listed in the `PATHEXT` environment variable. | ||
| 581 | func NewFileTest(FilenameVar string, TestVar FileTest) bool { | 600 | func NewFileTest(FilenameVar string, TestVar FileTest) bool { | ||
| 601 | + | core.LazyRegister(&xNewFileTest, "GLIB", "g_file_test", false) | |||
| 602 | + | ||||
| 582 | cret := xNewFileTest(FilenameVar, TestVar) | 603 | cret := xNewFileTest(FilenameVar, TestVar) | ||
| 583 | return cret | 604 | return cret | ||
| 584 | } | 605 | } | ||
| @@ -596,6 +617,8 @@ var xGetCurrentDir func() string | |||||
| 596 | // the current directory. This can make a difference in the case that | 617 | // the current directory. This can make a difference in the case that | ||
| 597 | // the current directory is the target of a symbolic link. | 618 | // the current directory is the target of a symbolic link. | ||
| 598 | func GetCurrentDir() string { | 619 | func GetCurrentDir() string { | ||
| 620 | + | core.LazyRegister(&xGetCurrentDir, "GLIB", "g_get_current_dir", false) | |||
| 621 | + | ||||
| 599 | cret := xGetCurrentDir() | 622 | cret := xGetCurrentDir() | ||
| 600 | return cret | 623 | return cret | ||
| 601 | } | 624 | } | ||
| @@ -605,6 +628,8 @@ var xMkdirWithParents func(string, int) int | |||||
| 605 | // Create a directory if it doesn't already exist. Create intermediate | 628 | // Create a directory if it doesn't already exist. Create intermediate | ||
| 606 | // parent directories as needed, too. | 629 | // parent directories as needed, too. | ||
| 607 | func MkdirWithParents(PathnameVar string, ModeVar int) int { | 630 | func MkdirWithParents(PathnameVar string, ModeVar int) int { | ||
| 631 | + | core.LazyRegister(&xMkdirWithParents, "GLIB", "g_mkdir_with_parents", false) | |||
| 632 | + | ||||
| 608 | cret := xMkdirWithParents(PathnameVar, ModeVar) | 633 | cret := xMkdirWithParents(PathnameVar, ModeVar) | ||
| 609 | return cret | 634 | return cret | ||
| 610 | } | 635 | } | ||
| @@ -628,6 +653,8 @@ var xMkdtemp func(string) string | |||||
| 628 | // directory returned by g_get_tmp_dir(), you might want to use | 653 | // directory returned by g_get_tmp_dir(), you might want to use | ||
| 629 | // g_dir_make_tmp() instead. | 654 | // g_dir_make_tmp() instead. | ||
| 630 | func Mkdtemp(TmplVar string) string { | 655 | func Mkdtemp(TmplVar string) string { | ||
| 656 | + | core.LazyRegister(&xMkdtemp, "GLIB", "g_mkdtemp", false) | |||
| 657 | + | ||||
| 631 | cret := xMkdtemp(TmplVar) | 658 | cret := xMkdtemp(TmplVar) | ||
| 632 | return cret | 659 | return cret | ||
| 633 | } | 660 | } | ||
| @@ -651,6 +678,8 @@ var xMkdtempFull func(string, int) string | |||||
| 651 | // directory returned by g_get_tmp_dir(), you might want to use | 678 | // directory returned by g_get_tmp_dir(), you might want to use | ||
| 652 | // g_dir_make_tmp() instead. | 679 | // g_dir_make_tmp() instead. | ||
| 653 | func MkdtempFull(TmplVar string, ModeVar int) string { | 680 | func MkdtempFull(TmplVar string, ModeVar int) string { | ||
| 681 | + | core.LazyRegister(&xMkdtempFull, "GLIB", "g_mkdtemp_full", false) | |||
| 682 | + | ||||
| 654 | cret := xMkdtempFull(TmplVar, ModeVar) | 683 | cret := xMkdtempFull(TmplVar, ModeVar) | ||
| 655 | return cret | 684 | return cret | ||
| 656 | } | 685 | } | ||
| @@ -669,6 +698,8 @@ var xMkstemp func(string) int | |||||
| 669 | // didn't exist. The string should be in the GLib file name encoding. | 698 | // didn't exist. The string should be in the GLib file name encoding. | ||
| 670 | // Most importantly, on Windows it should be in UTF-8. | 699 | // Most importantly, on Windows it should be in UTF-8. | ||
| 671 | func Mkstemp(TmplVar string) int { | 700 | func Mkstemp(TmplVar string) int { | ||
| 701 | + | core.LazyRegister(&xMkstemp, "GLIB", "g_mkstemp", false) | |||
| 702 | + | ||||
| 672 | cret := xMkstemp(TmplVar) | 703 | cret := xMkstemp(TmplVar) | ||
| 673 | return cret | 704 | return cret | ||
| 674 | } | 705 | } | ||
| @@ -688,6 +719,8 @@ var xMkstempFull func(string, int, int) int | |||||
| 688 | // The string should be in the GLib file name encoding. Most importantly, | 719 | // The string should be in the GLib file name encoding. Most importantly, | ||
| 689 | // on Windows it should be in UTF-8. | 720 | // on Windows it should be in UTF-8. | ||
| 690 | func MkstempFull(TmplVar string, FlagsVar int, ModeVar int) int { | 721 | func MkstempFull(TmplVar string, FlagsVar int, ModeVar int) int { | ||
| 722 | + | core.LazyRegister(&xMkstempFull, "GLIB", "g_mkstemp_full", false) | |||
| 723 | + | ||||
| 691 | cret := xMkstempFull(TmplVar, FlagsVar, ModeVar) | 724 | cret := xMkstempFull(TmplVar, FlagsVar, ModeVar) | ||
| 692 | return cret | 725 | return cret | ||
| 693 | } | 726 | } | ||
| @@ -701,6 +734,8 @@ var xPathGetBasename func(string) string | |||||
| 701 | // separators (and on Windows, possibly a drive letter), a single | 734 | // separators (and on Windows, possibly a drive letter), a single | ||
| 702 | // separator is returned. If @file_name is empty, it gets ".". | 735 | // separator is returned. If @file_name is empty, it gets ".". | ||
| 703 | func PathGetBasename(FileNameVar string) string { | 736 | func PathGetBasename(FileNameVar string) string { | ||
| 737 | + | core.LazyRegister(&xPathGetBasename, "GLIB", "g_path_get_basename", false) | |||
| 738 | + | ||||
| 704 | cret := xPathGetBasename(FileNameVar) | 739 | cret := xPathGetBasename(FileNameVar) | ||
| 705 | return cret | 740 | return cret | ||
| 706 | } | 741 | } | ||
| @@ -714,6 +749,8 @@ var xPathGetDirname func(string) string | |||||
| 714 | // If the file name has no directory components "." is returned. | 749 | // If the file name has no directory components "." is returned. | ||
| 715 | // The returned string should be freed when no longer needed. | 750 | // The returned string should be freed when no longer needed. | ||
| 716 | func PathGetDirname(FileNameVar string) string { | 751 | func PathGetDirname(FileNameVar string) string { | ||
| 752 | + | core.LazyRegister(&xPathGetDirname, "GLIB", "g_path_get_dirname", false) | |||
| 753 | + | ||||
| 717 | cret := xPathGetDirname(FileNameVar) | 754 | cret := xPathGetDirname(FileNameVar) | ||
| 718 | return cret | 755 | return cret | ||
| 719 | } | 756 | } | ||
| @@ -745,6 +782,8 @@ var xPathIsAbsolute func(string) bool | |||||
| 745 | // either. Such paths should be avoided, or need to be handled using | 782 | // either. Such paths should be avoided, or need to be handled using | ||
| 746 | // Windows-specific code. | 783 | // Windows-specific code. | ||
| 747 | func PathIsAbsolute(FileNameVar string) bool { | 784 | func PathIsAbsolute(FileNameVar string) bool { | ||
| 785 | + | core.LazyRegister(&xPathIsAbsolute, "GLIB", "g_path_is_absolute", false) | |||
| 786 | + | ||||
| 748 | cret := xPathIsAbsolute(FileNameVar) | 787 | cret := xPathIsAbsolute(FileNameVar) | ||
| 749 | return cret | 788 | return cret | ||
| 750 | } | 789 | } | ||
| @@ -755,6 +794,8 @@ var xPathSkipRoot func(string) string | |||||
| 755 | // i.e. after the "/" in UNIX or "C:\" under Windows. If @file_name | 794 | // i.e. after the "/" in UNIX or "C:\" under Windows. If @file_name | ||
| 756 | // is not an absolute path it returns %NULL. | 795 | // is not an absolute path it returns %NULL. | ||
| 757 | func PathSkipRoot(FileNameVar string) string { | 796 | func PathSkipRoot(FileNameVar string) string { | ||
| 797 | + | core.LazyRegister(&xPathSkipRoot, "GLIB", "g_path_skip_root", false) | |||
| 798 | + | ||||
| 758 | cret := xPathSkipRoot(FileNameVar) | 799 | cret := xPathSkipRoot(FileNameVar) | ||
| 759 | return cret | 800 | return cret | ||
| 760 | } | 801 | } | ||
| @@ -762,38 +803,4 @@ func PathSkipRoot(FileNameVar string) string { | |||||
| 762 | func init() { | 803 | func init() { | ||
| 763 | core.SetPackageName("GLIB", "glib-2.0") | 804 | core.SetPackageName("GLIB", "glib-2.0") | ||
| 764 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | 805 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | ||
| 765 | - | var libs []uintptr | |||
| 766 | - | for _, libPath := range core.GetPaths("GLIB") { | |||
| 767 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 768 | - | if err != nil { | |||
| 769 | - | panic(err) | |||
| 770 | - | } | |||
| 771 | - | libs = append(libs, lib) | |||
| 772 | - | } | |||
| 773 | - | ||||
| 774 | - | core.PuregoSafeRegister(&xBasename, libs, "g_basename") | |||
| 775 | - | core.PuregoSafeRegister(&xBuildFilename, libs, "g_build_filename") | |||
| 776 | - | core.PuregoSafeRegister(&xBuildFilenameValist, libs, "g_build_filename_valist") | |||
| 777 | - | core.PuregoSafeRegister(&xBuildFilenamev, libs, "g_build_filenamev") | |||
| 778 | - | core.PuregoSafeRegister(&xBuildPath, libs, "g_build_path") | |||
| 779 | - | core.PuregoSafeRegister(&xBuildPathv, libs, "g_build_pathv") | |||
| 780 | - | core.PuregoSafeRegister(&xCanonicalizeFilename, libs, "g_canonicalize_filename") | |||
| 781 | - | core.PuregoSafeRegister(&xDirMakeTmp, libs, "g_dir_make_tmp") | |||
| 782 | - | core.PuregoSafeRegister(&xFileErrorFromErrno, libs, "g_file_error_from_errno") | |||
| 783 | - | core.PuregoSafeRegister(&xFileGetContents, libs, "g_file_get_contents") | |||
| 784 | - | core.PuregoSafeRegister(&xFileOpenTmp, libs, "g_file_open_tmp") | |||
| 785 | - | core.PuregoSafeRegister(&xFileReadLink, libs, "g_file_read_link") | |||
| 786 | - | core.PuregoSafeRegister(&xFileSetContents, libs, "g_file_set_contents") | |||
| 787 | - | core.PuregoSafeRegister(&xFileSetContentsFull, libs, "g_file_set_contents_full") | |||
| 788 | - | core.PuregoSafeRegister(&xNewFileTest, libs, "g_file_test") | |||
| 789 | - | core.PuregoSafeRegister(&xGetCurrentDir, libs, "g_get_current_dir") | |||
| 790 | - | core.PuregoSafeRegister(&xMkdirWithParents, libs, "g_mkdir_with_parents") | |||
| 791 | - | core.PuregoSafeRegister(&xMkdtemp, libs, "g_mkdtemp") | |||
| 792 | - | core.PuregoSafeRegister(&xMkdtempFull, libs, "g_mkdtemp_full") | |||
| 793 | - | core.PuregoSafeRegister(&xMkstemp, libs, "g_mkstemp") | |||
| 794 | - | core.PuregoSafeRegister(&xMkstempFull, libs, "g_mkstemp_full") | |||
| 795 | - | core.PuregoSafeRegister(&xPathGetBasename, libs, "g_path_get_basename") | |||
| 796 | - | core.PuregoSafeRegister(&xPathGetDirname, libs, "g_path_get_dirname") | |||
| 797 | - | core.PuregoSafeRegister(&xPathIsAbsolute, libs, "g_path_is_absolute") | |||
| 798 | - | core.PuregoSafeRegister(&xPathSkipRoot, libs, "g_path_skip_root") | |||
| 799 | } | 806 | } | ||