refactor: use xlings install mcpp@0.0.16 for macOS bootstrap

- .xlings.json: bump mcpp to 0.0.16
- CI/release: use `xlings install mcpp` with fallback to direct download
- Removes xmake dependency from main build path

Author: Sunrisepeak

.github/workflows/ci-macos.yml

@@ -268,33 +268,22 @@ jobs:
             *)              echo "FAIL: unexpected platform"; exit 1 ;;
           esac
 
-      - name: Build mcpp from source (xmake + xlings LLVM)
+      - name: Install mcpp via xlings and self-host build
         run: |
-          brew install xmake
-          # Generate xmake.lua
-          cat > xmake.lua << 'EOF'
-          add_rules("mode.release")
-          set_languages("c++23")
-          package("cmdline")
-              set_homepage("https://github.com/mcpplibs/cmdline")
-              add_urls("https://github.com/mcpplibs/cmdline/archive/refs/tags/$(version).tar.gz")
-              add_versions("0.0.1", "3fb2f5495c1a144485b3cbb2e43e27059151633460f702af0f3851cbff387ef0")
-              on_install(function (package)
-                  import("package.tools.xmake").install(package)
-              end)
-          package_end()
-          add_requires("cmdline 0.0.1")
-          target("mcpp")
-              set_kind("binary")
-              add_files("src/main.cpp")
-              add_files("src/**.cppm")
-              add_packages("cmdline")
-              add_includedirs("src/libs/json")
-              set_policy("build.c++.modules", true)
-          EOF
-          xmake f -y -m release --toolchain=llvm --sdk="$LLVM_ROOT"
-          xmake build -y mcpp
-          MCPP=$(find build -name mcpp -type f -perm +111 | head -1)
-          test -x "$MCPP"
-          "$MCPP" --version
-          echo ":: Build from source successful!"
+          # Install mcpp (declared in .xlings.json) via xlings
+          xlings install mcpp -y || {
+            # Fallback: download release binary directly if pkgindex not updated yet
+            echo "::warning::xlings install mcpp failed, using direct download"
+            WORK=$(mktemp -d)
+            curl -fsSL -o "$WORK/mcpp.tar.gz" \
+              "https://github.com/mcpp-community/mcpp/releases/download/v0.0.16/mcpp-0.0.16-macosx-arm64.tar.gz"
+            tar -xzf "$WORK/mcpp.tar.gz" -C "$WORK"
+            export PATH="$WORK/mcpp-0.0.16-macosx-arm64/bin:$PATH"
+          }
+          mcpp --version
+          # Self-host: build current source
+          mcpp build
+          SELFHOST=$(find target -path "*/bin/mcpp" | head -1)
+          test -x "$SELFHOST"
+          "$SELFHOST" --version
+          echo ":: Self-host successful!"

.github/workflows/release.yml

@@ -315,35 +315,22 @@ jobs:
           LLVM_ROOT=$(find "$HOME/.xlings" -path "*/xpkgs/xim-x-llvm/*/bin/clang++" | head -1 | xargs dirname | xargs dirname)
           echo "LLVM_ROOT=$LLVM_ROOT" >> "$GITHUB_ENV"
 
-      - name: Install xmake
-        run: brew install xmake
-
-      - name: Build mcpp (xmake + xlings LLVM)
+      - name: Install mcpp via xlings and build
         run: |
-          # Generate xmake.lua for this build
-          cat > xmake.lua << 'EOF'
-          add_rules("mode.release")
-          set_languages("c++23")
-          package("cmdline")
-              set_homepage("https://github.com/mcpplibs/cmdline")
-              add_urls("https://github.com/mcpplibs/cmdline/archive/refs/tags/$(version).tar.gz")
-              add_versions("0.0.1", "3fb2f5495c1a144485b3cbb2e43e27059151633460f702af0f3851cbff387ef0")
-              on_install(function (package)
-                  import("package.tools.xmake").install(package)
-              end)
-          package_end()
-          add_requires("cmdline 0.0.1")
-          target("mcpp")
-              set_kind("binary")
-              add_files("src/main.cpp")
-              add_files("src/**.cppm")
-              add_packages("cmdline")
-              add_includedirs("src/libs/json")
-              set_policy("build.c++.modules", true)
-          EOF
-          xmake f -y -m release --toolchain=llvm --sdk="$LLVM_ROOT"
-          xmake build -y mcpp
-          MCPP_BIN=$(find build -name mcpp -type f -perm +111 | head -1)
+          export PATH="$HOME/.xlings/subos/default/bin:$PATH"
+          # Install mcpp (declared in .xlings.json)
+          xlings install mcpp -y || {
+            echo "::warning::xlings install mcpp failed, using direct download"
+            WORK=$(mktemp -d)
+            curl -fsSL -o "$WORK/mcpp.tar.gz" \
+              "https://github.com/mcpp-community/mcpp/releases/download/v0.0.16/mcpp-0.0.16-macosx-arm64.tar.gz"
+            tar -xzf "$WORK/mcpp.tar.gz" -C "$WORK"
+            export PATH="$WORK/mcpp-0.0.16-macosx-arm64/bin:$PATH"
+          }
+          mcpp --version
+          # Build current source
+          mcpp build
+          MCPP_BIN=$(find target -path "*/bin/mcpp" | head -1)
           test -x "$MCPP_BIN"
           file "$MCPP_BIN"
           otool -L "$MCPP_BIN"

.xlings.json

@@ -1,6 +1,6 @@
 {
   "workspace": {
-    "mcpp": "0.0.9",
+    "mcpp": "0.0.16",
     "xmake": "3.0.7"
   }
 }