Remove most now-extraneous install/no_install/ignore lists

edgedb · Oct 11, 2024 · b336115 · b336115
1 parent ee96f76
commit b336115
Show file tree

Hide file tree

Showing 62 changed files with 34 additions and 324 deletions.
diff --git a/edgedbpkg/edgedb/__init__.py b/edgedbpkg/edgedb/__init__.py
@@ -323,7 +323,7 @@ def sh_get_build_wheel_env(
                 "OPENSSL_LIB_DIR",
                 build.sh_must_get_bundled_pkg_lib_path(
                     openssl_pkg,
-                    relative_to="pkgsource",
+                    relative_to="pkgbuild",
                     wd=wd,
                 ),
             )
@@ -332,7 +332,7 @@ def sh_get_build_wheel_env(
                 "OPENSSL_INCLUDE_DIR",
                 build.sh_must_get_bundled_pkg_include_path(
                     openssl_pkg,
-                    relative_to="pkgsource",
+                    relative_to="pkgbuild",
                     wd=wd,
                 ),
             )
@@ -604,7 +604,7 @@ def sh_get_build_wheel_env(
                 "OPENSSL_LIB_DIR",
                 build.sh_must_get_bundled_pkg_lib_path(
                     openssl_pkg,
-                    relative_to="pkgsource",
+                    relative_to="pkgbuild",
                     wd=wd,
                 ),
             )
@@ -613,7 +613,7 @@ def sh_get_build_wheel_env(
                 "OPENSSL_INCLUDE_DIR",
                 build.sh_must_get_bundled_pkg_include_path(
                     openssl_pkg,
-                    relative_to="pkgsource",
+                    relative_to="pkgbuild",
                     wd=wd,
                 ),
             )

diff --git a/edgedbpkg/edgedb/install.list b/edgedbpkg/edgedb/install.list
@@ -1,6 +1,9 @@
 {libdir}/postgresql/*.so
+{libdir}/python*/site-packages
 {datadir}/postgresql/extension/*
 {datadir}/data/**
 {datadir}/tests/**
+{bindir}/edgedb-server
+{bindir}/edgedb-load-ext
 {bindir}/edgedb-server.py
 {bindir}/edgedb-load-ext.py
diff --git a/edgedbpkg/edgedb_ls/__init__.py b/edgedbpkg/edgedb_ls/__init__.py
@@ -261,7 +261,7 @@ def sh_get_build_wheel_env(
                 "OPENSSL_INCLUDE_DIR",
                 build.sh_must_get_bundled_pkg_include_path(
                     openssl_pkg,
-                    relative_to="pkgsource",
+                    relative_to="pkgbuild",
                     wd=wd,
                 ),
             )

diff --git a/edgedbpkg/edgedbcli/__init__.py b/edgedbpkg/edgedbcli/__init__.py
@@ -27,8 +27,8 @@ def get_package_layout(
     ) -> packages.PackageFileLayout:
         return packages.PackageFileLayout.SINGLE_BINARY
 
-    def get_license_files_pattern(self) -> str:
-        return ""
+    def get_license_files_patterns(self) -> list[str]:
+        return []
 
     def get_artifact_metadata(self, build: targets.Build) -> dict[str, Any]:
         metadata = dict(super().get_artifact_metadata(build))

diff --git a/edgedbpkg/icu/install.list b/edgedbpkg/icu/install.list
diff --git a/edgedbpkg/icu/no_install.list b/edgedbpkg/icu/no_install.list
@@ -1,9 +1,5 @@
 {libdir}/icu
 {libdir}/icu/**
-{libdir}/pkgconfig
-{libdir}/pkgconfig/**
-{libdir}/*.a
-{libdir}/*.la
 {libdir}/libicuio*
 {libdir}/libicutest*
 {libdir}/libicutu*
diff --git a/edgedbpkg/libabseil/install.list b/edgedbpkg/libabseil/install.list
diff --git a/edgedbpkg/libabseil/no_install.list b/edgedbpkg/libabseil/no_install.list
diff --git a/edgedbpkg/libb2/ignore.list b/edgedbpkg/libb2/ignore.list
diff --git a/edgedbpkg/libb2/install.list b/edgedbpkg/libb2/install.list
diff --git a/edgedbpkg/libb2/no_install.list b/edgedbpkg/libb2/no_install.list
diff --git a/edgedbpkg/libexpat/install.list b/edgedbpkg/libexpat/install.list
diff --git a/edgedbpkg/libexpat/no_install.list b/edgedbpkg/libexpat/no_install.list
diff --git a/edgedbpkg/libffi/ignore.list b/edgedbpkg/libffi/ignore.list
diff --git a/edgedbpkg/libffi/install.list b/edgedbpkg/libffi/install.list
diff --git a/edgedbpkg/libffi/no_install.list b/edgedbpkg/libffi/no_install.list
diff --git a/edgedbpkg/libgdal/ignore.list b/edgedbpkg/libgdal/ignore.list
@@ -1 +1 @@
-{prefix}/share/**
+{datadir}/**
diff --git a/edgedbpkg/libgdal/install.list b/edgedbpkg/libgdal/install.list
@@ -1,4 +1 @@
-{libdir}/**
-{prefix}/share
-{prefix}/share/gdal
-{prefix}/share/gdal/**
+{datadir}/gdal/**
diff --git a/edgedbpkg/libgdal/no_install.list b/edgedbpkg/libgdal/no_install.list
diff --git a/edgedbpkg/libgeos/install.list b/edgedbpkg/libgeos/install.list
diff --git a/edgedbpkg/libgeos/no_install.list b/edgedbpkg/libgeos/no_install.list
diff --git a/edgedbpkg/libgeotiff/install.list b/edgedbpkg/libgeotiff/install.list
diff --git a/edgedbpkg/libgeotiff/no_install.list b/edgedbpkg/libgeotiff/no_install.list
diff --git a/edgedbpkg/libjson_c/install.list b/edgedbpkg/libjson_c/install.list
@@ -1,2 +1 @@
-{libdir}/**
-{prefix}/share/proj/**
+{datadir}/proj/**
diff --git a/edgedbpkg/libjson_c/no_install.list b/edgedbpkg/libjson_c/no_install.list
diff --git a/edgedbpkg/libjsoncpp/install.list b/edgedbpkg/libjsoncpp/install.list
diff --git a/edgedbpkg/libjsoncpp/no_install.list b/edgedbpkg/libjsoncpp/no_install.list
diff --git a/edgedbpkg/libpcre2/ignore.list b/edgedbpkg/libpcre2/ignore.list
diff --git a/edgedbpkg/libpcre2/install.list b/edgedbpkg/libpcre2/install.list
diff --git a/edgedbpkg/libpcre2/no_install.list b/edgedbpkg/libpcre2/no_install.list
diff --git a/edgedbpkg/libproj/install.list b/edgedbpkg/libproj/install.list
@@ -1,2 +1 @@
-{libdir}/**
-{prefix}/share/proj/**
+{datadir}/proj/**
diff --git a/edgedbpkg/libproj/no_install.list b/edgedbpkg/libproj/no_install.list
diff --git a/edgedbpkg/libprotobuf_c/install.list b/edgedbpkg/libprotobuf_c/install.list
diff --git a/edgedbpkg/libprotobuf_c/no_install.list b/edgedbpkg/libprotobuf_c/no_install.list
diff --git a/edgedbpkg/libsqlite3/install.list b/edgedbpkg/libsqlite3/install.list
diff --git a/edgedbpkg/libsqlite3/no_install.list b/edgedbpkg/libsqlite3/no_install.list
diff --git a/edgedbpkg/libtiff/install.list b/edgedbpkg/libtiff/install.list
diff --git a/edgedbpkg/libtiff/no_install.list b/edgedbpkg/libtiff/no_install.list
diff --git a/edgedbpkg/libuuid/install.list b/edgedbpkg/libuuid/install.list
diff --git a/edgedbpkg/libuuid/no_install.list b/edgedbpkg/libuuid/no_install.list
diff --git a/edgedbpkg/libxml2/install.list b/edgedbpkg/libxml2/install.list
diff --git a/edgedbpkg/libxml2/no_install.list b/edgedbpkg/libxml2/no_install.list
diff --git a/edgedbpkg/openssl/__init__.py b/edgedbpkg/openssl/__init__.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import pathlib
 import platform
 import re
 import shlex
@@ -99,3 +100,16 @@ def from_upstream_version(cls, version: str) -> OpenSSL:
 
     def get_shlibs(self, build: targets.Build) -> list[str]:
         return ["ssl", "crypto"]
+
+    def provides_build_tools(self) -> bool:
+        return True
+
+    def get_install_path(
+        self,
+        build: targets.Build,
+        aspect: targets.InstallAspect,
+    ) -> pathlib.Path | None:
+        if aspect == "include":
+            return build.get_install_prefix(self) / "include"
+        else:
+            return super().get_install_path(build, aspect)
diff --git a/edgedbpkg/openssl/ignore.list b/edgedbpkg/openssl/ignore.list
@@ -1,4 +1,2 @@
 {bindir}/*
-{prefix}/share/**
 {prefix}/etc/**
-{prefix}/include/**
diff --git a/edgedbpkg/openssl/install.list b/edgedbpkg/openssl/install.list
@@ -1 +1 @@
-{libdir}/**
+{libdir}/ossl-modules/*
diff --git a/edgedbpkg/openssl/no_install.list b/edgedbpkg/openssl/no_install.list
diff --git a/edgedbpkg/pgext/pgvector/ignore.list b/edgedbpkg/pgext/pgvector/ignore.list
diff --git a/edgedbpkg/pgext/postgis/__init__.py b/edgedbpkg/pgext/postgis/__init__.py
@@ -31,7 +31,7 @@ class PostGIS(pgext.PostgresCExtension):
     ]
 
     artifact_requirements = [
-        "libgdal (>=2.0.0)",
+        "libgdal (>=3.0.0)",
         "libgeos (>=3.9.0)",
         "libjson-c",
         "libpcre2-dev",
@@ -42,7 +42,7 @@ class PostGIS(pgext.PostgresCExtension):
 
     artifact_build_requirements = [
         "postgresql-edgedb (>=13)",
-        "libgdal-dev (>=2.0.0)",
+        "libgdal-dev (>=3.0.0)",
         "libgeos-dev (>=3.9.0)",
         "libjson-c-dev",
         "libpcre2-dev",