IncludeCPP 4.6.8__tar.gz → 4.7.0__tar.gz

{includecpp-4.6.8 → includecpp-4.7.0}/IncludeCPP.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 4.6.8
+Version: 4.7.0
 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.8 → includecpp-4.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 4.6.8
+Version: 4.7.0
 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.8 → includecpp-4.7.0}/includecpp/__init__.py

@@ -2,14 +2,31 @@ from .core.cpp_api import CppApi
 from .core import cssl_bridge as CSSL
 import warnings
 import os
+import sys
 from pathlib import Path
 
-__version__ = "4.6.8"
+__version__ = "4.7.0"
 __all__ = ["CppApi", "CSSL"]
 
 # Module-level cache for C++ modules
 _api_instance = None
 _loaded_modules = {}
+_frozen_api = None  # Cached API module for frozen (PyInstaller) mode
+
+def _is_frozen():
+    """Check if running in a frozen PyInstaller bundle."""
+    return getattr(sys, 'frozen', False)
+
+def _get_frozen_api():
+    """Get the bundled API module when running frozen."""
+    global _frozen_api
+    if _frozen_api is None:
+        try:
+            import api
+            _frozen_api = api
+        except ImportError:
+            _frozen_api = False  # Mark as not available
+    return _frozen_api if _frozen_api else None
 
 def _get_api():
     """Get or create singleton CppApi instance.
@@ -43,6 +60,20 @@ def __getattr__(name: str):
     if name in _loaded_modules:
         return _loaded_modules[name]
 
+    # In frozen mode (PyInstaller), try to get module from bundled api
+    if _is_frozen():
+        frozen_api = _get_frozen_api()
+        if frozen_api and hasattr(frozen_api, name):
+            module = getattr(frozen_api, name)
+            _loaded_modules[name] = module
+            return module
+        # If not found in frozen api, raise helpful error
+        raise AttributeError(
+            f"Module '{name}' not found in bundled executable. "
+            f"Ensure it was included during build with 'includecpp --make-exe'."
+        )
+
+    # Normal mode: use CppApi
     api = _get_api()
 
     if name not in api.registry:

{includecpp-4.6.8 → includecpp-4.7.0}/includecpp/cli/commands.py

@@ -430,10 +430,17 @@ def _show_doc(search_term: str = None):
     _safe_echo("=" * 70)
 
 
-def _make_executable(script_path: str, onefile: bool = True, console: bool = True, icon: str = None):
+def _make_executable(script_path: str, output_name: str = None, onefile: bool = True, console: bool = True, icon: str = None):
     """Build .exe from Python script using PyInstaller.
 
     Auto-detects dependencies, rebuilds includecpp if needed, and cleans up.
+
+    Args:
+        script_path: Path to the Python script
+        output_name: Optional custom name for output executable (without .exe)
+        onefile: Build as single file (True) or directory (False)
+        console: Show console window (True) or windowed mode (False)
+        icon: Path to icon file (.ico)
     """
     import re
     import shutil
@@ -449,10 +456,12 @@ def _make_executable(script_path: str, onefile: bool = True, console: bool = Tru
         return
 
     script_dir = script_path.parent
-    script_name = script_path.stem
+    script_name = output_name if output_name else script_path.stem
 
     click.echo()
     click.secho(f"Building executable from: {script_path.name}", fg='cyan', bold=True)
+    if output_name:
+        click.echo(f"  Output name: {output_name}.exe")
     click.echo("=" * 50)
 
     # Check if PyInstaller is installed
@@ -511,6 +520,7 @@ def _make_executable(script_path: str, onefile: bool = True, console: bool = Tru
 
     # Build data files list for PyInstaller
     datas = []
+    binaries = []  # For .pyd/.so files
     hidden_imports = []
 
     # If includecpp is used, rebuild and include the compiled modules
@@ -544,9 +554,23 @@ def _make_executable(script_path: str, onefile: bool = True, console: bool = Tru
                 # Rebuild the modules
                 click.echo("    Rebuilding C++ modules...")
                 try:
-                    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
+                    from .compiler_detect import detect_compiler
+
+                    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')
 
@@ -561,8 +585,8 @@ def _make_executable(script_path: str, onefile: bool = True, console: bool = Tru
 
                     for pyd_file in pyd_files:
                         click.echo(f"    Including: {pyd_file.name}")
-                        # Add to includecpp package location
-                        datas.append((str(pyd_file), 'includecpp'))
+                        # Add as binary to root (importable as 'api')
+                        binaries.append((str(pyd_file), '.'))
 
                     if pyd_files:
                         click.secho(f"    Added {len(pyd_files)} compiled module(s)", fg='green')
@@ -575,6 +599,7 @@ def _make_executable(script_path: str, onefile: bool = True, console: bool = Tru
             click.secho("    Warning: cpp.proj not found. C++ modules may not be included.", fg='yellow')
 
         hidden_imports.append('includecpp')
+        hidden_imports.append('api')  # The compiled module
 
     # Add GUI-specific settings
     if uses_pyqt6:
@@ -613,10 +638,18 @@ def _make_executable(script_path: str, onefile: bool = True, console: bool = Tru
     if icon:
         cmd.extend(['--icon', str(Path(icon).resolve())])
 
+    # Set output name if specified
+    if output_name:
+        cmd.extend(['--name', output_name])
+
     # Add data files
     for src, dest in datas:
         cmd.extend(['--add-data', f'{src}{os.pathsep}{dest}'])
 
+    # Add binary files (.pyd/.so)
+    for src, dest in binaries:
+        cmd.extend(['--add-binary', f'{src}{os.pathsep}{dest}'])
+
     # Add hidden imports
     for imp in hidden_imports:
         cmd.extend(['--hidden-import', imp])
@@ -706,6 +739,7 @@ def _make_executable(script_path: str, onefile: bool = True, console: bool = Tru
 @click.option('--changelog', 'show_changelog', is_flag=True, help='Show changelog (last 2 releases by default)')
 @click.option('--all', 'changelog_all', is_flag=True, help='Show all changelog entries (use with --changelog)')
 @click.option('--make-exe', 'make_exe_path', type=click.Path(exists=True), help='Build .exe from Python script')
+@click.option('--exe-name', 'exe_name', type=str, help='Output executable name (without .exe)')
 @click.option('--onefile/--onedir', 'onefile', default=True, help='Build as single file or directory (default: onefile)')
 @click.option('--console/--windowed', 'console', default=True, help='Show console window or not (default: console)')
 @click.option('--icon', type=click.Path(exists=True), help='Icon file for executable (.ico)')
@@ -720,7 +754,7 @@ def _make_executable(script_path: str, onefile: bool = True, console: bool = Tru
 @click.option('--9', 'changelog_9', is_flag=True, hidden=True)
 @click.option('--10', 'changelog_10', is_flag=True, hidden=True)
 @click.pass_context
-def cli(ctx, doc_search, doc_flag, show_changelog, changelog_all, make_exe_path, onefile, console, icon,
+def cli(ctx, doc_search, doc_flag, show_changelog, changelog_all, make_exe_path, exe_name, onefile, console, icon,
         changelog_1, changelog_2, changelog_3, changelog_4, changelog_5, changelog_6, changelog_7,
         changelog_8, changelog_9, changelog_10):
     """IncludeCPP - C++ Performance in Python, Zero Hassle
@@ -766,7 +800,7 @@ def cli(ctx, doc_search, doc_flag, show_changelog, changelog_all, make_exe_path,
 
     # Handle --make-exe
     if make_exe_path:
-        _make_executable(make_exe_path, onefile=onefile, console=console, icon=icon)
+        _make_executable(make_exe_path, output_name=exe_name, onefile=onefile, console=console, icon=icon)
         ctx.exit(0)
 
     # If no subcommand is given, show help

{includecpp-4.6.8 → includecpp-4.7.0}/pyproject.toml

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