Merge pull request #72 from m-col/include

Package protocol headers
flacjacket · Jan 30, 2022 · ea292c1 · ea292c1
2 parents 37050f0 + 5986d09
commit ea292c1
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
 include *.txt
-include include/*.h
 include tiny/*.py
 recursive-include tests *.py
+recursive-include wlroots *.h
diff --git a/setup.cfg b/setup.cfg
@@ -40,7 +40,7 @@ test =
   pytest
 
 [options.package_data]
-wlroots = py.typed
+wlroots = py.typed, include/*.h
 
 [options.packages.find]
 include =

diff --git a/wlroots/ffi_build.py b/wlroots/ffi_build.py
@@ -9,7 +9,7 @@
 from pywayland.ffi_build import ffi_builder as pywayland_ffi
 from xkbcommon.ffi_build import ffibuilder as xkb_ffi
 
-include_dir = (Path(__file__).parent.parent / "include").resolve()
+include_dir = (Path(__file__).parent / "include").resolve()
 assert include_dir.is_dir(), f"missing {include_dir}"
 
 

diff --git a/...ointer-constraints-unstable-v1-protocol.h → ...ointer-constraints-unstable-v1-protocol.h b/...ointer-constraints-unstable-v1-protocol.h → ...ointer-constraints-unstable-v1-protocol.h
diff --git a/...de/wlr-layer-shell-unstable-v1-protocol.h → ...de/wlr-layer-shell-unstable-v1-protocol.h b/...de/wlr-layer-shell-unstable-v1-protocol.h → ...de/wlr-layer-shell-unstable-v1-protocol.h
diff --git a/include/xdg-shell-protocol.h → wlroots/include/xdg-shell-protocol.h b/include/xdg-shell-protocol.h → wlroots/include/xdg-shell-protocol.h