IncludeCPP 4.6.9__tar.gz → 4.7.2__tar.gz

{includecpp-4.6.9 → includecpp-4.7.2}/IncludeCPP.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 4.6.9
+Version: 4.7.2
 Summary: Professional C++ Python bindings with type-generic templates, pystubs and native threading
 Home-page: https://github.com/liliassg/IncludeCPP
 Author: Lilias Hatterscheidt

{includecpp-4.6.9 → includecpp-4.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 4.6.9
+Version: 4.7.2
 Summary: Professional C++ Python bindings with type-generic templates, pystubs and native threading
 Home-page: https://github.com/liliassg/IncludeCPP
 Author: Lilias Hatterscheidt

{includecpp-4.6.9 → includecpp-4.7.2}/includecpp/__init__.py

@@ -5,7 +5,7 @@ import os
 import sys
 from pathlib import Path
 
-__version__ = "4.6.9"
+__version__ = "4.7.2"
 __all__ = ["CppApi", "CSSL"]
 
 # Module-level cache for C++ modules
@@ -22,10 +22,31 @@ def _get_frozen_api():
     global _frozen_api
     if _frozen_api is None:
         try:
+            # In PyInstaller, sys._MEIPASS is the temp extraction directory
+            if hasattr(sys, '_MEIPASS'):
+                meipass = sys._MEIPASS
+                if meipass not in sys.path:
+                    sys.path.insert(0, meipass)
+
+                # Try to load api.pyd directly using importlib
+                import importlib.util
+                ext = '.pyd' if sys.platform == 'win32' else '.so'
+                api_path = os.path.join(meipass, f'api{ext}')
+
+                if os.path.exists(api_path):
+                    spec = importlib.util.spec_from_file_location('api', api_path)
+                    if spec and spec.loader:
+                        api_module = importlib.util.module_from_spec(spec)
+                        sys.modules['api'] = api_module
+                        spec.loader.exec_module(api_module)
+                        _frozen_api = api_module
+                        return _frozen_api
+
+            # Fallback to regular import
             import api
             _frozen_api = api
-        except ImportError:
-            _frozen_api = False  # Mark as not available
+        except Exception:
+            _frozen_api = False
     return _frozen_api if _frozen_api else None
 
 def _get_api():

{includecpp-4.6.9 → includecpp-4.7.2}/includecpp/cli/commands.py

@@ -554,10 +554,23 @@ def _make_executable(script_path: str, output_name: str = None, onefile: bool =
                 # Rebuild the modules
                 click.echo("    Rebuilding C++ modules...")
                 try:
-                    from ..core.cpp_api import CppApi
-                    api = CppApi(config_path=cpp_proj_path)
-                    api.rebuild()
-                    click.secho("    Rebuild complete!", fg='green')
+                    from ..core.build_manager import BuildManager
+                    from .config_parser import CppProjectConfig
+                    # detect_compiler is defined in this file
+
+                    config = CppProjectConfig(config_path=cpp_proj_path)
+                    project_root = cpp_proj_path.parent
+                    compiler = detect_compiler()
+                    build_dir_path = config.get_build_dir(compiler)
+                    build_dir_path.mkdir(parents=True, exist_ok=True)
+
+                    builder = BuildManager(project_root, build_dir_path, config)
+                    success = builder.rebuild(incremental=True)
+
+                    if success:
+                        click.secho("    Rebuild complete!", fg='green')
+                    else:
+                        click.secho("    Warning: Rebuild had errors", fg='yellow')
                 except Exception as e:
                     click.secho(f"    Warning: Rebuild failed: {e}", fg='yellow')
 
@@ -567,8 +580,15 @@ def _make_executable(script_path: str, output_name: str = None, onefile: bool =
 
                 if build_dir.exists():
                     # Find all .pyd files (Windows) or .so files (Linux/Mac)
+                    # They are in the bindings/ subdirectory
                     ext = '.pyd' if sys.platform == 'win32' else '.so'
-                    pyd_files = list(build_dir.glob(f'*{ext}'))
+                    bindings_dir = build_dir / 'bindings'
+
+                    # Search recursively in case structure changes
+                    pyd_files = list(bindings_dir.glob(f'*{ext}')) if bindings_dir.exists() else []
+                    if not pyd_files:
+                        # Fallback: search entire build dir recursively
+                        pyd_files = list(build_dir.glob(f'**/*{ext}'))
 
                     for pyd_file in pyd_files:
                         click.echo(f"    Including: {pyd_file.name}")
@@ -577,6 +597,8 @@ def _make_executable(script_path: str, output_name: str = None, onefile: bool =
 
                     if pyd_files:
                         click.secho(f"    Added {len(pyd_files)} compiled module(s)", fg='green')
+                    else:
+                        click.secho("    Warning: No compiled modules found in build directory", fg='yellow')
                 else:
                     click.secho("    Warning: Build directory not found", fg='yellow')
 

{includecpp-4.6.9 → includecpp-4.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "IncludeCPP"
-version = "4.6.9"
+version = "4.7.2"
 description = "Professional C++ Python bindings with type-generic templates, pystubs and native threading"
 readme = "README.md"
 requires-python = ">=3.9"