Move _frida package inside the frida package

So we only have one top-level package, to avoid confusing IDEs.

frida/__init__.py

@@ -1,7 +1,7 @@
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 try:
-    import _frida
+    from . import _frida
 except Exception as ex:
     print("")
     print("***")

src/meson.build → frida/_frida/meson.build

@@ -1,14 +1,21 @@
+py_sources = [
+  '__init__.pyi',
+  'py.typed',
+]
+python.install_sources(py_sources, subdir: 'frida' / '_frida', pure: false)
+
 extra_link_args = []
 if host_os_family == 'darwin'
   extra_link_args += '-Wl,-exported_symbol,_PyInit__frida'
 elif host_os_family != 'windows'
-  extra_link_args += '-Wl,--version-script,' + meson.current_source_dir() / '_frida.version'
+  extra_link_args += '-Wl,--version-script,' + meson.current_source_dir() / 'extension.version'
 endif
 
-extension = python.extension_module('_frida', '_frida.c',
+extension = python.extension_module('_frida', 'extension.c',
   limited_api: '3.7',
   c_args: frida_component_cflags,
   link_args: extra_link_args,
   dependencies: [python_dep, frida_core_dep, os_deps],
   install: true,
+  subdir: 'frida',
 )

frida/core.py

@@ -38,7 +38,7 @@
 else:
     from typing_extensions import NotRequired
 
-import _frida
+from . import _frida
 
 _device_manager = None
 

frida/meson.build

@@ -1,6 +1,8 @@
-frida_sources = [
+subdir('_frida')
+
+py_sources = [
   '__init__.py',
   'core.py',
+  'py.typed',
 ]
-
-python.install_sources(frida_sources, subdir: 'frida', pure: false)
+python.install_sources(py_sources, subdir: 'frida', pure: false)

meson.build

@@ -30,7 +30,6 @@ if host_os_family != 'windows'
   os_deps += dependency('gio-unix-2.0')
 endif
 
-subdir('src')
 subdir('frida')
 
 test('frida-python', python,

setup.py

@@ -51,12 +51,12 @@ def main():
             "Topic :: Software Development :: Debuggers",
             "Topic :: Software Development :: Libraries :: Python Modules",
         ],
-        packages=["frida", "_frida"],
-        package_data={"frida": ["py.typed"], "_frida": ["py.typed", "__init__.pyi"]},
+        packages=["frida", "frida._frida"],
+        package_data={"frida": ["py.typed"], "frida._frida": ["py.typed", "__init__.pyi"]},
         ext_modules=[
             Extension(
-                name="_frida",
-                sources=["src/_frida.c"],
+                name="frida._frida",
+                sources=["frida/_frida/extension.c"],
                 py_limited_api=True,
             )
         ],