Merge pull request #3 from compiler-explorer/fix-version-handling-and-type-detection

Fix version handling and library type detection issues

Author: partouf

README.md

@@ -46,9 +46,12 @@ gh auth login
 # Add a Rust library
 ./run.sh --lang=rust --lib=serde --ver=1.0.195
 
-# Add a C++ library
+# Add a C++ library with automatic type detection
 ./run.sh --lang=cpp --lib=https://github.com/fmtlib/fmt --ver=10.2.1
 
+# Add a header-only C++ library
+./run.sh --lang=cpp --lib=https://github.com/bobluppes/graaf --ver=v1.1.1 --type=header-only
+
 # Preview changes first
 ./run.sh --verify --lang=rust --lib=tokio --ver=1.35.0
 ```

cli/main.py

@@ -13,7 +13,7 @@
 from core.fortran_handler import FortranHandler
 from core.git_operations import GitManager
 from core.github_auth import get_github_token_via_gh_cli, get_github_token_via_oauth
-from core.models import Language, LibraryConfig
+from core.models import Language, LibraryConfig, LibraryType
 from core.rust_handler import RustLibraryHandler
 from core.subprocess_utils import run_ce_install_command
 from core.ui_utils import (
@@ -718,6 +718,13 @@ def process_fortran_library(
 )
 @click.option("--lib", help="Library name (for Rust) or GitHub URL (for other languages)")
 @click.option("--ver", help="Library version (comma-separated for multiple versions)")
+@click.option(
+    "--type",
+    type=click.Choice(
+        ["header-only", "packaged-headers", "static", "shared", "cshared"], case_sensitive=False
+    ),
+    help="Library type (for C/C++ libraries)",
+)
 def main(
     debug: bool,
     github_token: str | None,
@@ -729,6 +736,7 @@ def main(
     lang: str | None,
     lib: str | None,
     ver: str | None,
+    type: str | None,
 ):
     """CLI tool to add libraries to Compiler Explorer"""
     if debug:
@@ -782,6 +790,18 @@ def main(
                 elif language == Language.FORTRAN:
                     config.library_id = FortranHandler.suggest_library_id_static(lib)
 
+                # Set library type if provided
+                if type:
+                    type_map = {
+                        "header-only": LibraryType.HEADER_ONLY,
+                        "packaged-headers": LibraryType.PACKAGED_HEADERS,
+                        "static": LibraryType.STATIC,
+                        "shared": LibraryType.SHARED,
+                        "cshared": LibraryType.CSHARED,
+                    }
+                    config.library_type = type_map[type.lower()]
+                    click.echo(f"✓ Using specified library type: {config.library_type.value}")
+
                 # Normalize versions by checking git tags
                 click.echo("Checking git tags for version format...")
                 config.normalize_versions_with_git_lookup()

core/c_handler.py

@@ -69,6 +69,9 @@ def detect_library_type(
                 elif existing_config.get("type") == "shared":
                     logger.info(f"Using existing configuration: {library_id} is shared")
                     return True, LibraryType.SHARED
+                elif existing_config.get("type") == "cshared":
+                    logger.info(f"Using existing configuration: {library_id} is cshared")
+                    return True, LibraryType.CSHARED
                 # If existing config doesn't have clear type info, continue with detection
 
         with tempfile.TemporaryDirectory() as tmpdir:

core/cpp_handler.py

@@ -94,6 +94,9 @@ def detect_library_type(
             elif lib_type == "shared":
                 logger.info(f"Using existing configuration: {library_id} is shared")
                 return True, LibraryType.SHARED
+            elif lib_type == "cshared":
+                logger.info(f"Using existing configuration: {library_id} is cshared")
+                return True, LibraryType.CSHARED
 
             # If it's type: github with no explicit build_type, it might be header-only by default
             if lib_type == "github" and build_type is None:
@@ -153,7 +156,11 @@ def add_library(self, config: LibraryConfig) -> str | None:
 
             if config.library_type:
                 subcommand.extend(["--type", config.library_type.value])
+                logger.info(f"Adding library with type: {config.library_type.value}")
+            else:
+                logger.warning("No library type specified for cpp-library add command")
 
+            logger.info(f"Running command: {' '.join(subcommand)}")
             result = run_ce_install_command(subcommand, cwd=self.infra_path, debug=self.debug)
 
             if result.returncode != 0:
@@ -187,6 +194,21 @@ def add_library(self, config: LibraryConfig) -> str | None:
 
             if library_id:
                 logger.info(f"Successfully added C++ library with ID: {library_id}")
+
+                # Debug: Check what was actually written to libraries.yaml
+                try:
+                    existing_config = check_existing_library_config(
+                        str(config.github_url), library_id, self.infra_path
+                    )
+                    if existing_config:
+                        logger.info(f"Library config in libraries.yaml: {existing_config}")
+                    else:
+                        logger.warning(
+                            f"Could not find {library_id} in libraries.yaml after adding"
+                        )
+                except Exception as e:
+                    logger.warning(f"Could not check libraries.yaml: {e}")
+
                 return library_id
             else:
                 logger.warning("Could not parse library ID from output, using suggested ID")

core/models.py

@@ -30,6 +30,7 @@ class LibraryType(str, Enum):
     PACKAGED_HEADERS = "packaged-headers"
     STATIC = "static"
     SHARED = "shared"
+    CSHARED = "cshared"
 
 
 def check_git_tag_exists(repo_url: str, tag: str) -> bool:

docs/quick-start.md

@@ -71,6 +71,21 @@ Get detailed output for troubleshooting:
 ./run.sh --debug --lang=cpp --lib=https://github.com/nlohmann/json --ver=3.11.3
 ```
 
+### Specify Library Type (C/C++ only)
+Skip automatic detection and specify the library type directly:
+```bash
+# Header-only library
+./run.sh --lang=cpp --lib=https://github.com/bobluppes/graaf --ver=v1.1.1 --type=header-only
+
+# Packaged headers library  
+./run.sh --lang=cpp --lib=https://github.com/eigen/eigen --ver=3.4.0 --type=packaged-headers
+
+# Shared library (requires compilation)
+./run.sh --lang=c --lib=https://github.com/curl/curl --ver=8.5.0 --type=cshared
+```
+
+Valid types: `header-only`, `packaged-headers`, `static`, `shared`, `cshared`
+
 ### Test Installation (C++ only)
 Validate that the library installs correctly:
 ```bash