Use subprojects

README.md

@@ -36,5 +36,15 @@ cd bindings/python
 pip install .
 ```
 
+### Build the Rust bindings
+
+You'll need [Meson][1] and [Ninja][2] to build the [Rust][3] bindings.
+
+```shell
+cd bindings/rust
+cargo run --example bidi
+```
+
 [1]: https://mesonbuild.com
 [2]: https://ninja-build.org
+[3]: https://www.rust-lang.org

bindings/python/__init__.py

@@ -1,9 +1,6 @@
 # ruff: noqa: F401 F821
-from .lib import Font  # type: ignore
-from .types import FontStyle, Glyph, Path, PathVerb, Point, Transform
-
-del lib
-del types
+from ._subset import Font  # type: ignore
+from ._types import FontStyle, Glyph, Path, PathVerb, Point, Transform
 
 __all__ = [
     "Font",

bindings/python/layout.py

@@ -4,7 +4,7 @@
 from collections.abc import Callable, Generator
 from dataclasses import dataclass, field
 
-from .lib import GlyphDrawer, Font, ShapeContext, find_best_font_match, text_runs  # type: ignore
+from ._subset import GlyphDrawer, Font, ShapeContext, find_best_font_match, text_runs  # type: ignore
 from .types import FontRun, FontStyle, Glyph, GlyphRun, Path, PathVerb, Point
 
 

bindings/python/meson.build

@@ -1,25 +1,29 @@
 project('subset-python', 'c', 'cpp', 'cython')
 
-subdir('deps/extern')
-subdir('deps/lib')
+subset_proj = subproject(
+  'subset',
+  default_options: ['default_library=static'],
+)
+
+subset_dep = subset_proj.get_variable('subset_dep')
 
 py = import('python').find_installation(pure: false)
 
 py.extension_module(
-  'lib',
+  '_subset',
   'subset.pyx',
-  cython_args: ['--module-name', 'lib'],
-  dependencies: subset_lib_dep,
+  cython_args: ['--module-name', '_subset'],
+  dependencies: subset_dep,
   install: true,
   subdir: 'subset',
 )
 
 python_sources = files(
   '__init__.py',
+  '_subset.pyi',
+  '_types.py',
   'layout.py',
-  'lib.pyi',
   'py.typed',
-  'types.py',
 )
 
 py.install_sources(

bindings/python/pyproject.toml

@@ -8,3 +8,6 @@ version = "0.0.1"
 requires-python = ">=3.11"
 authors = [{ name = "Christer Sandberg", email = "[email protected]" }]
 license = { file = "../../LICENSE" }
+
+[tool.meson-python.args]
+install = ["--skip-subprojects"]

bindings/python/subprojects/.gitignore

@@ -0,0 +1,3 @@
+harfbuzz
+sheenbidi
+*.wrap

bindings/python/subprojects/subset/meson.build

@@ -0,0 +1 @@
+../../../../meson.build

bindings/python/subprojects/subset/src

@@ -0,0 +1 @@
+../../../../src

bindings/python/subprojects/subset/subprojects

@@ -0,0 +1 @@
+../../../../subprojects

bindings/python/subset.pyx

@@ -10,7 +10,7 @@ from cpython.mem cimport PyMem_Malloc, PyMem_Free
 from libc.stddef cimport size_t
 from libc.stdint cimport int32_t, uint8_t, uint32_t
 
-cdef extern from "deps/lib/subset.h":
+cdef extern from "subset.h":
     ctypedef struct SubsetGlyphDrawer:
         pass
 

bindings/rust/build.rs

@@ -18,20 +18,23 @@ fn main() {
         cmd.arg("setup");
         cmd.arg("--buildtype");
         cmd.arg(build_type);
+        cmd.arg("--default-library");
+        cmd.arg("static");
         cmd.arg(&build_dir);
         assert!(cmd.status().unwrap().success());
     }
     let mut cmd = Command::new("meson");
     cmd.current_dir(&build_dir);
     cmd.arg("compile");
     assert!(cmd.status().unwrap().success());
+    println!("cargo:rustc-link-search=native={}", build_dir.display());
     println!(
         "cargo:rustc-link-search=native={}",
-        build_dir.join("extern").display()
+        build_dir.join("subprojects/harfbuzz").display()
     );
     println!(
         "cargo:rustc-link-search=native={}",
-        build_dir.join("lib").display()
+        build_dir.join("subprojects/sheenbidi").display()
     );
     println!("cargo:rustc-link-lib=static=harfbuzz");
     println!("cargo:rustc-link-lib=static=sheenbidi");
@@ -40,9 +43,5 @@ fn main() {
         "cargo:rerun-if-changed={}",
         root_dir.join("meson.build").display()
     );
-    println!(
-        "cargo:rerun-if-changed={}",
-        root_dir.join("extern").display()
-    );
-    println!("cargo:rerun-if-changed={}", root_dir.join("lib").display());
+    println!("cargo:rerun-if-changed={}", root_dir.join("src").display());
 }

meson.build

@@ -1,4 +1,30 @@
 project('subset', 'c', 'cpp')
 
-subdir('extern')
-subdir('lib')
+harfbuzz_proj = subproject(
+  'harfbuzz',
+  default_options: ['default_library=static'],
+)
+
+harfbuzz_dep = harfbuzz_proj.get_variable('harfbuzz_dep')
+
+sheenbidi_proj = subproject(
+  'sheenbidi',
+  default_options: ['default_library=static'],
+)
+
+sheenbidi_dep = sheenbidi_proj.get_variable('sheenbidi_dep')
+
+subset_inc = include_directories('src')
+subset_sources = files('src/subset.cc')
+subset_lib = library(
+  'subset',
+  subset_sources,
+  cpp_args: ['-std=c++17', '-fno-exceptions', '-fno-rtti'],
+  dependencies: [harfbuzz_dep, sheenbidi_dep],
+  include_directories: subset_inc,
+)
+
+subset_dep = declare_dependency(
+  include_directories: subset_inc,
+  link_with: subset_lib,
+)

subprojects/.gitignore

@@ -0,0 +1,2 @@
+harfbuzz
+sheenbidi

subprojects/harfbuzz.wrap

@@ -0,0 +1,5 @@
+[wrap-git]
+url = https://github.com/harfbuzz/harfbuzz.git
+revision = 8.4.0
+depth = 1
+patch_directory = harfbuzz

subprojects/sheenbidi.wrap

@@ -0,0 +1,4 @@
+[wrap-git]
+url = https://github.com/Tehreer/SheenBidi.git
+revision = v2.7
+depth = 1