Merge branch 'mcpp-community:main' into main

Author: yizhinailong

.github/workflows/ci.yml

@@ -56,12 +56,14 @@ jobs:
       - name: Bootstrap mcpp via xlings
         env:
           XLINGS_NON_INTERACTIVE: '1'
+          XLINGS_VERSION: '0.4.25'
         run: |
-          # xlings: install if not cached. The installer reads from
-          # /dev/tty for an interactive prompt; XLINGS_NON_INTERACTIVE=1
-          # skips that and runs `xlings self install` directly.
           if [ ! -x "$HOME/.xlings/subos/default/bin/xlings" ]; then
-            curl -fsSL https://d2learn.org/xlings-install.sh | bash
+            tarball="xlings-${XLINGS_VERSION}-linux-x86_64.tar.gz"
+            curl -fsSL -o "/tmp/${tarball}" \
+              "https://github.com/d2learn/xlings/releases/download/v${XLINGS_VERSION}/${tarball}"
+            tar -xzf "/tmp/${tarball}" -C /tmp
+            "/tmp/xlings-${XLINGS_VERSION}-linux-x86_64/subos/default/bin/xlings" self install
           fi
           export PATH="$HOME/.xlings/subos/default/bin:$PATH"
           xlings --version

.github/workflows/release.yml

@@ -95,9 +95,17 @@ jobs:
       - name: Bootstrap mcpp via xlings
         env:
           XLINGS_NON_INTERACTIVE: '1'
+          # Pin xlings to a known-good version. The upstream install
+          # script always grabs `latest` (no version override), so we
+          # download + self-install manually to avoid broken releases.
+          XLINGS_VERSION: '0.4.25'
         run: |
           if [ ! -x "$HOME/.xlings/subos/default/bin/xlings" ]; then
-            curl -fsSL https://d2learn.org/xlings-install.sh | bash
+            tarball="xlings-${XLINGS_VERSION}-linux-x86_64.tar.gz"
+            curl -fsSL -o "/tmp/${tarball}" \
+              "https://github.com/d2learn/xlings/releases/download/v${XLINGS_VERSION}/${tarball}"
+            tar -xzf "/tmp/${tarball}" -C /tmp
+            "/tmp/xlings-${XLINGS_VERSION}-linux-x86_64/subos/default/bin/xlings" self install
           fi
           export PATH="$HOME/.xlings/subos/default/bin:$PATH"
           xlings --version

mcpp.toml

@@ -1,6 +1,6 @@
 [package]
 name        = "mcpp"
-version     = "0.0.6"
+version     = "0.0.7"
 description = "Modern C++ build & package management tool"
 license     = "Apache-2.0"
 authors     = ["mcpp-community"]
@@ -19,6 +19,9 @@ toolchain = "gcc@15.1.0-musl"
 linkage   = "static"
 
 # Eat our own dog food: mcpp uses mcpplibs.cmdline for argument parsing.
+# NOTE: uses legacy dotted-key syntax so older bootstrapping mcpp versions
+# (pre-0.0.6, which don't understand [dependencies.<ns>] subtables) can
+# still parse this file during the self-host release build.
 [dependencies]
 "mcpplibs.cmdline" = "0.0.1"
 

src/cli.cppm

@@ -1186,8 +1186,16 @@ prepare_build(bool print_fingerprint,
         // Propagate lua-level namespace into the loaded manifest when
         // the manifest itself doesn't carry one (Form A descriptors
         // whose upstream mcpp.toml predates the namespace field).
+        // Guard: if the manifest's name already starts with luaNs+"."
+        // (e.g. name="mcpplibs.tinyhttps" with luaNs="mcpplibs"),
+        // the namespace is already embedded in the name — don't inject
+        // it again or the scanner will produce a double-prefixed
+        // qualified name like "mcpplibs.mcpplibs.tinyhttps".
         if (manifest->package.namespace_.empty() && !luaNs.empty()) {
-            manifest->package.namespace_ = luaNs;
+            auto prefix = luaNs + ".";
+            if (!manifest->package.name.starts_with(prefix)) {
+                manifest->package.namespace_ = luaNs;
+            }
         }
 
         return std::pair{effRoot, std::move(*manifest)};
@@ -3290,7 +3298,7 @@ int run(int argc, char** argv) {
         std::string_view a = argv[1];
         if (a == "--help" || a == "-h") { print_usage(); return 0; }
         if (a == "--version" || a == "-V") {
-            std::println("mcpp {}", mcpp::toolchain::MCPP_VERSION);
+            std::println("mcpp {} - ", mcpp::toolchain::MCPP_VERSION);
             return 0;
         }
     }

src/toolchain/fingerprint.cppm

@@ -18,7 +18,7 @@ import mcpp.toolchain.detect;
 
 export namespace mcpp::toolchain {
 
-inline constexpr std::string_view MCPP_VERSION = "0.0.6";
+inline constexpr std::string_view MCPP_VERSION = "0.0.7";
 
 struct FingerprintInputs {
     Toolchain                       toolchain;