diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..dfdb8b7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf diff --git a/AGENTS.md b/AGENTS.md index 9c48289..1f17ff6 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -30,7 +30,7 @@ | `desktop/Ads.Desktop.Smoke/` | 桌面离屏布局、连接及可选真机冒烟验证入口 | C#、XML(csproj) | | `deploy/` | 服务器/设备端部署脚本与 Caddy、Nginx、systemd、launchd 配置示例 | Shell、服务/代理配置、XML(plist)、Markdown | | `deploy/windows/` | Windows 设备端准备与计划任务部署、桌面安装包定义及配置示例 | PowerShell、Inno Setup(ISS)、JSON、Markdown | -| `scripts/` | 项目构建、打包及本地启动脚本 | PowerShell、Shell | +| `scripts/` | 项目构建、Windows 安装包、Linux deb/tar.gz 打包及本地启动脚本 | PowerShell、Shell | | `tests/` | Python 桥接测试、三端集成测试及可选真机验证 | Python | | `docs/` | 协议、部署、验证及旧局域网桥接说明 | Markdown | | `config/` | 本地配置容器;`private/` 保存私有凭据等配置,已被 Git 忽略,不纳入发布包 | 环境变量文件等配置格式,无业务源码 | diff --git a/README.md b/README.md index b711737..c761ed1 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Windows 现支持可选的 [USB ADB 模拟](docs/windows-usb.md),默认网络 | `desktop/Ads.Desktop.Smoke/` | 桌面离屏布局、连接及可选真机冒烟验证入口 | C#、XML(csproj) | | `deploy/` | 服务器/设备端部署脚本与 Caddy、Nginx、systemd、launchd 配置示例 | Shell、服务/代理配置、XML(plist)、Markdown | | `deploy/windows/` | Windows 设备端准备与计划任务部署、桌面安装包定义及配置示例 | PowerShell、Inno Setup(ISS)、JSON、Markdown | -| `scripts/` | 项目构建、打包及本地启动脚本 | PowerShell、Shell | +| `scripts/` | 项目构建、Windows 安装包、Linux deb/tar.gz 打包及本地启动脚本 | PowerShell、Shell | | `tests/` | Python 桥接测试、三端集成测试及可选真机验证 | Python | | `docs/` | 协议、部署、验证及旧局域网桥接说明 | Markdown | | `config/` | 本地配置容器;`private/` 保存私有凭据等配置,已被 Git 忽略,不纳入发布包 | 环境变量文件等配置格式,无业务源码 | @@ -225,3 +225,5 @@ python tests/real_device.py --adb-server 192.168.5.222:5037 --serial 192.168.100 设备列表、配置、连接管理、托盘、运行日志及 scrcpy 独立窗口手机控制现已放在 `desktop/`。启动和工具路径配置见 [桌面客户端说明](desktop/README.md)。 Agent 管理发行入口:`scripts/build-desktop.ps1` 生成 `bin/desktop-win-x64/`,`scripts/build-flutter.ps1` 生成 `bin/flutter-win-x64/`,两者均包含 Agent/CLI,均不包含私有凭据。Avalonia 本机 Agent 托盘使用 `scripts/start-agent-tray.ps1`。 + +Linux 安装包:`bash scripts/build-linux-packages.sh`,提供 `.deb` 和 `.tar.gz`,详见 [Linux 打包](docs/linux-packaging.md)。 diff --git a/docs/linux-packaging.md b/docs/linux-packaging.md new file mode 100644 index 0000000..097ffba --- /dev/null +++ b/docs/linux-packaging.md @@ -0,0 +1,18 @@ +# Linux 打包 + +在 Linux 主机执行 `bash scripts/build-linux-packages.sh`,默认打包 Avalonia、Agent、控制中心/中继。支持本机 x86_64 和 aarch64,不做跨架构伪装。需要 bash、python3、dpkg-deb、tar、.NET 8 SDK;先构建 Rust 和 Go 后端。 + +```sh +bash scripts/build.sh +bash scripts/build-linux-packages.sh +# 只打包无界面 Agent +bash scripts/build-linux-packages.sh agent +``` + +输出 `bin/installers/linux/` 中的 `.deb`、便携 `.tar.gz` 与 SHA256SUMS。Deb 安装路径 `/opt/ttstd/ads-*`,桌面端添加应用菜单,命令入口 `/usr/bin/ads-*`。通过 `sudo apt install ./包名.deb` 安装并解析依赖,同名包覆盖升级,通过 `sudo apt remove ads-avalonia` 等卸载。不会自动注册或启动 Agent 服务;用 adsctl 初始化并显式安装 systemd 服务,详见 agent-management.md。私有配置不放入包中,卸载不删除用户数据。 + +可用 ADS_LINUX_BIN 指定 ads-agent/ads-client/adsctl 所在目录,ADS_SERVER_BIN 指定服务端产物目录,ADS_AVALONIA_BUNDLE 指定已构建的原生 Avalonia 目录并跳过 publish。包会检查 ELF 格式及机器架构,拒绝 Windows EXE 和私有配置。便携包需自行安装系统依赖;解压后从目录运行入口。Linux USB 模拟尚未支持。 + +Flutter 当前仓库没有 Linux 原生宿主,不能直接从 Windows bundle 生成 Linux 应用。打包入口 `ADS_FLUTTER_BUNDLE=/path/to/linux/bundle bash scripts/build-linux-packages.sh flutter` 仅用于后续完成 Linux 宿主与工具路径适配后的原生产物,当前不宣称 Flutter Linux 已可用。 + +本次已生成并检查 amd64 三类包的元数据与归档,Agent 包解压后的 adsctl 可执行;Avalonia 使用 Windows .NET SDK 发布原生 linux-x64 产物。Linux 桌面图形会话启动、实际 apt 安装/卸载与 arm64 尚未实机验证。校验文件需在输出目录执行 `sha256sum -c SHA256SUMS`。 diff --git a/scripts/build-linux-packages.sh b/scripts/build-linux-packages.sh new file mode 100644 index 0000000..6957b10 --- /dev/null +++ b/scripts/build-linux-packages.sh @@ -0,0 +1,74 @@ +#!/usr/bin/env bash +set -euo pipefail +root=$(cd -- "$(dirname -- "$0")/.." && pwd) +mode=${1:-all} +case "$mode" in all|avalonia|agent|server|flutter) ;; *) echo 'Usage: build-linux-packages.sh [all|avalonia|agent|server|flutter]' >&2; exit 2;; esac +case "$(uname -m)" in x86_64) arch=amd64; rid=linux-x64;; aarch64) arch=arm64; rid=linux-arm64;; *) echo 'Unsupported architecture' >&2; exit 1;; esac +version=$(sed -n 's/^version = "\([0-9.]*\)"/\1/p' "$root/Cargo.toml" | head -1 | tr -d '\r') +[[ "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit 1 +command -v dpkg-deb >/dev/null +output="$root/bin/installers/linux"; mkdir -p "$output" +stage=$(mktemp -d) +trap 'rm -rf -- "$stage"' EXIT +backend=${ADS_LINUX_BIN:-$root/target/release} +check_elf() { + python3 - "$1" <<'PY' +import sys,struct,platform +with open(sys.argv[1],'rb') as f: h=f.read(20) +expected=183 if platform.machine()=='aarch64' else 62 +assert h[:4]==b'\x7fELF' and h[4]==2 and h[5]==1 and struct.unpack('&2; exit 1; fi + find "$payload" -type d -exec chmod 755 {} + + find "$payload" -type f -exec chmod 644 {} + + check_elf "$payload/$exe"; chmod 755 "$payload/$exe" + for tool in ads-agent ads-client adsctl ads-server ads-relay; do + if [[ -f "$payload/$tool" ]]; then check_elf "$payload/$tool"; chmod 755 "$payload/$tool"; fi + done + printf '#!/bin/sh\nexec /opt/ttstd/%s/%s "$@"\n' "$name" "$exe" > "$tree/usr/bin/$name" + chmod 755 "$tree/usr/bin/$name" + if [[ "$kind" == agent ]]; then ln -s /opt/ttstd/ads-agent/adsctl "$tree/usr/bin/adsctl"; fi + if [[ "$kind" == server ]]; then ln -s /opt/ttstd/ads-server/ads-relay "$tree/usr/bin/ads-relay"; fi + if [[ "$kind" == avalonia || "$kind" == flutter ]]; then + mkdir -p "$tree/usr/share/applications" "$tree/usr/share/icons/hicolor/256x256/apps" + cp "$root/desktop/Ads.Desktop/Assets/app.png" "$tree/usr/share/icons/hicolor/256x256/apps/$name.png" + printf '[Desktop Entry]\nType=Application\nName=ADS %s\nExec=%s\nIcon=%s\nTerminal=false\nCategories=Development;Utility;\n' "$kind" "$name" "$name" > "$tree/usr/share/applications/$name.desktop" + fi + printf 'Package: %s\nVersion: %s\nArchitecture: %s\nMaintainer: TongTong Studio\nDepends: %s\nDescription: ADS %s remote Android management\n' "$name" "$version" "$arch" "$deps" "$kind" > "$tree/DEBIAN/control" + chmod 755 "$tree/DEBIAN"; chmod 644 "$tree/DEBIAN/control" + dpkg-deb --root-owner-group --build "$tree" "$output/${name}_${version}_${arch}.deb" + tar -czf "$output/${name}-${version}-${rid}.tar.gz" -C "$payload" . +} +if [[ "$mode" == all || "$mode" == agent ]]; then + mkdir -p "$stage/agent-source" + for tool in ads-agent adsctl; do cp "$backend/$tool" "$stage/agent-source/"; done + package agent ads-agent "$stage/agent-source" 'libc6 (>= 2.31), libgcc-s1' +fi +if [[ "$mode" == all || "$mode" == server ]]; then + mkdir -p "$stage/server-source" + for tool in ads-server ads-relay; do cp "${ADS_SERVER_BIN:-$root/bin/linux-amd64}/$tool" "$stage/server-source/"; done + package server ads-server "$stage/server-source" 'libc6' +fi +if [[ "$mode" == all || "$mode" == avalonia ]]; then + source=${ADS_AVALONIA_BUNDLE:-$root/bin/desktop-$rid} + if [[ -z "${ADS_AVALONIA_BUNDLE:-}" ]]; then + (cd "$root/desktop" && dotnet publish Ads.Desktop -c Release -r "$rid" --self-contained true -o "$source" --nologo) + fi + mkdir -p "$stage/avalonia-source"; cp -a "$source/." "$stage/avalonia-source/" + for tool in ads-agent adsctl ads-client; do cp "$backend/$tool" "$stage/avalonia-source/"; done + package avalonia Ads.Desktop "$stage/avalonia-source" 'libc6 (>= 2.31), libgcc-s1, libstdc++6, libx11-6, libice6, libsm6, libfontconfig1, libfreetype6, libicu76 | libicu74 | libicu72 | libicu70, libssl3t64 | libssl3, zlib1g, adb, scrcpy' +fi +if [[ "$mode" == flutter ]]; then + : "${ADS_FLUTTER_BUNDLE:?Provide a native Linux Flutter release bundle}" + mkdir -p "$stage/flutter-source"; cp -a "$ADS_FLUTTER_BUNDLE/." "$stage/flutter-source/" + for tool in ads-agent adsctl ads-client; do cp "$backend/$tool" "$stage/flutter-source/"; done + package flutter ads_manager "$stage/flutter-source" 'libc6 (>= 2.31), libstdc++6, libgtk-3-0, libayatana-appindicator3-1, adb, scrcpy' +fi +(cd "$output" && sha256sum ./*.deb ./*.tar.gz > SHA256SUMS) +echo "Linux packages: $output"