mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-27 10:41:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Store deps in per-platform dirs

Browse Source
This commit is contained in:
Kovid Goyal
2023-07-28 10:37:33 +05:30
parent aab1bf305a
commit 9f683ea190
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bypy/devenv.go
View File

@@ -19,6 +19,14 @@ import (
const folder = "dependencies" const folder = "dependencies"
func root_dir() string {
f, e := filepath.Abs(filepath.Join(folder, runtime.GOOS+"-"+runtime.GOARCH))
if e != nil {
panic(e)
}
return f
}
var _ = fmt.Print var _ = fmt.Print
func exit(x any) { func exit(x any) {
@@ -129,14 +137,14 @@ func dependencies(args []string) {
exit("Prebuilt dependencies are only available for Linux and macOS") exit("Prebuilt dependencies are only available for Linux and macOS")
} }
url = strings.Replace(url, "{}", which, 1) url = strings.Replace(url, "{}", which, 1)
if err := os.RemoveAll(filepath.Join(folder, "root")); err != nil { if err := os.RemoveAll(root_dir()); err != nil {
exit(err) exit(err)
} }
if err := os.MkdirAll(folder, 0o755); err != nil { if err := os.MkdirAll(folder, 0o755); err != nil {
exit(err) exit(err)
} }
tarfile, _ := filepath.Abs(cached_download(url)) tarfile, _ := filepath.Abs(cached_download(url))
root, _ := filepath.Abs(filepath.Join(folder, "root")) root := root_dir()
if err := os.MkdirAll(root, 0o755); err != nil { if err := os.MkdirAll(root, 0o755); err != nil {
exit(err) exit(err)
} }
@@ -186,9 +194,15 @@ func build(args []string) {
dependencies(nil) dependencies(nil)
} }
python := "" python := ""
root, _ := filepath.Abs(filepath.Join(folder, "root")) root := root_dir()
os.Setenv("DEVELOP_ROOT", root) os.Setenv("DEVELOP_ROOT", root)
prepend("PKG_CONFIG_PATH", filepath.Join(root, "lib", "pkgconfig")) prepend("PKG_CONFIG_PATH", filepath.Join(root, "lib", "pkgconfig"))
for _, x := range os.Environ() {
if strings.HasPrefix(x, "PYTHON") {
a, _, _ := strings.Cut(x, "=")
os.Unsetenv(a)
}
}
switch runtime.GOOS { switch runtime.GOOS {
case "linux": case "linux":
prepend("LD_LIBRARY_PATH", filepath.Join(root, "lib")) prepend("LD_LIBRARY_PATH", filepath.Join(root, "lib"))

2
bypy/rsync.conf
View File

@@ -1 +1 @@
to_vm_excludes '/build /dist /kitty/launcher/kitty* /.build-cache /tags __pycache__ /*_commands.json *.so *.pyd *.pyc *_generated.go' to_vm_excludes '/dependencies /build /dist /kitty/launcher/kitty* /.build-cache /tags __pycache__ /*_commands.json *.so *.pyd *.pyc *_generated.go'