Merge pull request #204 from mgorny/fix-helper-install

Install cysignals-CSI-helper as package data for better portability

src/conftest.py

@@ -4,8 +4,11 @@
 from _pytest.nodes import Collector
 from _pytest.doctest import DoctestModule
 
+# cysignals-CSI only works from  gdb, i.e. invoke ./testgdb.py directly
+collect_ignore = ["cysignals/cysignals-CSI-helper.py"]
+
 if platform.system() == "Windows":
-    collect_ignore = [
+    collect_ignore += [
         "cysignals/alarm.pyx",
         "cysignals/pselect.pyx",
         "cysignals/pysignals.pyx",

src/cysignals/meson.build

@@ -2,6 +2,7 @@ configure_file(output: 'cysignals_config.h', configuration: config, install_dir:
 
 py.install_sources(
     '__init__.py',
+    'cysignals-CSI-helper.py',
     'memory.pxd',
     'pysignals.pxd',
     'signals.pxd',

src/scripts/cysignals-CSI

@@ -40,6 +40,7 @@ import site
 from argparse import ArgumentParser
 from datetime import datetime
 from shutil import which
+import importlib.resources as importlib_resources
 
 
 def pid_exists(pid):
@@ -65,15 +66,12 @@ def gdb_commands(pid, color):
     cmds += b'import sys; sys.stdout.flush()\n'
     cmds += b'end\n'
     cmds += b'bt full\n'
-    cysignals_share = os.path.join(os.path.dirname(sys.argv[0]), '..',
-                                   'share', 'cysignals')
-    script = os.path.join(cysignals_share, 'cysignals-CSI-helper.py')
-    with open(script, 'rb') as f:
-        cmds += b'python\n'
-        cmds += b'color = %r; ' % color
-        cmds += b'sys_path = %r; ' % sys.path
-        cmds += f.read()
-        cmds += b'end\n'
+    script = importlib_resources.files('cysignals') / 'cysignals-CSI-helper.py'
+    cmds += b'python\n'
+    cmds += b'color = %r; ' % color
+    cmds += b'sys_path = %r; ' % sys.path
+    cmds += script.read_bytes()
+    cmds += b'end\n'
     cmds += b'detach inferior 1\n'
     cmds += b'quit\n'
     return cmds

src/scripts/meson.build

@@ -1 +1,2 @@
-install_data('cysignals-CSI-helper.py', install_dir: py.get_install_dir(pure: false) / 'cysignals' / 'data')
+install_data('cysignals-CSI', install_dir : get_option('bindir'))
+