fix: lib/cpp auto pack ignores hpp files

Signed-off-by: sisungo <[email protected]>

lib/cpp.py

@@ -117,6 +117,7 @@ def _is_dev_file(ent) -> bool:
         or ent.name.endswith(".la")
         or ent.name.endswith(".pc")
         or ent.name.endswith(".h")
+        or ent.name.endswith(".hpp")
         or ent.name.endswith(".cmake")
         or ent.name.endswith(".inc")
         or ("Makefile" in ent.name)

lib/python.py

@@ -32,7 +32,7 @@ def _depcommon(s: str):
         if ")" in s:
             return s.replace(")", f", +python{PY3_VERSION})")
         else:
-            return s.replace(".py", f".py (+python{PY3_VERSION})")
+            return s.replace(".py", f" (+python{PY3_VERSION})")
     else:
         return None
 

packages/Mako-py/pkgbuild.py

@@ -1,29 +0,0 @@
-import os
-
-from lib.make import *
-from lib import python
-
-
-python.version("1.4.1")
-description("A super-fast templating language that borrows the best ideas from the existing templating languages.")
-maintainer("sisungo <[email protected]>")
-source_url("https://files.pythonhosted.org/packages/2a/12/b5fa2353e2754cd67fb9f83793fa48ff42c213a5da7e719869d2301f6ab8/mako-1.4.1.tar.gz")
-
-python.builddep("$shortcut")
-python.builddep("MarkupSafe.py")
-
-
-def build():
-    python.build()
-    python.install()
-    os.chdir("lib")
-    while len(os.listdir(".")) == 1:
-        os.chdir(os.listdir(".")[0])
-
-on_build(build)
-
-
-package("Mako.py")
-python.dep("python")
-python.dep("MarkupSafe.py")
-python.use_auto_pack()

packages/spirv-tools/pkgbuild.py

@@ -0,0 +1,43 @@
+import os
+import shutil
+
+from lib.make import *
+from lib import cpp, arch
+
+
+sdk_version = "1.4.357.0"
+
+version(sdk_version)
+description("an API and commands for processing SPIR-V modules")
+maintainer("sisungo <[email protected]>")
+source_url("https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-1.4.357.0.tar.gz")
+
+builddep("shortcut/cmake")
+builddep("shortcut/c++")
+builddep(f"spirv-headers (={sdk_version}) @{arch.get_target()}")
+
+
+def build():
+    cpp.cmake([
+        f"-DSPIRV-Headers_SOURCE_DIR=/lib/{arch.get_target()}",
+        "-DCMAKE_CXX_FLAGS=-Wno-error=switch",
+        f"-DCMAKE_INSTALL_PREFIX={get_prefix('spirv-tools-dev')}",
+    ])
+    cpp.ninja()
+    cpp.ninja_install()
+    try:
+        os.rename("lib64", "lib")
+        os.rename("lib32", "lib")
+    except:
+        pass
+
+on_build(build)
+
+
+package("spirv-tools")
+dep("libcxx @same-arch")
+cpp.use_auto_pack(["bin"])
+
+package("spirv-tools-dev")
+dep("spirv-tools (same)")
+cpp.use_auto_pack(["lib", "dev"])