Improve meson build

Author: tobiasdiez

.github/workflows/main.yml

@@ -118,7 +118,7 @@ jobs:
         needs: [dist]
 
 env:
-    # Ubuntu packages to install so that the project's "python -m build --sdist" can succeed
+    # Ubuntu packages to install so that building the sdist can succeed
     DIST_PREREQ: libpari-dev pari-doc libbz2-dev bzip2
     # Name of this project in the Sage distribution
     SPKG:        cypari

MANIFEST.in

@@ -0,0 +1,44 @@
+py.install_sources(
+  '__init__.py',
+  'closure.pxd',
+  'convert.pxd',
+  'gen.pxd',
+  'handle_error.pxd',
+  'pari_instance.pxd',
+  'paridecl.pxd',
+  'paripriv.pxd',
+  'pycore_long.pxd',
+  'stack.pxd',
+  'string_utils.pxd',
+  'types.pxd',
+  'cypari.h',
+  'pycore_long.h',
+  'auto_paridecl.pxd',
+  'auto_gen.pxi',
+  'auto_instance.pxi',
+  subdir: 'cypari2'
+)
+
+
+extension_data = {
+  'closure': files('closure.pyx'),
+  'stack': files('stack.pyx'),
+  'custom_block': files('custom_block.pyx'),
+  'convert': files('convert.pyx'),
+  'string_utils': files('string_utils.pyx'),
+  'handle_error': files('handle_error.pyx'),
+  'gen': files('gen.pyx'),
+  'pari_instance': files('pari_instance.pyx')
+}
+
+foreach name, pyx : extension_data
+  py.extension_module(
+    name,
+    sources: pyx,
+    subdir: 'cypari2',
+    install: true,
+    #include_directories: [inc_dirs, 'cypari2'],
+    dependencies: [cysignals, pari],
+  )
+endforeach
+

cypari2/meson.build

@@ -1,178 +1,51 @@
-project('cypari2', 'c',
-  version: run_command(
-    'cat', files('VERSION'),
-    check: true
-  ).stdout().strip(),
-  default_options: ['warning_level=0']
+project('cypari2', 
+  ['c', 'cython'],
+  version: files('VERSION'),
+  license: 'GPL v3',
+  default_options: ['c_std=c17', 'cpp_std=c++17', 'python.install_env=auto'],
+  meson_version: '>=1.2',
 )
 
-# Import Python module
+# Python module
+# https://mesonbuild.com/Python-module.html
 py = import('python').find_installation(pure: false)
 
-# Add dependencies
-cython = find_program('cython', required: true)
+# Compilers
+cc = meson.get_compiler('c')
+cython = meson.get_compiler('cython')
 
-# Import the dependencies we need  
-cysignals_dep = dependency('cysignals', required: false)
-cysignals_include_dir = []
-
-if not cysignals_dep.found()
-  # Try to find cysignals via Python
-  cysignals_result = run_command(
-    py.full_path(), '-c', 
+# Dependencies  
+inc_cysignals = run_command(
+  py,
+  [
+    '-c',
     '''
+from os.path import relpath
 import cysignals
-import os
-print(os.path.dirname(cysignals.__file__))
-    ''',
-    check: false
-  )
-  if cysignals_result.returncode() == 0
-    cysignals_include_dir = [cysignals_result.stdout().strip()]
-  else
-    error('cysignals not found. Please install cysignals.')
-  endif
-endif
-
-# Get include directories for PARI
-pari_include_dirs = []
-pari_library_dirs = []
-
-# Try to find PARI using pkg-config
-pari_dep = dependency('pari', required: false)
-
-if not pari_dep.found()
-  # Fallback: run a Python script to get PARI paths
-  pari_paths_result = run_command(
-    py.full_path(), '-c',
-    '''
-import sys, json
-sys.path.insert(0, ".")
+path = cysignals.__file__.replace('__init__.py', '')
 try:
-  from autogen.paths import include_dirs, library_dirs
-  result = {"include_dirs": include_dirs(), "library_dirs": library_dirs()}
-  print(json.dumps(result))
-except Exception as e:
-  print(json.dumps({"include_dirs": [], "library_dirs": [], "error": str(e)}))
-    ''',
-    check: true
-  )
-  
-  pari_json_str = pari_paths_result.stdout().strip()
-  # For now, use common paths as fallback
-  pari_include_dirs = ['/usr/include', '/usr/local/include']
-  pari_library_dirs = ['/usr/lib', '/usr/local/lib', '/usr/lib/x86_64-linux-gnu']
-endif
-
-# Include directories
-all_include_dirs = pari_include_dirs + cysignals_include_dir
-inc_dirs = include_directories(all_include_dirs)
+  print(relpath(path))
+except Exception:
+  print(path)
+    '''.strip(),
+  ],
+  check: true,
+).stdout().strip()
+cysignals = declare_dependency(include_directories: inc_cysignals)
+# Cannot be found via pkg-config
+pari = cc.find_library('pari', required: true)
 
 # Run code generation step
 code_gen_result = run_command(
   py.full_path(), '-c',
   '''
 import sys
 sys.path.insert(0, ".")
-try:
-  from autogen import rebuild
-  rebuild(force=True)
-  print("Code generation successful")
-except Exception as e:
-  print("Code generation failed: " + str(e))
-  import traceback
-  traceback.print_exc()
+from autogen import rebuild
+rebuild(force=True)
+print("Code generation successful")
   ''',
-  check: false
+  check: true
 )
 
-if code_gen_result.returncode() != 0
-  warning('Code generation may have failed: ' + code_gen_result.stdout() + code_gen_result.stderr())
-endif
-
-# Define the source files
-cython_sources = [
-  'cypari2/closure.pyx',
-  'cypari2/stack.pyx', 
-  'cypari2/custom_block.pyx',
-  'cypari2/convert.pyx',
-  'cypari2/string_utils.pyx',
-  'cypari2/handle_error.pyx',
-  'cypari2/gen.pyx',
-  'cypari2/pari_instance.pyx'
-]
-
-# Create targets for each Cython source file
-py_sources = []
-foreach src : cython_sources
-  basename = src.split('/')[1].split('.')[0]
-  c_file = custom_target(basename + '_c',
-    input: src,
-    output: basename + '.c',
-    command: [
-      cython, 
-      '-3',
-      '--capi-reexport-cincludes',
-      '-I', meson.current_source_dir() / 'cypari2',
-      '@INPUT@',
-      '-o', '@OUTPUT@'
-    ]
-  )
-  
-  py_ext = py.extension_module(
-    basename,
-    c_file,
-    include_directories: [inc_dirs, 'cypari2'],
-    dependencies: [cysignals_dep, pari_dep],
-    link_args: ['-lpari'],
-    install: true,
-    subdir: 'cypari2'
-  )
-  py_sources += py_ext
-endforeach
-
-# Install Python package files
-python_sources = [
-  'cypari2/__init__.py',
-]
-
-py.install_sources(
-  python_sources,
-  subdir: 'cypari2'
-)
-
-# Install package data files
-package_data = [
-  'cypari2/closure.pxd',
-  'cypari2/convert.pxd',
-  'cypari2/gen.pxd',
-  'cypari2/handle_error.pxd',
-  'cypari2/pari_instance.pxd',
-  'cypari2/paridecl.pxd',
-  'cypari2/paripriv.pxd',
-  'cypari2/pycore_long.pxd',
-  'cypari2/stack.pxd',
-  'cypari2/string_utils.pxd',
-  'cypari2/types.pxd',
-  'cypari2/cypari.h',
-  'cypari2/pycore_long.h',
-]
-
-# Check if auto-generated files exist and install them
-auto_files = [
-  'cypari2/auto_paridecl.pxd',
-  'cypari2/auto_gen.pxi',
-  'cypari2/auto_instance.pxi',
-]
-
-foreach f : auto_files
-  if import('fs').is_file(f)
-    package_data += f
-  endif
-endforeach
-
-py.install_sources(
-  package_data,
-  subdir: 'cypari2',
-  preserve_path: false
-)
+subdir('cypari2')

meson.build

@@ -1,35 +1,22 @@
 [build-system]
-requires = [
-    "meson-python>=0.15.0",
-    "Cython>=3.0",
-    "cysignals>=1.11.3",
-    "meson>=1.1.0",
-    "ninja",
-    "pkg-config",
-]
+requires = ["meson-python>=0.15.0", "cython>=3.0", "cysignals>=1.11.3"]
 build-backend = "mesonpy"
 
 [project]
 name = "cypari2"
 description = "A Python interface to the number theory library PARI/GP"
 authors = [
-    {name = "Luca De Feo, Vincent Delecroix, Jeroen Demeyer, Vincent Klein"},
+    { name = "Luca De Feo, Vincent Delecroix, Jeroen Demeyer, Vincent Klein" },
 ]
 maintainers = [
-    {name = "SageMath developers", email = "[email protected]"},
-]
-dependencies = [
-    "cysignals>=1.11.3",
+    { name = "SageMath developers", email = "[email protected]" },
 ]
+dependencies = ["cysignals>=1.11.3"]
 requires-python = ">=3.9"
 readme = "README.rst"
-license = {text = "GNU General Public License, version 2 or later"}
+license = { text = "GNU General Public License, version 2 or later" }
 keywords = ["PARI/GP number theory"]
-dynamic = [
-    "version",
-]
+dynamic = ["version"]
 
 [project.urls]
 Homepage = "https://github.com/sagemath/cypari2"
-
-