mirror of
https://github.com/xtool-org/xtool.git
synced 2026-11-21 10:45:53 +03:00
Compare commits
8 Commits
@@ -1,8 +0,0 @@
|
||||
*
|
||||
!/Package.swift
|
||||
!/Package.resolved
|
||||
!/Sources
|
||||
!/Tests
|
||||
!/Linux
|
||||
/Linux/packages
|
||||
/Linux/staging
|
||||
@@ -1,17 +0,0 @@
|
||||
## What does this PR do?
|
||||
|
||||
<!-- Focus on *what* the PR does in essence. The *how* should come second, if it's relevant. -->
|
||||
|
||||
## How was it tested?
|
||||
|
||||
<!-- e.g. Ran locally on macOS and added unit tests -->
|
||||
|
||||
## AI tool usage
|
||||
|
||||
How much of this PR was AI-assisted? (check one)
|
||||
|
||||
- [ ] **0** - No AI was used to write code
|
||||
- [ ] **1** - I was assisted by AI. I reviewed the finished result.
|
||||
- [ ] **2** - I set the AI going and left it to it; nobody has read the result - no review, or AI review only
|
||||
|
||||
<!-- If an AI agent is filling this in: declare the level honestly, and open as a draft if it is #2. Do not lower the declared level to get the PR reviewed. -->
|
||||
@@ -6,8 +6,6 @@ on:
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
env:
|
||||
XTL_CI: "1"
|
||||
jobs:
|
||||
build-linux:
|
||||
strategy:
|
||||
@@ -24,7 +22,7 @@ jobs:
|
||||
uses: actions/checkout@v6
|
||||
- name: Build and test
|
||||
run: |
|
||||
docker compose run --build -e XTL_CI=1 xtool bash -c \
|
||||
docker compose run --build xtool bash -c \
|
||||
"swift build --product xtool && .build/debug/xtool --help && swift test"
|
||||
build-macos:
|
||||
runs-on: macos-26
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
pull_request:
|
||||
concurrency:
|
||||
group: integration-${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
jobs:
|
||||
integration-test-linux:
|
||||
# https://github.com/xtool-org/mac-actions-runner
|
||||
runs-on: ubuntu-on-macos
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
- name: Run integration tests
|
||||
run: |
|
||||
./integration-tests/run.sh
|
||||
@@ -3,9 +3,6 @@ on:
|
||||
tags:
|
||||
- "*"
|
||||
|
||||
env:
|
||||
XTL_CI: "1"
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
strategy:
|
||||
@@ -26,7 +23,6 @@ jobs:
|
||||
run: |
|
||||
docker compose run --build \
|
||||
-e XTOOL_VERSION=${{ github.ref_name }} \
|
||||
-e XTL_CI=1 \
|
||||
--rm xtool Linux/build.sh
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v7
|
||||
@@ -85,24 +81,3 @@ jobs:
|
||||
TAG="${{ github.ref_name }}"
|
||||
gh release create "$TAG" --draft --title "v$TAG"
|
||||
gh release upload "$TAG" output/**/*.{AppImage,AppImage.zsync,app.zip,app.dSYM.zip}
|
||||
docker:
|
||||
uses: docker/github-builder/.github/workflows/build.yml@v1
|
||||
permissions:
|
||||
contents: read # to fetch the repository content
|
||||
id-token: write # for signing attestations and cache entries with GitHub OIDC
|
||||
packages: write # to push built images to GitHub Container Registry
|
||||
with:
|
||||
build-args: |
|
||||
XTL_CI=1
|
||||
output: image
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm64
|
||||
meta-images: |
|
||||
ghcr.io/xtool-org/xtool
|
||||
meta-tags: |
|
||||
type=semver,pattern={{version}}
|
||||
secrets:
|
||||
registry-auths: |
|
||||
- registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
# About
|
||||
|
||||
xtool is a cross-platform replacement for Xcode (including build system, provisioning, deployment).
|
||||
|
||||
The `xtool` CLI supports macOS, Linux, WSL. The lower-level XKit (provisioning and device interaction) library additionally supports iOS.
|
||||
|
||||
## Development
|
||||
|
||||
- The majority of the code is in the Swift Package. You can use `swift build` / `swift test` / etc for iteration.
|
||||
- Caveat: on macOS, xtool is distributed as an app bundle (allows entitlements like Keychain). To build the Mac app, use `make mac`. You can then invoke the CLI at `./macOS/Build/xtool`.
|
||||
- Make sure to run `make lint` (swiftlint) when you're done
|
||||
|
||||
## Conventions
|
||||
|
||||
- Use modern Swift 6. Strict concurrency is enabled.
|
||||
- Use swift-dependencies for Dependency Injection. Passing dependencies around as arguments is an anti-pattern.
|
||||
+21
-8
@@ -4,15 +4,28 @@
|
||||
|
||||
We welcome all bug reports and feature requests! Please create a [new issue](https://github.com/xtool-org/xtool/issues/new/choose) via GitHub.
|
||||
|
||||
## Code and documentation
|
||||
## Documentation
|
||||
|
||||
External contributions are very welcome. Take a look at [/Documentation/Contributing/README.md](/Documentation/Contributing/README.md) for details regarding the development process.
|
||||
The xtool documentation at <https://xtool.sh> is built with [swift-docc](https://github.com/swiftlang/swift-docc) and resides at [Documentation/xtool.docc](/Documentation/xtool.docc). It's hosted on Netlify, the configuration for which is in [netlify.toml](/netlify.toml).
|
||||
|
||||
## AI tool usage
|
||||
When editing the DocC bundle, you can preview it with `make docs-preview`.
|
||||
|
||||
You may use AI tools to assist your contributions. You are fully responsible
|
||||
for everything you submit.
|
||||
Once you make a pull request with your changes, we'll also generate a [Netlify Deploy Preview](https://docs.netlify.com/site-deploys/deploy-previews/) under your pull request. You can open this preview to see how the changes will look in production.
|
||||
|
||||
- **Understand it**: You must be able to explain every line of your code.
|
||||
- **Disclose it**: Pick an AI assistance level (0/1/2) in the PR template.
|
||||
- **Own it**: You are the author. If a reviewer asks "why?", you answer - not the AI. [Don't be a meat proxy.](https://dontbeameatproxy.com)
|
||||
## Code
|
||||
|
||||
When making code changes, please make sure to test them on both macOS and Linux if possible. If you can also test on Windows with WSL, that is ideal.
|
||||
|
||||
To build xtool for debugging, run `make` in the project directory. There are a few considerations depending on your host OS:
|
||||
|
||||
### macOS
|
||||
|
||||
On macOS, you'll firstly need to have Xcode set up.
|
||||
|
||||
The first time you run `make`, we'll try to detect your codesigning identity. If you have multiple, you'll see an interactive prompt to select the team you want to use. The team ID is saved to `./macOS/Support/Private-Team.xcconfig`. You can run `make team` to update it (or do so by hand).
|
||||
|
||||
After building, a symlink to the product will be created at `./macOS/Build/xtool`. We generate an Xcode project at `./macOS/XToolMac.xcodeproj` that you can open in order to work in Xcode.
|
||||
|
||||
### Linux
|
||||
|
||||
You need to have a few dependencies on Linux; see [Dockerfile](/Dockerfile) for specifics. It's often easiest to develop within Docker itself: see [Linux/README.md](/Linux/README.md) for details.
|
||||
|
||||
+17
-31
@@ -66,13 +66,23 @@ RUN cd libimobiledevice \
|
||||
&& make install DESTDIR=/prefix
|
||||
|
||||
|
||||
FROM build-base AS build-xtool-base
|
||||
FROM build-base AS build-xadi
|
||||
|
||||
RUN mkdir -p /prefix/usr/lib
|
||||
|
||||
RUN curl -fsS https://dlang.org/install.sh | bash -s ldc
|
||||
|
||||
ADD https://github.com/xtool-org/xadi.git#main /xadi
|
||||
|
||||
RUN cd xadi \
|
||||
&& /bin/bash -c 'source $(/root/dlang/install.sh ldc -a) && dub build --build=release' \
|
||||
&& cp -r bin/libxadi.so /prefix/usr/lib/libxadi.so
|
||||
|
||||
|
||||
FROM build-base
|
||||
|
||||
COPY --from=build-limd /prefix/usr /usr
|
||||
|
||||
WORKDIR /xtool
|
||||
|
||||
FROM build-xtool-base AS dev
|
||||
COPY --from=build-xadi /prefix/usr /usr
|
||||
|
||||
# Docker doesn't support FUSE
|
||||
ENV APPIMAGE_EXTRACT_AND_RUN=1
|
||||
@@ -82,30 +92,6 @@ ENV APPIMAGE_EXTRACT_AND_RUN=1
|
||||
# socat -dd TCP-LISTEN:27015,range=127.0.0.1/32,reuseaddr,fork UNIX-CLIENT:/var/run/usbmuxd
|
||||
ENV USBMUXD_SOCKET_ADDRESS=host.docker.internal:27015
|
||||
|
||||
WORKDIR /xtool
|
||||
|
||||
CMD [ "/bin/bash" ]
|
||||
|
||||
FROM dev AS dev-test
|
||||
|
||||
ENV XTL_TEST_ENV=1
|
||||
|
||||
COPY --from=bats/bats:latest /opt/bats /opt/bats
|
||||
COPY --from=bats/bats:latest /usr/lib/bats /usr/lib/bats
|
||||
RUN ln -s /opt/bats/bin/bats /usr/local/bin/bats
|
||||
|
||||
FROM build-xtool-base AS build-xtool
|
||||
|
||||
ARG XTL_CI
|
||||
|
||||
ADD Package.swift Package.resolved /xtool/
|
||||
RUN swift package resolve
|
||||
|
||||
ADD . /xtool
|
||||
RUN ./Linux/build.sh
|
||||
|
||||
FROM swift:6.3 AS xtool
|
||||
|
||||
COPY --from=build-xtool /xtool/Linux/packages/xtool-*.AppImage /xtool/xtool.AppImage
|
||||
RUN (cd /xtool && ./xtool.AppImage --appimage-extract) \
|
||||
&& mv /xtool/squashfs-root /usr/local/xtool \
|
||||
&& rm -rf /xtool \
|
||||
&& ln -s /usr/local/xtool/AppRun /usr/local/bin/xtool
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
# Debugging
|
||||
|
||||
## Environment variables
|
||||
|
||||
Some environment variables that help with debugging. Use these as e.g. `XTL_FOO=1 xtool ...`
|
||||
|
||||
### General
|
||||
|
||||
- `XTL_DEBUG_ERRORS`: If xtool terminates with an error, it normally prints a user-friendly error description. Set `XTL_DEBUG_ERRORS=1` for more verbose error logging.
|
||||
|
||||
### Disk
|
||||
|
||||
- `XTL_DEBUG_TMP`: Set to `1` to log details when xtool creates/destroys temporary directories.
|
||||
- `XTL_TMPDIR`: Control the location where xtool stores temporary directories. We also respect `TMPDIR` and (on Linux) `XDG_CACHE_HOME`.
|
||||
|
||||
### Networking
|
||||
|
||||
- `XTL_DEV_LOG`: Regex. When making AppStoreConnect API requests, operation IDs that match the regex will log their response status and body. Set `XTL_DEV_LOG='.*'` to match all.
|
||||
- `XTL_DISABLE_TLS_VALIDATION`: Set to `1` to disable all TLS validation on HTTP requests. Useful when using an MITM proxy to inspect API requests. Use sparingly, since disabling TLS is generally unsafe.
|
||||
- `XTL_HTTP_PROXY`: non-Darwin only. Set to `<host>:<port>` to point the HTTP client to a proxy. e.g. `XTL_HTTP_PROXY=localhost:8080`. On Darwin (macOS/iOS), we instead use the system proxy configuration.
|
||||
@@ -1,31 +0,0 @@
|
||||
# Contributing to xtool
|
||||
|
||||
## Code
|
||||
|
||||
When making code changes, please make sure to test them on both macOS and Linux if possible. If you can also test on Windows with WSL, that is ideal.
|
||||
|
||||
To build xtool for debugging, run `make` in the project directory. There are a few considerations depending on your host OS:
|
||||
|
||||
### macOS
|
||||
|
||||
On macOS, you'll firstly need to have Xcode set up.
|
||||
|
||||
The first time you run `make`, we'll try to detect your codesigning identity. If you have multiple, you'll see an interactive prompt to select the team you want to use. The team ID is saved to `./macOS/Support/Private-Team.xcconfig`. You can run `make team` to update it (or do so by hand).
|
||||
|
||||
After building, a symlink to the product will be created at `./macOS/Build/xtool`. We generate an Xcode project at `./macOS/XToolMac.xcodeproj` that you can open in order to work in Xcode.
|
||||
|
||||
### Linux
|
||||
|
||||
You need to have a few dependencies on Linux; see [Dockerfile](/Dockerfile) for specifics. It's often easiest to develop within Docker itself: see [Linux/README.md](/Linux/README.md) for details.
|
||||
|
||||
## Debugging
|
||||
|
||||
Check out [./Debugging.md](./Debugging.md) for help with debugging xtool issues during development.
|
||||
|
||||
## Updating Documentation
|
||||
|
||||
The xtool documentation at <https://xtool.sh> is built with [swift-docc](https://github.com/swiftlang/swift-docc) and resides at [Documentation/xtool.docc](/Documentation/xtool.docc). It's hosted on Netlify, the configuration for which is in [netlify.toml](/netlify.toml).
|
||||
|
||||
When editing the DocC bundle, you can preview it with `make docs-preview`.
|
||||
|
||||
Once you make a pull request with your changes, we'll also generate a [Netlify Deploy Preview](https://docs.netlify.com/site-deploys/deploy-previews/) under your pull request. You can open this preview to see how the changes will look in production.
|
||||
@@ -22,5 +22,4 @@ else
|
||||
fi
|
||||
|
||||
"$docc" "$command" xtool.docc \
|
||||
--enable-experimental-code-block-annotations \
|
||||
--experimental-enable-custom-templates
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$
|
||||
Hello$
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
|
||||
@@ -3,7 +3,7 @@ Creating package: Hello
|
||||
Creating Package.swift
|
||||
Creating xtool.yml
|
||||
Creating .gitignore
|
||||
Creating .bsp/xtool.json
|
||||
Creating .sourcekit-lsp/config.json
|
||||
Creating Sources/Hello/HelloApp.swift
|
||||
Creating Sources/Hello/ContentView.swift
|
||||
|
||||
@@ -12,7 +12,7 @@ Finished generating project Hello.
|
||||
Developer$ cd Hello
|
||||
Hello$ ls -la
|
||||
-rw-rw-r-- 1 user user 187 .gitignore
|
||||
drwxrwxr-x 2 user user 4096 .bsp
|
||||
drwxrwxr-x 2 user user 4096 .sourcekit-lsp
|
||||
-rw-rw-r-- 1 user user 463 Package.swift
|
||||
drwxrwxr-x 3 user user 4096 Sources
|
||||
-rw-rw-r-- 1 user user 39 xtool.yml
|
||||
@@ -21,9 +21,5 @@ Hello$ cat xtool.yml
|
||||
version: 1
|
||||
bundleID: com.example.Hello
|
||||
|
||||
Hello$ cat .bsp/xtool.json
|
||||
{
|
||||
"name": "xtool",
|
||||
...
|
||||
"argv": ["/usr/bin/env", "xtool", "dev", "build-server"]
|
||||
}
|
||||
Hello$ cat .sourcekit-lsp/config.json
|
||||
{ "swiftPM": { "swiftSDK": "arm64-apple-ios" } }
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
}
|
||||
|
||||
@Step {
|
||||
Read `.bsp/xtool.json`.
|
||||
Read `.sourcekit-lsp/config.json`.
|
||||
|
||||
This file tells your IDE to ask xtool for build information (via the Build Server Protocol). It enables features like syntax highlighting and documentation lookup.
|
||||
This file tells SourceKit to build for the `arm64-apple-ios` system defined in `darwin.artifactbundle`. This is the [Swift SDK](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0387-cross-compilation-destinations.md) that we built during the setup process. It contains the necessary modules for building iOS apps, such as UIKit and SwiftUI, as well as tools for building and manipulating iOS binaries. Under the hood, xtool also calls `swift build` with `--swift-sdk arm64-apple-ios` for the same reason.
|
||||
|
||||
@Code(name: "Terminal", file: "template-4b.sh", previousFile: "template-4a.sh") {}
|
||||
}
|
||||
|
||||
@@ -14,22 +14,16 @@ If you're on Windows, you can use xtool via [Windows Subsystem for Linux](https:
|
||||
|
||||
Once you install WSL, you'll also need to set up USB passthrough. See Microsoft's instructions on [installing USBIPD](https://learn.microsoft.com/en-us/windows/wsl/connect-usb). Make sure you're able to bind your iOS device to WSL via USB.
|
||||
|
||||
> Note:
|
||||
>
|
||||
> If you encounter `Error: AFCClient.Error.muxError`, follow the steps described in [this issue comment](https://github.com/xtool-org/xtool/issues/19#issuecomment-2898986718) from user rena2019.
|
||||
>
|
||||
> This relays the device connection from iTunes on Windows, instead of relying on USBIPD.
|
||||
|
||||
### Swift
|
||||
|
||||
Install the Swift 6.4 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
Install the Swift 6.3 toolchain for your Linux distribution from <https://swift.org/install/linux>.
|
||||
|
||||
After following the steps there, confirm that Swift is installed correctly:
|
||||
|
||||
```bash
|
||||
swift --version
|
||||
# should say something like:
|
||||
# Swift version 6.4 (swift-6.4-RELEASE)
|
||||
# Swift version 6.3 (swift-6.3-RELEASE)
|
||||
```
|
||||
|
||||
### usbmuxd
|
||||
@@ -68,7 +62,7 @@ sudo apt-get install usbmuxd
|
||||
|
||||
### Xcode.xip
|
||||
|
||||
Download **Xcode 27** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
|
||||
Download **Xcode 26** from <https://developer.apple.com/download/all/?q=Xcode>. Note the path where `Xcode.xip` is saved.
|
||||
|
||||
> Note:
|
||||
>
|
||||
@@ -131,7 +125,7 @@ Choice (0-1): 0
|
||||
Path to Xcode.xip:
|
||||
```
|
||||
|
||||
Enter the path (for example `~/Downloads/Xcode_27.0.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
|
||||
Enter the path (for example `~/Downloads/Xcode_16.3.xip`) and hit enter. xtool will extract the Xcode XIP to generate and install an iOS Swift SDK for you.
|
||||
|
||||
Confirm that it worked:
|
||||
|
||||
|
||||
@@ -56,10 +56,6 @@ linux-clean:
|
||||
linux-dist:
|
||||
docker compose run --build --rm xtool Linux/build.sh
|
||||
|
||||
.PHONY: docker
|
||||
docker:
|
||||
docker build . -t ghcr.io/xtool-org/xtool:latest
|
||||
|
||||
.PHONY: mac
|
||||
# dev build for macOS
|
||||
mac: project
|
||||
|
||||
+18
-18
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"originHash" : "70ed310397f7785149edfd3c75ea1be84b43c694430c1a7d8a48d1da0809d3b5",
|
||||
"originHash" : "9ec3992e7de864bad568faa552cdf4c9fff40eebb41c0c05faf964bc172df5d4",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "aexml",
|
||||
@@ -357,8 +357,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-subprocess",
|
||||
"state" : {
|
||||
"revision" : "11633673a41f509f8945f23c96c7acd4adafd679",
|
||||
"version" : "0.5.0"
|
||||
"revision" : "13d087685b95d64d6aac9b94500d347bbe84c39b",
|
||||
"version" : "0.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -379,6 +379,15 @@
|
||||
"version" : "1.6.4"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swift-tools-protocols",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/swiftlang/swift-tools-protocols",
|
||||
"state" : {
|
||||
"revision" : "d81024558da3bcd53748c4cfdaba10a49242442e",
|
||||
"version" : "0.0.10"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "swiftcli",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -393,8 +402,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/SwiftyMobileDevice",
|
||||
"state" : {
|
||||
"revision" : "1f6e4cc614a31953bda5d1092a747cfdea90916f",
|
||||
"version" : "1.7.0"
|
||||
"revision" : "280d0dc8153469944491aee2f19af29e9c7a77f0",
|
||||
"version" : "1.5.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -424,15 +433,6 @@
|
||||
"version" : "2.16.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xadi",
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xadi",
|
||||
"state" : {
|
||||
"revision" : "2aad968e4806b8571f6f2bed22ecec00b0322f95",
|
||||
"version" : "0.4.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"identity" : "xcodegen",
|
||||
"kind" : "remoteSourceControl",
|
||||
@@ -465,8 +465,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/xtool-core",
|
||||
"state" : {
|
||||
"revision" : "f867f9c2aea16ac78ca14d0d2f948b47db0732b4",
|
||||
"version" : "1.5.0"
|
||||
"revision" : "d412ac768d1e73d16ad7ccc6805f12fc701709f6",
|
||||
"version" : "1.4.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -483,8 +483,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/xtool-org/zsign",
|
||||
"state" : {
|
||||
"revision" : "19aab76b3f1388966a3ed4fc11b357f95aafc70b",
|
||||
"version" : "1.8.0"
|
||||
"revision" : "6c4a9f52dd8bf374aa938ef9c17d5f261f2c333a",
|
||||
"version" : "1.7.0"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
+17
-32
@@ -1,4 +1,4 @@
|
||||
// swift-tools-version:6.2
|
||||
// swift-tools-version:6.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
@@ -19,19 +19,11 @@ let cSettings: [CSetting] = [
|
||||
.define("_GNU_SOURCE", .when(platforms: [.linux])),
|
||||
]
|
||||
|
||||
let swiftSettings: [SwiftSetting] = {
|
||||
var settings: [SwiftSetting] = []
|
||||
if Context.environment["XTL_CI"] == "1" {
|
||||
settings.append(.treatAllWarnings(as: .error))
|
||||
}
|
||||
return settings
|
||||
}()
|
||||
|
||||
let package = Package(
|
||||
name: "xtool",
|
||||
platforms: [
|
||||
.iOS(.v16),
|
||||
.macOS(.v13),
|
||||
.macOS(.v14),
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
@@ -48,10 +40,9 @@ let package = Package(
|
||||
),
|
||||
],
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.5.0")),
|
||||
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.7.0")),
|
||||
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.8.0")),
|
||||
.package(url: "https://github.com/xtool-org/xadi", .upToNextMinor(from: "0.4.1")),
|
||||
.package(url: "https://github.com/xtool-org/xtool-core", .upToNextMinor(from: "1.4.0")),
|
||||
.package(url: "https://github.com/xtool-org/SwiftyMobileDevice", .upToNextMinor(from: "1.5.0")),
|
||||
.package(url: "https://github.com/xtool-org/zsign", .upToNextMinor(from: "1.7.0")),
|
||||
|
||||
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
|
||||
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
|
||||
@@ -64,7 +55,8 @@ let package = Package(
|
||||
.package(url: "https://github.com/apple/swift-nio", from: "2.77.0"),
|
||||
|
||||
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
|
||||
.package(url: "https://github.com/swiftlang/swift-subprocess", .upToNextMinor(from: "0.5.0")),
|
||||
.package(url: "https://github.com/swiftlang/swift-subprocess", .upToNextMinor(from: "0.4.0")),
|
||||
.package(url: "https://github.com/swiftlang/swift-tools-protocols", exact: "0.0.10"),
|
||||
|
||||
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.23.0"),
|
||||
.package(url: "https://github.com/swift-server/swift-openapi-async-http-client", from: "1.0.0"),
|
||||
@@ -82,6 +74,7 @@ let package = Package(
|
||||
.package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.45.4"),
|
||||
],
|
||||
targets: [
|
||||
.systemLibrary(name: "XADI"),
|
||||
.target(
|
||||
name: "CXKit",
|
||||
dependencies: [
|
||||
@@ -98,21 +91,18 @@ let package = Package(
|
||||
dependencies: [
|
||||
.product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
|
||||
],
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"],
|
||||
swiftSettings: swiftSettings,
|
||||
exclude: ["openapi-generator-config.yaml", "patch.js"]
|
||||
),
|
||||
// common utilities shared across xtool targets
|
||||
.target(
|
||||
name: "XUtils",
|
||||
dependencies: [
|
||||
.product(name: "SystemPackage", package: "swift-system"),
|
||||
.product(
|
||||
name: "Subprocess",
|
||||
package: "swift-subprocess",
|
||||
condition: .when(platforms: [.linux, .macOS])
|
||||
),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
]
|
||||
),
|
||||
.target(
|
||||
name: "XKit",
|
||||
@@ -120,7 +110,7 @@ let package = Package(
|
||||
"DeveloperAPI",
|
||||
"CXKit",
|
||||
"XUtils",
|
||||
.product(name: "XADI", package: "xadi", condition: .when(platforms: [.linux, .macOS])),
|
||||
.byName(name: "XADI", condition: .when(platforms: [.linux])),
|
||||
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
|
||||
.product(name: "Dependencies", package: "swift-dependencies"),
|
||||
.product(name: "SwiftyMobileDevice", package: "SwiftyMobileDevice"),
|
||||
@@ -151,16 +141,13 @@ let package = Package(
|
||||
condition: .when(platforms: [.linux])
|
||||
),
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
cSettings: cSettings
|
||||
),
|
||||
.testTarget(
|
||||
name: "XToolTests",
|
||||
dependencies: [
|
||||
"XKit",
|
||||
"XToolSupport",
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
]
|
||||
),
|
||||
.target(
|
||||
name: "XToolSupport",
|
||||
@@ -173,9 +160,9 @@ let package = Package(
|
||||
.product(name: "NIOPosix", package: "swift-nio"),
|
||||
.product(name: "Version", package: "Version"),
|
||||
.product(name: "libunxip", package: "unxip"),
|
||||
.product(name: "LanguageServerProtocolTransport", package: "swift-tools-protocols"),
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
cSettings: cSettings
|
||||
),
|
||||
.target(
|
||||
name: "PackLib",
|
||||
@@ -184,8 +171,7 @@ let package = Package(
|
||||
.product(name: "Superutils", package: "xtool-core"),
|
||||
.product(name: "Yams", package: "Yams"),
|
||||
.product(name: "XcodeGenKit", package: "XcodeGen", condition: .when(platforms: [.macOS])),
|
||||
],
|
||||
swiftSettings: swiftSettings,
|
||||
]
|
||||
),
|
||||
.executableTarget(
|
||||
name: "xtool",
|
||||
@@ -194,8 +180,7 @@ let package = Package(
|
||||
"XKit",
|
||||
"XToolSupport",
|
||||
],
|
||||
cSettings: cSettings,
|
||||
swiftSettings: swiftSettings,
|
||||
cSettings: cSettings
|
||||
),
|
||||
]
|
||||
)
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
#include "inotify_shim.h"
|
||||
#include "stdout_shim.h"
|
||||
#include "version.h"
|
||||
#include "mobileprovision.h"
|
||||
@@ -0,0 +1,21 @@
|
||||
#ifndef CINOTIFY_SHIMS_H
|
||||
#define CINOTIFY_SHIMS_H
|
||||
|
||||
#ifdef __linux__
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
#include <sys/inotify.h>
|
||||
|
||||
static inline const char *cin_event_name(const struct inotify_event *event) {
|
||||
if (event->len)
|
||||
return event->name;
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static const uint32_t cin_all_events = IN_ALL_EVENTS;
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* CINOTIFY_SHIMS_H */
|
||||
@@ -32,7 +32,7 @@ public struct BuildSettings: Sendable {
|
||||
public init(
|
||||
configuration: BuildConfiguration,
|
||||
triple: String,
|
||||
buildSystem: BuildSystem? = nil,
|
||||
buildSystem: BuildSystem = .default,
|
||||
packagePath: String = ".",
|
||||
options: [String] = []
|
||||
) async throws {
|
||||
@@ -40,14 +40,14 @@ public struct BuildSettings: Sendable {
|
||||
self.configuration = configuration
|
||||
self.customOptions = options
|
||||
self.triple = triple
|
||||
self.buildSystem = if let buildSystem { buildSystem } else { try await .default() }
|
||||
self.buildSystem = buildSystem
|
||||
|
||||
self.sdkEnvironment = [
|
||||
// xcrun passes an SDKROOT that messes with our sdk configuration
|
||||
"SDKROOT": nil,
|
||||
]
|
||||
|
||||
switch self.buildSystem {
|
||||
switch buildSystem {
|
||||
case .swiftPM:
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
@@ -58,15 +58,13 @@ public struct BuildSettings: Sendable {
|
||||
case .swiftBuild:
|
||||
self.sdkOptions = ["--triple", triple]
|
||||
#if !os(macOS)
|
||||
let darwinSDK = try DarwinSDK.current()
|
||||
let darwinSDK = try await DarwinSDK.current()
|
||||
.orThrow(StringError("No Darwin SDK configured. Please run `xtool setup`."))
|
||||
self.sdkOptions += [
|
||||
"--toolset", "\(darwinSDK.bundle.path)/toolset-swb.json",
|
||||
]
|
||||
self.sdkEnvironment.merge([
|
||||
"XCODE_EXTRA_PLATFORM_FOLDERS": "\(darwinSDK.bundle.path)/Developer/Platforms",
|
||||
// SWB looks for dsymutil in the PATH. Other stuff (lld, libtool) is handled by toolset-swb.json.
|
||||
"PATH": "\(darwinSDK.bundle.path)/toolset/bin:\(ProcessInfo.processInfo.environment["PATH"] ?? "")",
|
||||
]) { $1 }
|
||||
#endif
|
||||
}
|
||||
@@ -144,24 +142,13 @@ public struct BuildSettings: Sendable {
|
||||
)
|
||||
}
|
||||
|
||||
// loosely based on
|
||||
// https://github.com/swiftlang/sourcekit-lsp/blob/c55899a/Sources/BuildServerIntegration/ExternalBuildServerAdapter.swift#L92
|
||||
private var baseBuildServerArguments: [String] {
|
||||
return [
|
||||
"experimental-build-server",
|
||||
"--disable-automatic-resolution",
|
||||
"--scratch-path", ".build/index-build",
|
||||
// this requires Swift 6.4 but we need 6.4 on Linux anyway, for the platform toolset fixes
|
||||
"--experimental-skip-acquiring-lock",
|
||||
]
|
||||
}
|
||||
|
||||
public var buildServerArguments: [String] {
|
||||
["package"] + baseBuildServerArguments + resolvedBaseOptions
|
||||
}
|
||||
|
||||
public func buildServerInvocation() async throws -> Subprocess.Configuration {
|
||||
try await swiftPMInvocation(forTool: "package", arguments: baseBuildServerArguments)
|
||||
return [
|
||||
"package", "experimental-build-server",
|
||||
"--disable-automatic-resolution",
|
||||
// TODO: once https://github.com/swiftlang/swift-package-manager/pull/9819 makes it into a release
|
||||
// (Swift 6.4), pass --experimental-skip-acquiring-lock
|
||||
] + resolvedBaseOptions
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,12 +168,12 @@ public enum BuildSystem: Sendable {
|
||||
case swiftPM
|
||||
case swiftBuild
|
||||
|
||||
public static func `default`() async throws -> Self {
|
||||
if try await SwiftVersion.current.supportsSwiftBuild {
|
||||
return .swiftBuild
|
||||
} else {
|
||||
return .swiftPM
|
||||
}
|
||||
public static var `default`: Self {
|
||||
#if os(macOS)
|
||||
return .swiftBuild
|
||||
#else
|
||||
return .swiftBuild
|
||||
#endif
|
||||
}
|
||||
|
||||
var pmName: String {
|
||||
|
||||
+63
-100
@@ -1,129 +1,92 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Subprocess
|
||||
import Superutils
|
||||
import XUtils
|
||||
|
||||
public struct DarwinSDK {
|
||||
package struct TemporaryBundle: ~Copyable {
|
||||
package let url: URL
|
||||
|
||||
fileprivate init(url: URL) {
|
||||
self.url = url
|
||||
}
|
||||
|
||||
package consuming func install() async throws {
|
||||
guard DarwinSDK(bundle: url) != nil else {
|
||||
throw StringError("Invalid Darwin SDK at '\(url.path)'")
|
||||
}
|
||||
|
||||
try await DarwinSDK.addHostClangResourceDir(to: url)
|
||||
|
||||
let destination = url.deletingLastPathComponent()
|
||||
.appendingPathComponent("darwin.artifactbundle", isDirectory: true)
|
||||
try FileManager.default.moveItem(at: url, to: destination)
|
||||
}
|
||||
|
||||
deinit {
|
||||
try? FileManager.default.removeItem(at: url)
|
||||
}
|
||||
}
|
||||
|
||||
public enum Flavor {
|
||||
// can't be updated in place
|
||||
case slim
|
||||
// can be updated in place, includes a whole copy of Xcode.app
|
||||
case normal
|
||||
// from before the slim/normal split existed (version "develop")
|
||||
case legacy
|
||||
}
|
||||
|
||||
public let bundle: URL
|
||||
public let version: String
|
||||
public let flavor: Flavor
|
||||
|
||||
static func swiftPMDirectory(
|
||||
environment: [String: String] = ProcessInfo.processInfo.environment,
|
||||
homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser
|
||||
) throws -> URL {
|
||||
if let configurationDirectory = environment["XDG_CONFIG_HOME"] {
|
||||
guard (configurationDirectory as NSString).isAbsolutePath else {
|
||||
throw StringError("XDG_CONFIG_HOME must be an absolute path: '\(configurationDirectory)'")
|
||||
}
|
||||
return URL(fileURLWithPath: configurationDirectory, isDirectory: true)
|
||||
.appendingPathComponent("swiftpm", isDirectory: true)
|
||||
} else {
|
||||
return homeDirectory.appendingPathComponent(".swiftpm", isDirectory: true)
|
||||
}
|
||||
}
|
||||
|
||||
private static func swiftSDKsDirectory(
|
||||
environment: [String: String] = ProcessInfo.processInfo.environment,
|
||||
homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser
|
||||
) throws -> URL {
|
||||
try swiftPMDirectory(environment: environment, homeDirectory: homeDirectory)
|
||||
.appendingPathComponent("swift-sdks", isDirectory: true)
|
||||
}
|
||||
|
||||
public init?(bundle: URL) {
|
||||
self.bundle = bundle
|
||||
if let version = try? Data(contentsOf: bundle.appendingPathComponent("darwin-sdk-version.txt")) {
|
||||
self.version = String(decoding: version, as: UTF8.self)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
} else if ["darwin.xtoolsdk", "darwin.artifactbundle", "darwin.artifactbundle.tmp"].contains(bundle.lastPathComponent) {
|
||||
self.version = "develop"
|
||||
} else if ["darwin.xtoolsdk", "darwin.artifactbundle"].contains(bundle.lastPathComponent) {
|
||||
self.version = "unknown"
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
|
||||
if version == "develop" {
|
||||
self.flavor = .legacy
|
||||
} else if bundle.appendingPathComponent("Xcode.app").dirExists {
|
||||
self.flavor = .normal
|
||||
} else {
|
||||
self.flavor = .slim
|
||||
}
|
||||
}
|
||||
|
||||
package static func prepareTemporaryBundle(
|
||||
environment: [String: String] = ProcessInfo.processInfo.environment,
|
||||
homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser
|
||||
) throws -> TemporaryBundle {
|
||||
let sdksDirectory = try swiftSDKsDirectory(environment: environment, homeDirectory: homeDirectory)
|
||||
try FileManager.default.createDirectory(at: sdksDirectory, withIntermediateDirectories: true)
|
||||
let bundle = sdksDirectory.appendingPathComponent("darwin.artifactbundle.tmp", isDirectory: true)
|
||||
if FileManager.default.fileExists(atPath: bundle.path) {
|
||||
try FileManager.default.removeItem(at: bundle)
|
||||
}
|
||||
return TemporaryBundle(url: bundle)
|
||||
public static func install(from path: String) async throws {
|
||||
// we can't just move into ~/.swiftpm/swift-sdks because the swiftpm directory
|
||||
// location depends on factors like $XDG_CONFIG_HOME. Rather than replicating
|
||||
// SwiftPM's logic, which may change, it's more reliable to directly invoke
|
||||
// `swift sdk install`. See: https://github.com/xtool-org/xtool/pull/40
|
||||
|
||||
let url = URL(fileURLWithPath: path)
|
||||
guard DarwinSDK(bundle: url) != nil else { throw StringError("Invalid Darwin SDK at '\(path)'")}
|
||||
|
||||
try await addHostClangResourceDir(to: url)
|
||||
|
||||
try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["sdk", "install", url.path],
|
||||
output: .discarded
|
||||
)
|
||||
.checkSuccess()
|
||||
}
|
||||
|
||||
private static func addHostClangResourceDir(to sdk: URL) async throws {
|
||||
struct SwiftTargetInfo: Decodable {
|
||||
struct Paths: Decodable {
|
||||
let runtimeResourcePath: String
|
||||
}
|
||||
let paths: Paths
|
||||
}
|
||||
|
||||
let clangURL = try await ToolRegistry.locate("clang")
|
||||
let process = try await Subprocess.run(
|
||||
.path(try await BuildSettings.swiftcURL()),
|
||||
arguments: ["-print-target-info"],
|
||||
output: .data(limit: .max)
|
||||
.path(FilePath(clangURL.path)),
|
||||
arguments: ["-print-resource-dir"],
|
||||
output: .string(limit: .max)
|
||||
).checkSuccess()
|
||||
let targetInfo = try JSONDecoder().decode(
|
||||
SwiftTargetInfo.self,
|
||||
from: process.standardOutput
|
||||
)
|
||||
let hostClangResources = URL(filePath: targetInfo.paths.runtimeResourcePath).appending(path: "clang")
|
||||
let output = process.standardOutput ?? ""
|
||||
let hostClangResources = URL(filePath: output.trimmingCharacters(in: .whitespacesAndNewlines))
|
||||
let hostInclude = hostClangResources.appending(path: "include")
|
||||
let sdkInclude = sdk.appending(path: "Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
|
||||
try await FileManager.default.copyItem(at: hostInclude, to: sdkInclude, preserveOwner: false)
|
||||
try FileManager.default.copyItem(at: hostInclude, to: sdkInclude)
|
||||
}
|
||||
|
||||
public static func current() throws -> DarwinSDK? {
|
||||
let bundle = try swiftSDKsDirectory().appendingPathComponent("darwin.artifactbundle", isDirectory: true)
|
||||
guard bundle.dirExists else { return nil }
|
||||
return DarwinSDK(bundle: bundle)
|
||||
public static func current() async throws -> DarwinSDK? {
|
||||
let outputString: String
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["sdk", "configure", "darwin", "arm64-apple-ios", "--show-configuration"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
?? ""
|
||||
} catch SubprocessFailure.exited {
|
||||
return nil
|
||||
}
|
||||
|
||||
// should be something like
|
||||
// swiftResourcesPath: /home/user/.swiftpm/swift-sdks/darwin.artifactbundle/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
|
||||
// swiftlint:disable:previous line_length
|
||||
let resourcesPathPrefix = "swiftResourcesPath: "
|
||||
|
||||
guard let resourcesPath = outputString
|
||||
.split(separator: "\n")
|
||||
.first(where: { $0.hasPrefix(resourcesPathPrefix) })?
|
||||
.dropFirst(resourcesPathPrefix.count)
|
||||
else { return nil }
|
||||
|
||||
var resourcesURL = URL(fileURLWithPath: String(resourcesPath))
|
||||
for _ in 0..<6 {
|
||||
resourcesURL = resourcesURL.deletingLastPathComponent()
|
||||
}
|
||||
|
||||
return DarwinSDK(bundle: resourcesURL)
|
||||
}
|
||||
|
||||
public func isUpToDate() -> Bool {
|
||||
true
|
||||
}
|
||||
|
||||
public func remove() throws {
|
||||
|
||||
@@ -22,9 +22,6 @@ public struct PackSchemaBase: Codable, Sendable {
|
||||
|
||||
public var extensions: [Extension]?
|
||||
|
||||
/// Skip auto-creating the LSP support file if it's missing.
|
||||
public var skipLSP: Bool?
|
||||
|
||||
public struct Extension: Codable, Sendable {
|
||||
public var product: String
|
||||
public var bundleID: String?
|
||||
|
||||
@@ -72,8 +72,8 @@ public struct Packer: Sendable {
|
||||
)
|
||||
try await Subprocess.run(
|
||||
buildConfig,
|
||||
output: .currentStandardOutput,
|
||||
error: .currentStandardError,
|
||||
output: .standardError,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
}
|
||||
|
||||
@@ -251,7 +251,7 @@ public struct Planner: Sendable {
|
||||
return try await Subprocess.run(
|
||||
dumpConfig,
|
||||
output: .data(limit: .max),
|
||||
error: .currentStandardError,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
import Subprocess
|
||||
import Version
|
||||
import XUtils
|
||||
|
||||
public struct SwiftVersion: Sendable {
|
||||
public var version: Version
|
||||
|
||||
public var supportsSwiftBuild: Bool {
|
||||
version >= Version(6, 4, 0)
|
||||
}
|
||||
}
|
||||
|
||||
extension SwiftVersion {
|
||||
private static let cached = Task<Self, Error> {
|
||||
let outputString: String?
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.path(try await BuildSettings.swiftURL()),
|
||||
arguments: ["--version"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
} catch {
|
||||
throw StringError("Failed to obtain Swift version")
|
||||
}
|
||||
var output = outputString?[...] ?? ""
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
guard output.hasPrefix("Swift version ") else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
output = output.dropFirst("Swift version ".count)
|
||||
guard let space = output.firstIndex(of: " ") else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
output = output[..<space]
|
||||
guard let version = Version(tolerant: output) else {
|
||||
throw StringError("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
return SwiftVersion(version: version)
|
||||
}
|
||||
|
||||
public static var current: Self {
|
||||
get async throws {
|
||||
try await cached.value
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@ package enum ToolRegistry {
|
||||
private var cache: [String: Task<URL, Error>] = [:]
|
||||
|
||||
private func _locate(tool: String) async throws -> URL {
|
||||
guard let path = try? await Executable.name(tool).resolveExecutablePath(in: .inherit),
|
||||
guard let path = try? Executable.name(tool).resolveExecutablePath(in: .inherit),
|
||||
let url = URL(filePath: path)
|
||||
else { throw Errors.toolNotFound(tool) }
|
||||
return url
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
module XADI [extern_c] {
|
||||
header "xadi.h"
|
||||
link "xadi"
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
#include <stdint.h>
|
||||
|
||||
void xadi_Load(const char *path);
|
||||
int32_t xadi_SetAndroidID(const char *identifier, uint32_t length);
|
||||
int32_t xadi_SetProvisioningPath(const char *path);
|
||||
int32_t xadi_ProvisioningErase(uint64_t dsId);
|
||||
int32_t xadi_Synchronize(uint64_t dsId, const void *serverIntermediateMetadata, uint32_t serverIntermediateMetadataLength, void **machineIdentifier, uint32_t *machineIdentifierLength, void **synchronizationResumeMetadata, uint32_t *synchronizationResumeMetadataLength);
|
||||
int32_t xadi_ProvisioningDestroy(uint32_t session);
|
||||
int32_t xadi_ProvisioningEnd(uint32_t session, const void *persistentTokenMetadata, uint32_t persistentTokenMetadataLength, const void *trustKey, uint32_t trustKeyLength);
|
||||
int32_t xadi_ProvisioningStart(uint64_t dsId, const void *serverProvisioningIntermediateMetadata, uint32_t serverProvisioningIntermediateMetadataLength, void **clientProvisioningIntermediateMetadata, uint32_t *clientProvisioningIntermediateMetadataLength, uint32_t *session);
|
||||
int32_t xadi_GetLoginCode(uint64_t dsId);
|
||||
int32_t xadi_Dispose(void *ptr);
|
||||
int32_t xadi_OTPRequest(uint64_t dsId, void **machineIdentifier, uint32_t *machineIdentifierLength, void **oneTimePassword, uint32_t *oneTimePasswordLength);
|
||||
@@ -138,9 +138,3 @@ extension WirelessAccessoryEntitlement: EntitlementWithCapability {
|
||||
DeveloperServicesCapability(.wirelessAccessoryConfiguration, isFree: true)
|
||||
}
|
||||
}
|
||||
|
||||
extension WiFiAwareEntitlement: EntitlementWithCapability {
|
||||
var capability: DeveloperServicesCapability {
|
||||
DeveloperServicesCapability(rawName: "WIFI_AWARE", isFree: false)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -140,10 +140,12 @@ public struct DeveloperAPIXcodeAuthMiddleware: ClientMiddleware {
|
||||
|
||||
// Xcode-specific
|
||||
request.headerFields[.userAgent] = "Xcode"
|
||||
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = DeviceInfo.xcodeVersion
|
||||
request.headerFields[.init(DeviceInfo.xcodeVersionKey)!] = "16.2 (16C5031c)"
|
||||
|
||||
// MobileMe identity
|
||||
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = deviceInfo.clientInfo.clientString
|
||||
request.headerFields[.init(DeviceInfo.clientInfoKey)!] = """
|
||||
<VirtualMac2,1> <macOS;15.1.1;24B91> <com.apple.AuthKit/1 (com.apple.dt.Xcode/23505)>
|
||||
""" // deviceInfo.clientInfo.clientString
|
||||
request.headerFields[.init(DeviceInfo.deviceIDKey)!] = deviceInfo.deviceID
|
||||
|
||||
// GrandSlam authentication
|
||||
|
||||
@@ -49,7 +49,7 @@ private struct UnimplementedRawADIProvider: RawADIProvider {
|
||||
private enum RawADIProviderDependencyKey: DependencyKey {
|
||||
static let testValue: RawADIProvider = UnimplementedRawADIProvider()
|
||||
static let liveValue: RawADIProvider = {
|
||||
#if canImport(XADI)
|
||||
#if os(Linux)
|
||||
return XADIProvider()
|
||||
#else
|
||||
return OmnisetteADIProvider()
|
||||
@@ -92,10 +92,13 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
|
||||
private let _clientInfo = LockIsolated<String?>(nil)
|
||||
|
||||
public init() {
|
||||
public init(provisioningData: ProvisioningData? = nil) {
|
||||
@Dependency(\.keyValueStorage) var storage
|
||||
|
||||
if let localUserUIDString = try? storage.string(forKey: Self.localUserUIDKey),
|
||||
if let provisioningData {
|
||||
self.localUserUID = provisioningData.localUserUID
|
||||
try? storage.setData(provisioningData.adiPb, forKey: Self.provisioningKey)
|
||||
try? storage.setString("\(provisioningData.routingInfo)", forKey: Self.routingInfoKey)
|
||||
} else if let localUserUIDString = try? storage.string(forKey: Self.localUserUIDKey),
|
||||
let localUserUID = UUID(uuidString: localUserUIDString) {
|
||||
self.localUserUID = localUserUID
|
||||
} else {
|
||||
@@ -107,15 +110,9 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
self.localUserID = SHA256.hash(data: Data(localUserUID.uuidString.utf8))
|
||||
.map { String(format: "%02X", $0) }
|
||||
.joined()
|
||||
|
||||
if (try? storage.string(forKey: Self.providerIDKey)) != Self.providerID {
|
||||
self.resetProvisioning()
|
||||
try? storage.setString(Self.providerID, forKey: Self.providerIDKey)
|
||||
}
|
||||
}
|
||||
|
||||
private static let localUserUIDKey = "XTLLocalUserUID"
|
||||
private static let providerIDKey = "XTLADIProviderID"
|
||||
private static let provisioningKey = "XTLProvisioningInfo"
|
||||
private static let routingInfoKey = "XTLRoutingInfo"
|
||||
|
||||
@@ -248,16 +245,6 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
try? storage.setString(nil, forKey: Self.routingInfoKey)
|
||||
}
|
||||
|
||||
private static var providerID: String? {
|
||||
#if os(macOS)
|
||||
return "1"
|
||||
#else
|
||||
return nil
|
||||
#endif
|
||||
}
|
||||
|
||||
public var providerID: String? { Self.providerID }
|
||||
|
||||
public func provisioningData() -> ProvisioningData? {
|
||||
guard let provisioningInfo = try? storage.data(forKey: Self.provisioningKey),
|
||||
let routingInfoString = try? storage.string(forKey: Self.routingInfoKey),
|
||||
@@ -293,23 +280,6 @@ public struct ADIDataProvider: AnisetteDataProvider {
|
||||
|
||||
}
|
||||
|
||||
public struct ADIError: Error, CustomStringConvertible {
|
||||
public struct ADIError: Error {
|
||||
public var code: Int
|
||||
|
||||
public var description: String {
|
||||
switch code {
|
||||
case -45061:
|
||||
return """
|
||||
You were logged out. Please log in again with `xtool auth`.
|
||||
|
||||
If you see this repeatedly, please file an issue at https://github.com/xtool-org/xtool/issues/new/choose
|
||||
"""
|
||||
default:
|
||||
return """
|
||||
Apple Anisette library returned error \(code). Please try logging in again with `xtool auth`.
|
||||
|
||||
If this problem persists, file an issue at https://github.com/xtool-org/xtool/issues/new/choose
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,14 +10,6 @@ import Foundation
|
||||
import Dependencies
|
||||
|
||||
public protocol AnisetteDataProvider: Sendable {
|
||||
/// Stored alongside login data. If the provider reports a new ID, we log out.
|
||||
///
|
||||
/// This is useful when switching Anisette provider implementations if the old
|
||||
/// implementation's provisioning data won't work with the new implementation.
|
||||
///
|
||||
/// The default implementation returns `nil`.
|
||||
var providerID: String? { get }
|
||||
|
||||
// This is a suggestion and not a requirement.
|
||||
func resetProvisioning() async
|
||||
func provisioningData() -> ProvisioningData?
|
||||
@@ -32,7 +24,6 @@ public struct ProvisioningData: Hashable, Codable, Sendable {
|
||||
}
|
||||
|
||||
extension AnisetteDataProvider {
|
||||
public var providerID: String? { nil }
|
||||
public func provisioningData() -> ProvisioningData? { nil }
|
||||
public func resetProvisioning() async {}
|
||||
}
|
||||
|
||||
@@ -14,19 +14,29 @@ public struct DeviceInfo: Codable, Sendable {
|
||||
/// `X-Xcode-Version`
|
||||
static let xcodeVersionKey = "X-Xcode-Version"
|
||||
/// Not included in `dictionary`
|
||||
public static let xcodeVersion = "26.5 (17F42)"
|
||||
public static let xcodeVersion = "14.2 (14C18)"
|
||||
|
||||
public struct ClientInfo: Codable {
|
||||
public static let macOSVersion = "14.3.1"
|
||||
public static let macOSBuild = "23D60"
|
||||
|
||||
public static let authKitVersion = "1"
|
||||
public static let akdVersion = "1.0"
|
||||
public static let cfNetworkVersion = "978.0.7"
|
||||
public static let darwinVersion = "18.7.0"
|
||||
|
||||
public let modelID: String // e.g. MacBookPro11,5
|
||||
|
||||
// TODO: Do we need to replace com.apple.akd with com.apple.dt.Xcode? See AltStore
|
||||
var clientString: String {
|
||||
"""
|
||||
<\(modelID)> <macOS;27.0;26A5378j> <com.apple.AuthKit/1 (com.apple.akd/1.0)>
|
||||
<\(modelID)> <Mac OS X;\(Self.macOSVersion);\(Self.macOSBuild)> \
|
||||
<com.apple.AuthKit/\(Self.authKitVersion) (com.apple.akd/\(Self.akdVersion))>
|
||||
"""
|
||||
}
|
||||
|
||||
var userAgent: String {
|
||||
"AuthKit/1 (Macintosh; OS X 27.0) (com.apple.dt.Xcode/26.5)"
|
||||
"akd/\(Self.akdVersion) CFNetwork/\(Self.cfNetworkVersion) Darwin/\(Self.darwinVersion)"
|
||||
}
|
||||
|
||||
public init(modelID: String) {
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
|
||||
#if false
|
||||
|
||||
// For reference: https://github.com/xtool-org/xtool/issues/196
|
||||
|
||||
import Foundation
|
||||
|
||||
/// Creates a socket connected to `ip` on `port`.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#if canImport(XADI)
|
||||
#if os(Linux)
|
||||
|
||||
import Foundation
|
||||
import XADI
|
||||
|
||||
@@ -41,11 +41,7 @@ struct GrandSlamClient: Sendable {
|
||||
}
|
||||
request.configure(request: &httpRequest, deviceInfo: deviceInfo, anisetteData: anisetteData)
|
||||
|
||||
// GrandSlam doesn't seem to like reused (keep-alive) connections so create a
|
||||
// new one for each request. cf https://github.com/rileytestut/AltSign/pull/52
|
||||
let resp = try await httpClient.withEphemeralClient {
|
||||
try await $0.makeRequest(httpRequest, body: body)
|
||||
}
|
||||
let resp = try await httpClient.makeRequest(httpRequest, body: body)
|
||||
return try R.Decoder.decode(data: resp.body)
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,6 @@ actor GrandSlamLookupManager {
|
||||
} */
|
||||
var request = HTTPRequest(url: Self.lookupURL)
|
||||
request.headerFields = [
|
||||
.userAgent: deviceInfo.clientInfo.userAgent,
|
||||
.init(DeviceInfo.clientInfoKey)!: deviceInfo.clientInfo.clientString,
|
||||
.init(DeviceInfo.deviceIDKey)!: deviceInfo.deviceID,
|
||||
.init(AnisetteData.iLocaleKey)!: Locale.current.identifier,
|
||||
|
||||
@@ -18,47 +18,23 @@ import OpenAPIAsyncHTTPClient
|
||||
import Dependencies
|
||||
|
||||
extension HTTPClientDependencyKey: DependencyKey {
|
||||
public static let liveValue: HTTPClientProtocol = Client()
|
||||
}
|
||||
|
||||
private struct Client: HTTPClientProtocol {
|
||||
private static var proxyConfiguration: HTTPClient.Configuration.Proxy? {
|
||||
// e.g. `XTL_HTTP_PROXY=localhost:8080`
|
||||
guard let value = ProcessInfo.processInfo.environment["XTL_HTTP_PROXY"],
|
||||
let separator = value.lastIndex(of: ":"),
|
||||
let port = Int(value[value.index(after: separator)...]) else {
|
||||
return nil
|
||||
}
|
||||
|
||||
let host = String(value[..<separator])
|
||||
return host.isEmpty ? nil : .server(host: host, port: port)
|
||||
}
|
||||
|
||||
private static let tlsConfiguration: TLSConfiguration = {
|
||||
public static let liveValue: HTTPClientProtocol = {
|
||||
// if ssl cert parsing fails we're screwed so we might as well force try
|
||||
// swiftlint:disable:next force_try
|
||||
let appleRootCA = try! NIOSSLCertificate(bytes: Array(appleRootPEM.utf8), format: .pem)
|
||||
var tlsConfiguration: TLSConfiguration = .makeClientConfiguration()
|
||||
tlsConfiguration.additionalTrustRoots = [.certificates([appleRootCA])]
|
||||
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1" {
|
||||
tlsConfiguration.certificateVerification = .none
|
||||
}
|
||||
return tlsConfiguration
|
||||
}()
|
||||
|
||||
var client: HTTPClient
|
||||
|
||||
init() {
|
||||
var config = HTTPClient.Configuration(
|
||||
tlsConfiguration: Self.tlsConfiguration,
|
||||
proxy: Self.proxyConfiguration,
|
||||
tlsConfiguration: tlsConfiguration,
|
||||
decompression: .enabled(limit: .none)
|
||||
)
|
||||
config.timeout.connect = .seconds(60)
|
||||
self.client = HTTPClient(configuration: config)
|
||||
}
|
||||
return HTTPClient(configuration: config)
|
||||
}()
|
||||
}
|
||||
|
||||
func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
extension HTTPClient: HTTPClientProtocol {
|
||||
public func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
let (stream, continuation) = AsyncStream.makeStream(of: WebSocketSessionWrapper.self)
|
||||
async let value = stream.first(where: { _ in true })
|
||||
// must be after the `async let` so that we finish if connect throws
|
||||
@@ -66,7 +42,7 @@ private struct Client: HTTPClientProtocol {
|
||||
// we can't use the async overload because we need to immediately subscribe
|
||||
// to onText/onBinary in the same EventLoop tick that the WebSocket is created.
|
||||
// This is also why we create the SessionWrapper inside the closure.
|
||||
let future = WebSocket.connect(to: url, on: client.eventLoopGroup) {
|
||||
let future = WebSocket.connect(to: url, on: eventLoopGroup) {
|
||||
continuation.yield(WebSocketSessionWrapper(webSocket: $0))
|
||||
}
|
||||
try await future.get()
|
||||
@@ -80,17 +56,8 @@ private struct Client: HTTPClientProtocol {
|
||||
case connectFailed
|
||||
}
|
||||
|
||||
var asOpenAPITransport: any ClientTransport {
|
||||
AsyncHTTPClientTransport(configuration: .init(client: client))
|
||||
}
|
||||
|
||||
func withEphemeralClient<T>(
|
||||
perform: (any HTTPClientProtocol) async throws -> T
|
||||
) async throws -> T {
|
||||
let ephemeralClient = Client()
|
||||
let result = await Result { try await perform(ephemeralClient) }
|
||||
try? await ephemeralClient.client.shutdown()
|
||||
return try result.get()
|
||||
public var asOpenAPITransport: any ClientTransport {
|
||||
AsyncHTTPClientTransport(configuration: .init(client: self))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -18,10 +18,6 @@ public protocol HTTPClientProtocol: Sendable {
|
||||
var asOpenAPITransport: ClientTransport { get }
|
||||
|
||||
func makeWebSocket(url: URL) async throws -> WebSocketSession
|
||||
|
||||
func withEphemeralClient<T>(
|
||||
perform: (any HTTPClientProtocol) async throws -> T
|
||||
) async throws -> T
|
||||
}
|
||||
|
||||
extension HTTPClientProtocol {
|
||||
@@ -45,72 +41,28 @@ extension HTTPClientProtocol {
|
||||
public func makeRequest(
|
||||
_ request: HTTPRequest,
|
||||
body: Data? = nil,
|
||||
requireHTTPSuccess: Bool = true,
|
||||
onProgress: @isolated(any) (Double?) -> Void = { _ in }
|
||||
) async throws -> (response: HTTPResponse, body: Data) {
|
||||
await onProgress(0)
|
||||
let (response, responseBody) = try await send(request, body: body.map { HTTPBody($0) })
|
||||
guard !requireHTTPSuccess || ![.clientError, .serverError].contains(response.status.kind) else {
|
||||
let errorBody = (try? await responseBody.collect()) ?? Data()
|
||||
throw HTTPResponseError(
|
||||
method: request.method,
|
||||
url: "\(request.scheme ?? "https")://\(request.authority ?? "")\(request.path ?? "")",
|
||||
status: response.status,
|
||||
// we don't use `decoding:as:` because we want to validate the UTF8
|
||||
body: String(data: errorBody, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
)
|
||||
let (response, body) = try await send(request, body: body.map { HTTPBody($0) })
|
||||
guard let body else {
|
||||
return (response, Data())
|
||||
}
|
||||
return (response, try await responseBody.collect(onProgress: onProgress))
|
||||
}
|
||||
}
|
||||
|
||||
extension HTTPBody? {
|
||||
fileprivate func collect(
|
||||
onProgress: @isolated(any) (Double?) -> Void = { _ in }
|
||||
) async throws -> Data {
|
||||
try await self?.collect(onProgress: onProgress) ?? Data()
|
||||
}
|
||||
}
|
||||
|
||||
extension HTTPBody {
|
||||
fileprivate func collect(
|
||||
onProgress: @isolated(any) (Double?) -> Void
|
||||
) async throws -> Data {
|
||||
switch self.length {
|
||||
switch body.length {
|
||||
case .unknown:
|
||||
return try await self.reduce(into: Data()) { $0 += $1 }
|
||||
return (response, try await body.reduce(into: Data()) { $0 += $1 })
|
||||
case .known(let length):
|
||||
var data = Data(capacity: Int(length))
|
||||
let total = Double(length)
|
||||
for try await chunk in self {
|
||||
for try await chunk in body {
|
||||
data += chunk
|
||||
await onProgress(Swift.min(Double(data.count) / total, 1))
|
||||
await onProgress(min(Double(data.count) / total, 1))
|
||||
}
|
||||
return data
|
||||
return (response, data)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public struct HTTPResponseError: Error, LocalizedError, Sendable, CustomStringConvertible {
|
||||
public let method: HTTPRequest.Method
|
||||
public let url: String
|
||||
public let status: HTTPResponse.Status
|
||||
public let body: String?
|
||||
|
||||
public var description: String {
|
||||
var description = "\(method.rawValue) \(url) failed: HTTP \(status.code)"
|
||||
if !status.reasonPhrase.isEmpty {
|
||||
description += " \(status.reasonPhrase)"
|
||||
}
|
||||
if let body, !body.isEmpty {
|
||||
description += ". Details:\n\(body)"
|
||||
}
|
||||
return description
|
||||
}
|
||||
|
||||
public var errorDescription: String? { description }
|
||||
}
|
||||
|
||||
private struct UnimplementedHTTPClient: HTTPClientProtocol, ClientTransport {
|
||||
public var asOpenAPITransport: ClientTransport { self }
|
||||
|
||||
@@ -132,12 +84,6 @@ private struct UnimplementedHTTPClient: HTTPClientProtocol, ClientTransport {
|
||||
return try closure()
|
||||
}
|
||||
|
||||
func withEphemeralClient<T>(
|
||||
perform: (any HTTPClientProtocol) async throws -> T
|
||||
) async throws -> T {
|
||||
try await perform(self)
|
||||
}
|
||||
|
||||
public func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
let closure: (URL) async throws -> any WebSocketSession = unimplemented()
|
||||
return try await closure(url)
|
||||
|
||||
@@ -40,18 +40,6 @@ private struct Client: HTTPClientProtocol {
|
||||
) {
|
||||
webSocketCallbacks.withValue { $0.removeValue(forKey: webSocketTask) }?(closeCode)
|
||||
}
|
||||
|
||||
func urlSession(
|
||||
_ session: URLSession,
|
||||
didReceive challenge: URLAuthenticationChallenge
|
||||
) async -> (URLSession.AuthChallengeDisposition, URLCredential?) {
|
||||
if ProcessInfo.processInfo.environment["XTL_DISABLE_TLS_VALIDATION"] == "1",
|
||||
let trust = challenge.protectionSpace.serverTrust {
|
||||
return (.useCredential, URLCredential(trust: trust))
|
||||
} else {
|
||||
return (.performDefaultHandling, nil)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private let clientDelegate = ClientDelegate()
|
||||
@@ -68,15 +56,6 @@ private struct Client: HTTPClientProtocol {
|
||||
URLSessionTransport(configuration: .init(session: session))
|
||||
}
|
||||
|
||||
func withEphemeralClient<T>(
|
||||
perform: (any HTTPClientProtocol) async throws -> T
|
||||
) async throws -> T {
|
||||
let ephemeralClient = Client()
|
||||
let result = await Result { try await perform(ephemeralClient) }
|
||||
ephemeralClient.session.finishTasksAndInvalidate()
|
||||
return try result.get()
|
||||
}
|
||||
|
||||
public func makeWebSocket(url: URL) async throws -> any WebSocketSession {
|
||||
let task = session.webSocketTask(with: url)
|
||||
let (event, eventContinuation) = AsyncStream<URLSessionWebSocketTask.CloseCode?>.makeStream()
|
||||
|
||||
@@ -26,7 +26,6 @@ extension EntitlementContainer {
|
||||
SiriKitEntitlement.self,
|
||||
InterAppAudioEntitlement.self,
|
||||
WirelessAccessoryEntitlement.self,
|
||||
WiFiAwareEntitlement.self,
|
||||
HomeKitEntitlement.self,
|
||||
HealthKitEntitlement.self,
|
||||
]
|
||||
@@ -156,21 +155,6 @@ public struct WirelessAccessoryEntitlement: Entitlement, RawRepresentable {
|
||||
public init(rawValue: Bool) { self.rawValue = rawValue }
|
||||
}
|
||||
|
||||
public struct WiFiAwareEntitlement: Entitlement, RawRepresentable {
|
||||
public static let identifier = "com.apple.developer.wifi-aware"
|
||||
|
||||
public var rawValue: [String]
|
||||
public init(rawValue: [String]) { self.rawValue = rawValue }
|
||||
|
||||
public init(from decoder: Decoder) throws {
|
||||
rawValue = try decoder.singleValueContainer().decode([String].self)
|
||||
}
|
||||
public func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.singleValueContainer()
|
||||
try container.encode(rawValue)
|
||||
}
|
||||
}
|
||||
|
||||
public struct HomeKitEntitlement: Entitlement, RawRepresentable {
|
||||
public static let identifier = "com.apple.developer.homekit"
|
||||
|
||||
|
||||
@@ -111,15 +111,12 @@ struct AuthOperation {
|
||||
}
|
||||
)
|
||||
|
||||
@Dependency(\.anisetteDataProvider) var anisetteProvider
|
||||
|
||||
return AuthToken.xcode(.init(
|
||||
appleID: username,
|
||||
adsid: token.adsid,
|
||||
token: token.token,
|
||||
expiry: token.expiry,
|
||||
teamID: team.id.rawValue,
|
||||
anisetteProviderID: anisetteProvider.providerID
|
||||
teamID: team.id.rawValue
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ enum AuthToken: Codable, CustomStringConvertible {
|
||||
var token: String
|
||||
var expiry: Date
|
||||
var teamID: String
|
||||
var anisetteProviderID: String?
|
||||
}
|
||||
|
||||
struct AppStoreConnect: Codable {
|
||||
@@ -59,18 +58,7 @@ extension AuthToken {
|
||||
guard let data = try storage.data(forKey: "XTLAuthToken") else {
|
||||
return nil
|
||||
}
|
||||
let decoded = try decoder.decode(AuthToken.self, from: data)
|
||||
switch decoded {
|
||||
case .xcode(let xcode):
|
||||
@Dependency(\.anisetteDataProvider) var anisetteProvider
|
||||
guard xcode.anisetteProviderID == anisetteProvider.providerID else {
|
||||
try? clear()
|
||||
return nil
|
||||
}
|
||||
case .appStoreConnect:
|
||||
break
|
||||
}
|
||||
return decoded
|
||||
return try decoder.decode(AuthToken.self, from: data)
|
||||
}
|
||||
|
||||
static func clear() throws {
|
||||
|
||||
@@ -22,7 +22,7 @@ struct DSTeamsListCommand: AsyncParsableCommand {
|
||||
func run() async throws {
|
||||
let token = try AuthToken.saved()
|
||||
|
||||
guard case let .xcode(authData) = token.authData() else {
|
||||
guard case let .xcode(authData) = try token.authData() else {
|
||||
throw Console.Error("This command requires password-based authentication")
|
||||
}
|
||||
let client = DeveloperServicesClient(authData: authData)
|
||||
|
||||
@@ -14,18 +14,16 @@ struct DevBSPCommand: AsyncParsableCommand {
|
||||
var triple: String?
|
||||
|
||||
func run() async throws {
|
||||
guard try await SwiftVersion.current.supportsSwiftBuild else {
|
||||
throw Console.Error("`xtool dev build-server` requires Swift 6.4 or later")
|
||||
}
|
||||
let settings = try await BuildSettings(
|
||||
configuration: .debug,
|
||||
triple: triple ?? PackOperation.defaultTriple
|
||||
)
|
||||
try await Subprocess.run(
|
||||
settings.buildServerInvocation(),
|
||||
.path(BuildSettings.swiftURL()),
|
||||
arguments: .init(settings.buildServerArguments),
|
||||
input: .standardInput,
|
||||
output: .currentStandardOutput,
|
||||
error: .currentStandardError,
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
}
|
||||
|
||||
@@ -23,21 +23,30 @@ struct PackOperation {
|
||||
|
||||
var triple: String?
|
||||
var buildOptions = BuildOptions(configuration: .debug)
|
||||
var extraOptions: [String] = []
|
||||
var watchMode = false
|
||||
var xcode = false
|
||||
|
||||
func buildSettings() async throws -> BuildSettings {
|
||||
try await BuildSettings(
|
||||
configuration: buildOptions.configuration,
|
||||
triple: triple ?? Self.defaultTriple,
|
||||
options: extraOptions + (
|
||||
watchMode
|
||||
? [
|
||||
"-Xlinker", "-interposable",
|
||||
// https://kyleye.top/posts/debugreplaceableview-multiple-type-erasers/
|
||||
"-Xswiftc", "-enable-experimental-feature", "-Xswiftc", "OpaqueTypeErasure",
|
||||
// https://www.guardsquare.com/blog/behind-swiftui-previews
|
||||
"-Xswiftc", "-Xfrontend", "-Xswiftc", "-enable-private-imports",
|
||||
]
|
||||
: []
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
func run() async throws -> URL {
|
||||
// TODO: support running inside a child directory
|
||||
|
||||
let contents = try FileManager.default.contentsOfDirectory(atPath: ".")
|
||||
guard contents.contains("Package.swift")
|
||||
|| contents.contains(where: { $0.hasPrefix("Package@") && $0.hasSuffix(".swift") })
|
||||
else {
|
||||
throw Console.Error("Could not find Package.swift in this directory.")
|
||||
}
|
||||
|
||||
try await EnsureSDKOperation(quiet: true).run()
|
||||
|
||||
func run() async throws -> (Plan, URL) {
|
||||
print("Planning...")
|
||||
|
||||
let schema: PackSchema
|
||||
@@ -52,13 +61,7 @@ struct PackOperation {
|
||||
""")
|
||||
}
|
||||
|
||||
await LSPConfig.tryEnsure(using: schema)
|
||||
|
||||
let buildSettings = try await BuildSettings(
|
||||
configuration: buildOptions.configuration,
|
||||
triple: triple ?? Self.defaultTriple,
|
||||
options: []
|
||||
)
|
||||
let buildSettings = try await buildSettings()
|
||||
|
||||
let planner = Planner(
|
||||
buildSettings: buildSettings,
|
||||
@@ -68,7 +71,8 @@ struct PackOperation {
|
||||
|
||||
#if os(macOS)
|
||||
if xcode {
|
||||
return try await XcodePacker(plan: plan).createProject()
|
||||
let url = try await XcodePacker(plan: plan).createProject()
|
||||
return (plan, url)
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -81,28 +85,26 @@ struct PackOperation {
|
||||
let productsWithEntitlements = plan
|
||||
.allProducts
|
||||
.compactMap { p in p.entitlementsPath.map { (p, $0) } }
|
||||
if !productsWithEntitlements.isEmpty {
|
||||
let mapping = try await withThrowingTaskGroup(of: (URL, Entitlements).self) { group in
|
||||
for (product, path) in productsWithEntitlements {
|
||||
group.addTask {
|
||||
let data = try await Data(reading: URL(fileURLWithPath: path))
|
||||
let decoder = PropertyListDecoder()
|
||||
let entitlements = try decoder.decode(Entitlements.self, from: data)
|
||||
return (product.directory(inApp: bundle), entitlements)
|
||||
}
|
||||
let mapping = try await withThrowingTaskGroup(of: (URL, Entitlements?).self) { group in
|
||||
for (product, path) in productsWithEntitlements {
|
||||
group.addTask {
|
||||
let data = try await Data(reading: URL(fileURLWithPath: path))
|
||||
let decoder = PropertyListDecoder()
|
||||
let entitlements = try decoder.decode(Entitlements.self, from: data)
|
||||
return (product.directory(inApp: bundle), entitlements)
|
||||
}
|
||||
return try await group.reduce(into: [:]) { $0[$1.0] = $1.1 }
|
||||
}
|
||||
print("Applying entitlements...")
|
||||
try await Signer.first().sign(
|
||||
app: bundle,
|
||||
identity: .adhoc,
|
||||
entitlementMapping: mapping,
|
||||
progress: { _ in }
|
||||
)
|
||||
return try await group.reduce(into: [:]) { $0[$1.0] = $1.1 }
|
||||
}
|
||||
print("Applying entitlements...")
|
||||
try await Signer.first().sign(
|
||||
app: bundle,
|
||||
identity: .adhoc,
|
||||
entitlementMapping: mapping,
|
||||
progress: { _ in }
|
||||
)
|
||||
|
||||
return bundle
|
||||
return (plan, bundle)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,7 +159,7 @@ struct DevBuildCommand: AsyncParsableCommand {
|
||||
signingAuthToken = nil
|
||||
}
|
||||
|
||||
let url = try await PackOperation(
|
||||
let (_, url) = try await PackOperation(
|
||||
triple: triple,
|
||||
buildOptions: packOptions
|
||||
).run()
|
||||
@@ -222,6 +224,13 @@ struct DevRunCommand: AsyncParsableCommand {
|
||||
help: "Target the iOS Simulator"
|
||||
) var simulator = false
|
||||
|
||||
@Flag(
|
||||
name: .shortAndLong,
|
||||
help: "Hot reload files on change. Requires simulator."
|
||||
) var watch = false
|
||||
|
||||
@Option var xloadPath: String?
|
||||
|
||||
var triple: String? {
|
||||
if simulator {
|
||||
#if arch(arm64)
|
||||
@@ -235,17 +244,37 @@ struct DevRunCommand: AsyncParsableCommand {
|
||||
return nil
|
||||
}
|
||||
#else
|
||||
var watch: Bool { false }
|
||||
var triple: String? { nil }
|
||||
#endif
|
||||
|
||||
@OptionGroup var connectionOptions: ConnectionOptions
|
||||
|
||||
func validate() throws {
|
||||
#if os(macOS)
|
||||
if watch && !simulator {
|
||||
throw ValidationError("--watch requires --simulator")
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
func run() async throws {
|
||||
let output = try await PackOperation(triple: triple, buildOptions: packOptions).run()
|
||||
let operation = PackOperation(
|
||||
triple: triple,
|
||||
buildOptions: packOptions,
|
||||
watchMode: watch,
|
||||
)
|
||||
let (plan, output) = try await operation.run()
|
||||
|
||||
#if os(macOS)
|
||||
if simulator {
|
||||
try await SimInstallOperation(path: output).run()
|
||||
try await SimInstallOperation(
|
||||
operation: operation,
|
||||
plan: plan,
|
||||
path: output,
|
||||
watch: watch,
|
||||
xLoadLibrary: xloadPath,
|
||||
).run()
|
||||
return
|
||||
}
|
||||
#endif
|
||||
@@ -294,24 +323,3 @@ struct DevCommand: AsyncParsableCommand {
|
||||
}
|
||||
|
||||
extension BuildConfiguration: ExpressibleByArgument {}
|
||||
|
||||
#if os(macOS)
|
||||
import Subprocess
|
||||
|
||||
struct SimInstallOperation {
|
||||
var path: URL
|
||||
|
||||
// TODO: allow customizing this
|
||||
var simulator = "booted"
|
||||
|
||||
func run() async throws {
|
||||
try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: ["simctl", "install", simulator, path.path],
|
||||
output: .discarded
|
||||
)
|
||||
.checkSuccess()
|
||||
print("Installed to simulator")
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,97 @@
|
||||
import Foundation
|
||||
import ArgumentParser
|
||||
import PackLib
|
||||
import XUtils
|
||||
import Subprocess
|
||||
|
||||
struct HotReloadCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "hot-reload",
|
||||
abstract: "Run an app with support for hot reloading",
|
||||
)
|
||||
|
||||
@Flag(
|
||||
help: "Use the SwiftPM build system to determine compile commands"
|
||||
) var swiftpm = false
|
||||
|
||||
@Option(
|
||||
help: .init(
|
||||
"Use the specified Build Server to determine compile commands",
|
||||
discussion: """
|
||||
The file at the specified path should correspond to the BSP \
|
||||
Connection Details specification. See:
|
||||
|
||||
https://build-server-protocol.github.io/docs/overview/server-discovery
|
||||
""",
|
||||
)
|
||||
) var buildServerPath: String?
|
||||
|
||||
@Option(
|
||||
help: "The directory in which to store scratch files"
|
||||
) var scratchDirectory: String?
|
||||
|
||||
@Option(
|
||||
help: "String to prepend to all env var names"
|
||||
) var envPrefix: String = ""
|
||||
|
||||
@Option(
|
||||
help: .hidden
|
||||
) var xloadLibrary: String?
|
||||
|
||||
@Argument(
|
||||
help: .init(
|
||||
"The command to run with hot reloading",
|
||||
discussion: """
|
||||
xtool spawns the provided process with env vars set to enable hot reloading.
|
||||
"""
|
||||
)
|
||||
) var command: [String]
|
||||
|
||||
func run() async throws {
|
||||
let configuration: BuildServerConfiguration
|
||||
switch (swiftpm, buildServerPath) {
|
||||
case (true, _?):
|
||||
throw ValidationError("Both --swiftpm or --build-server-path were provided; please only provide one.")
|
||||
case (true, nil):
|
||||
configuration = try await .swiftPM(settings: BuildSettings(configuration: .debug, triple: "arm64-apple-ios-simulator"))
|
||||
case (false, let serverPath?):
|
||||
configuration = try await .external(definition: URL(filePath: serverPath))
|
||||
case (false, nil):
|
||||
if let discovered = try await BuildServerConfiguration.discover(in: URL(filePath: ".")) {
|
||||
configuration = discovered
|
||||
} else {
|
||||
throw ValidationError("Could not guess build system. Please specify one with --swiftpm or --build-server-path")
|
||||
}
|
||||
}
|
||||
|
||||
let reloader = try await HotReloader(
|
||||
configuration: configuration,
|
||||
scratchDirectory: scratchDirectory.map { FilePath($0) },
|
||||
xLoadLibrary: xloadLibrary
|
||||
)
|
||||
|
||||
let watchTask = Task {
|
||||
do {
|
||||
try await reloader.watch()
|
||||
} catch {
|
||||
print("Error: watcher failed: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
var arguments = command
|
||||
let executable = arguments.removeFirst()
|
||||
|
||||
try await Subprocess.run(
|
||||
.name(executable),
|
||||
arguments: Arguments(arguments),
|
||||
environment: .inherit.updating(reloader.subprocessEnvironment(prefix: envPrefix)),
|
||||
platformOptions: .withGracefulShutDown,
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
watchTask.cancel()
|
||||
await watchTask.value
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
#if os(macOS)
|
||||
|
||||
import Subprocess
|
||||
import PackLib
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Dependencies
|
||||
import XKit
|
||||
|
||||
actor HotReloader {
|
||||
var configuration: BuildServerConfiguration
|
||||
var scratchDirectory: FilePath
|
||||
var xLoadLibrary: String?
|
||||
|
||||
private let scratchTemporaryDirectory: TemporaryDirectory?
|
||||
private let xLoadPath: String
|
||||
private let buildDirectory: FilePath
|
||||
private let outDirectory: FilePath
|
||||
|
||||
init(
|
||||
configuration: BuildServerConfiguration,
|
||||
scratchDirectory: FilePath? = nil,
|
||||
xLoadLibrary: String? = nil,
|
||||
) async throws {
|
||||
self.configuration = configuration
|
||||
|
||||
if let scratchDirectory {
|
||||
self.scratchDirectory = FilePath(URL(filePath: scratchDirectory.string).absoluteURL.path)
|
||||
self.scratchTemporaryDirectory = nil
|
||||
} else {
|
||||
let scratchTemporaryDirectory = try TemporaryDirectory(name: "scratch")
|
||||
self.scratchDirectory = FilePath(scratchTemporaryDirectory.url.path)
|
||||
self.scratchTemporaryDirectory = consume scratchTemporaryDirectory
|
||||
}
|
||||
|
||||
self.xLoadLibrary = xLoadLibrary
|
||||
|
||||
xLoadPath = if let xLoadLibrary {
|
||||
URL(filePath: xLoadLibrary).absoluteURL.path
|
||||
} else {
|
||||
try await Self.getXLoad(platform: "iphonesimulator").path
|
||||
}
|
||||
|
||||
buildDirectory = self.scratchDirectory.appending("build")
|
||||
try FileManager.default.createDirectory(at: URL(filePath: buildDirectory)!, withIntermediateDirectories: true)
|
||||
|
||||
outDirectory = self.scratchDirectory.appending("out")
|
||||
try FileManager.default.createDirectory(at: URL(filePath: outDirectory)!, withIntermediateDirectories: true)
|
||||
}
|
||||
|
||||
|
||||
nonisolated func environment(prefix: String = "SIMCTL_CHILD_") -> [String: String] {
|
||||
[
|
||||
"\(prefix)DYLD_INSERT_LIBRARIES": xLoadPath,
|
||||
"\(prefix)XLOAD_WATCH_DIR": outDirectory.string,
|
||||
"\(prefix)XLOAD_INTERCEPT": "1",
|
||||
]
|
||||
}
|
||||
|
||||
nonisolated func subprocessEnvironment(prefix: String = "SIMCTL_CHILD_") -> [Environment.Key: String] {
|
||||
Dictionary(uniqueKeysWithValues: environment(prefix: prefix).map {
|
||||
(Environment.Key(rawValue: $0)!, $1)
|
||||
})
|
||||
}
|
||||
|
||||
func watch() async throws {
|
||||
let workspace = try await SwiftWorkspace(
|
||||
configuration: configuration,
|
||||
buildDirectory: buildDirectory,
|
||||
outDirectory: outDirectory,
|
||||
)
|
||||
|
||||
@Dependency(\.fileSystemMonitor) var fileSystemMonitor
|
||||
let events = try await fileSystemMonitor.watch(FilePath(FileManager.default.currentDirectoryPath))
|
||||
|
||||
for await event in events {
|
||||
do {
|
||||
try await workspace.fileDidChange(event.file)
|
||||
} catch {
|
||||
print("Reload failed: \(error)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static func getXLoad(platform: String) async throws -> URL {
|
||||
let version = "0.3.0"
|
||||
let remote = URL(string: "https://github.com/xtool-org/xload/releases/download/v\(version)/libXLoad.\(platform).dylib")!
|
||||
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
@Dependency(\.persistentDirectory) var persistentDirectory
|
||||
|
||||
let platformDir = persistentDirectory.appending(path: "xload/\(platform)")
|
||||
let versionDir = platformDir.appending(path: version)
|
||||
let local = versionDir.appending(path: "libXLoad.dylib")
|
||||
if local.exists { return local }
|
||||
|
||||
print("Downloading xload...")
|
||||
|
||||
try? FileManager.default.removeItem(at: platformDir)
|
||||
try FileManager.default.createDirectory(at: versionDir, withIntermediateDirectories: true)
|
||||
|
||||
let data = try await httpClient.makeRequest(HTTPRequest(url: remote))
|
||||
guard data.response.status.kind == .successful else {
|
||||
throw StringError("Failed to download xload: got HTTP \(data.response.status)")
|
||||
}
|
||||
try data.body.write(to: local)
|
||||
|
||||
return local
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -1,90 +0,0 @@
|
||||
import Foundation
|
||||
import PackLib
|
||||
|
||||
enum LSPConfig {
|
||||
static let bsp: (String, String) = (
|
||||
".bsp/xtool.json",
|
||||
"""
|
||||
{
|
||||
"name": "xtool",
|
||||
"version": "1.0",
|
||||
"bspVersion": "2.2.0",
|
||||
"languages": ["c", "cpp", "objective-c", "objective-cpp", "swift"],
|
||||
"argv": ["/usr/bin/env", "xtool", "dev", "build-server"]
|
||||
}
|
||||
"""
|
||||
)
|
||||
|
||||
static let legacyLSP: (String, String) = (
|
||||
".sourcekit-lsp/config.json",
|
||||
"""
|
||||
{
|
||||
"swiftPM": {
|
||||
"swiftSDK": "arm64-apple-ios"
|
||||
}
|
||||
}
|
||||
"""
|
||||
)
|
||||
|
||||
nonisolated(nonsending) static func tryEnsure(
|
||||
using schema: PackSchema,
|
||||
quiet: Bool = false,
|
||||
currentDirectory directory: URL = URL(filePath: FileManager.default.currentDirectoryPath)
|
||||
) async {
|
||||
do {
|
||||
try await ensure(using: schema, quiet: quiet, currentDirectory: directory)
|
||||
} catch {
|
||||
print("warning: failed to validate LSP configuration: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
nonisolated(nonsending) static func ensure(
|
||||
using schema: PackSchema,
|
||||
quiet: Bool = false,
|
||||
currentDirectory directory: URL = URL(filePath: FileManager.default.currentDirectoryPath)
|
||||
) async throws {
|
||||
if schema.skipLSP == true {
|
||||
return
|
||||
}
|
||||
|
||||
if try await SwiftVersion.current.supportsSwiftBuild {
|
||||
try await ensure(primary: bsp, secondary: legacyLSP, quiet: quiet, currentDirectory: directory)
|
||||
} else {
|
||||
try await ensure(primary: legacyLSP, secondary: bsp, quiet: quiet, currentDirectory: directory)
|
||||
}
|
||||
}
|
||||
|
||||
// creates the primary LSP-support file if it doesn't exist, and cleans up old files
|
||||
private nonisolated(nonsending) static func ensure(
|
||||
primary: (String, String),
|
||||
secondary: (String, String),
|
||||
quiet: Bool,
|
||||
currentDirectory directory: URL
|
||||
) async throws {
|
||||
let primaryURL = directory.appendingPathComponent(primary.0)
|
||||
if FileManager.default.fileExists(atPath: primaryURL.path) {
|
||||
return
|
||||
}
|
||||
|
||||
try? FileManager.default.createDirectory(
|
||||
at: primaryURL.deletingLastPathComponent(),
|
||||
withIntermediateDirectories: true
|
||||
)
|
||||
try Data((primary.1 + "\n").utf8).write(to: primaryURL)
|
||||
|
||||
let secondaryURL = directory.appendingPathComponent(secondary.0)
|
||||
if let secondaryData = try? await Data(reading: secondaryURL),
|
||||
let secondaryString = String(data: secondaryData, encoding: .utf8),
|
||||
secondaryString.trimmingCharacters(in: .whitespacesAndNewlines) == secondary.1 {
|
||||
try? FileManager.default.removeItem(at: secondaryURL)
|
||||
}
|
||||
|
||||
if !quiet {
|
||||
print("""
|
||||
[LSP] Created \(primary.0) for enhanced IDE support. You may
|
||||
need to restart your editor for the change to take effect.
|
||||
You can disable this with `skipLSP: true` in xtool.yml.
|
||||
""")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -120,6 +120,17 @@ struct NewCommand: AsyncParsableCommand {
|
||||
"""
|
||||
),
|
||||
|
||||
(
|
||||
".sourcekit-lsp/config.json",
|
||||
"""
|
||||
{
|
||||
"swiftPM": {
|
||||
"swiftSDK": "arm64-apple-ios"
|
||||
}
|
||||
}
|
||||
"""
|
||||
),
|
||||
|
||||
(
|
||||
"Sources/\(moduleName)/\(moduleName)App.swift",
|
||||
"""
|
||||
@@ -166,12 +177,6 @@ struct NewCommand: AsyncParsableCommand {
|
||||
try "\(contents)\n".write(to: url, atomically: true, encoding: .utf8)
|
||||
}
|
||||
|
||||
await LSPConfig.tryEnsure(
|
||||
using: .default,
|
||||
quiet: true,
|
||||
currentDirectory: baseURL,
|
||||
)
|
||||
|
||||
print("\nFinished generating project \(name). Next steps:")
|
||||
print("- Enter the directory with `cd \(name)`")
|
||||
print("- Build and run with `xtool dev`")
|
||||
|
||||
@@ -5,7 +5,6 @@ import Subprocess
|
||||
import XKit // HTTPClient, stdoutSafe
|
||||
import XUtils // System.File{Path,Descriptor}
|
||||
|
||||
// swiftlint:disable:next type_body_length
|
||||
struct SDKBuilder {
|
||||
enum Arch: String {
|
||||
case x86_64
|
||||
@@ -53,51 +52,14 @@ struct SDKBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
enum Mode {
|
||||
/// Create a slim SDK with just the files that this version of xtool uses
|
||||
case buildSlim
|
||||
/// Create an SDK that retains a full copy of Xcode.app/Contents/Developer.
|
||||
/// Larger but allows in-place updates.
|
||||
case buildNormal
|
||||
/// Update a normal SDK in-place.
|
||||
case update
|
||||
|
||||
var usesHardLinks: Bool {
|
||||
switch self {
|
||||
case .buildSlim: false
|
||||
case .buildNormal, .update: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let input: Input
|
||||
let output: URL
|
||||
let arch: Arch
|
||||
let mode: Mode
|
||||
|
||||
// bump this when the sdk builder logic changes
|
||||
static let sdkEpoch = 2
|
||||
|
||||
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
|
||||
static let darwinToolsVersion = "1.1.0"
|
||||
|
||||
// tag from https://github.com/xtool-org/OpenAppleMacros
|
||||
static let oamVersion = "1.3.0"
|
||||
static let oamLibraries: [String] = [
|
||||
"FoundationModelsMacros",
|
||||
"PreviewsMacros",
|
||||
"SwiftUIMacros",
|
||||
]
|
||||
|
||||
static var currentSDKVersion: String {
|
||||
"""
|
||||
epoch=\(sdkEpoch),darwinTools=\(darwinToolsVersion),oam=\(oamVersion)
|
||||
"""
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
func buildSDK() async throws {
|
||||
let sdkVersion = Self.currentSDKVersion
|
||||
// TODO: store relevant info for staleness check
|
||||
let sdkVersion = "develop"
|
||||
|
||||
try? FileManager.default.removeItem(at: output)
|
||||
try FileManager.default.createDirectory(
|
||||
@@ -105,11 +67,9 @@ struct SDKBuilder {
|
||||
withIntermediateDirectories: true
|
||||
)
|
||||
|
||||
// TODO: parallelize these three steps
|
||||
// TODO: parallelize these two steps
|
||||
// we need to synchronize progress reporting though
|
||||
|
||||
try await installMacros(in: output)
|
||||
|
||||
try await installToolset(in: output)
|
||||
|
||||
let dev = try await installDeveloper(in: output)
|
||||
@@ -201,7 +161,7 @@ struct SDKBuilder {
|
||||
"schemaVersion": "1.0",
|
||||
"rootPath": "toolset/bin",
|
||||
"linker": {
|
||||
"path": "ld64.lld"
|
||||
"path": "ld"
|
||||
},
|
||||
"librarian": {
|
||||
"path": "llvm-lib"
|
||||
@@ -233,8 +193,10 @@ struct SDKBuilder {
|
||||
.write(to: output.appendingPathComponent("darwin-sdk-version.txt"))
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
private func installToolset(in output: URL) async throws {
|
||||
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
|
||||
let darwinToolsVersion = "1.0.1"
|
||||
|
||||
let toolsetDir = output.appendingPathComponent("toolset")
|
||||
|
||||
try FileManager.default.createDirectory(
|
||||
@@ -245,7 +207,7 @@ struct SDKBuilder {
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
let url = URL(string: """
|
||||
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
|
||||
v\(Self.darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
|
||||
v\(darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
|
||||
""")!
|
||||
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
|
||||
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
|
||||
@@ -259,15 +221,12 @@ struct SDKBuilder {
|
||||
.name("tar"),
|
||||
arguments: ["xzf", "-"],
|
||||
workingDirectory: FilePath(toolsetDir),
|
||||
input: .inputWriter,
|
||||
output: .discarded,
|
||||
error: .discarded,
|
||||
) { execution in
|
||||
) { _, input, _ in
|
||||
var totalWritten: Int64 = 0
|
||||
for try await chunk in body {
|
||||
var remaining = chunk
|
||||
while !remaining.isEmpty {
|
||||
let written = try await execution.standardInputWriter.write(Array(remaining))
|
||||
let written = try await input.write(Array(remaining))
|
||||
remaining = remaining.dropFirst(written)
|
||||
totalWritten += Int64(written)
|
||||
|
||||
@@ -277,7 +236,7 @@ struct SDKBuilder {
|
||||
fflush(stdoutSafe)
|
||||
}
|
||||
}
|
||||
try await execution.standardInputWriter.finish()
|
||||
try await input.finish()
|
||||
}
|
||||
.checkSuccess()
|
||||
|
||||
@@ -289,159 +248,30 @@ struct SDKBuilder {
|
||||
to: toolsetDir.appending(path: "bin/llvm-lib")
|
||||
)
|
||||
|
||||
let ld64 = toolsetDir.appending(path: "bin/ld64.lld")
|
||||
let origBins = toolsetDir.appending(path: "bin/orig")
|
||||
let origLD64 = origBins.appending(path: "ld64.lld")
|
||||
try FileManager.default.createDirectory(at: origBins, withIntermediateDirectories: false)
|
||||
try FileManager.default.moveItem(at: ld64, to: origLD64)
|
||||
|
||||
// this terrible hack works around the fact that lld doesn't support the -r option,
|
||||
// which merges multiple object files into one (used by SPM's SWB backend to combine
|
||||
// per-file MachOs into a single one for the module, on Darwin).
|
||||
//
|
||||
// so instead, we write a trampoline that intercepts `ld64.lld -r` and instead runs
|
||||
// libtool to build a static archive.
|
||||
try """
|
||||
#!/bin/sh
|
||||
|
||||
set -eu
|
||||
|
||||
case "$0" in
|
||||
*/*) script_path="$0" ;;
|
||||
*) script_path="$(command -v "$0")" ;;
|
||||
esac
|
||||
case "$script_path" in
|
||||
/*) script_dir="${script_path%/*}"; [ -n "$script_dir" ] || script_dir="/" ;;
|
||||
*/*) script_dir="${script_path%/*}" ;;
|
||||
*) script_dir="." ;;
|
||||
esac
|
||||
bin_dir="$(CDPATH= cd -P "$script_dir" && pwd -P)"
|
||||
|
||||
find_argument_value() {
|
||||
argument_name="$1"
|
||||
shift
|
||||
|
||||
while [ "$#" -gt 0 ]; do
|
||||
if [ "$1" = "$argument_name" ]; then
|
||||
shift
|
||||
if [ "$#" -gt 0 ]; then
|
||||
argument_value="$1"
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
fi
|
||||
shift
|
||||
done
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
relocatable=
|
||||
for argument do
|
||||
if [ "$argument" = "-r" ]; then
|
||||
relocatable=1
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -n "$relocatable" ]; then
|
||||
missing_argument=
|
||||
|
||||
if find_argument_value -filelist "$@"; then
|
||||
filelist="$argument_value"
|
||||
else
|
||||
missing_argument=1
|
||||
fi
|
||||
if find_argument_value -dependency_info "$@"; then
|
||||
dependency_info="$argument_value"
|
||||
else
|
||||
missing_argument=1
|
||||
fi
|
||||
if find_argument_value -o "$@"; then
|
||||
output="$argument_value"
|
||||
else
|
||||
missing_argument=1
|
||||
fi
|
||||
|
||||
if [ -n "$missing_argument" ]; then
|
||||
echo "ld64.lld trampoline could not process arguments." >&2
|
||||
echo "Please file an issue at https://github.com/xtool-org/xtool/issues" >&2
|
||||
echo " Arguments: $@" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
exec "$bin_dir/llvm-lib" -static \
|
||||
-filelist "$filelist" \
|
||||
-dependency_info "$dependency_info" \
|
||||
-o "$output"
|
||||
fi
|
||||
|
||||
exec "$bin_dir/orig/ld64.lld" "$@"
|
||||
""".write(
|
||||
to: ld64,
|
||||
atomically: false,
|
||||
encoding: .utf8
|
||||
)
|
||||
// set -x
|
||||
try FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: ld64.path)
|
||||
// TODO: install cctools ld as well
|
||||
}
|
||||
|
||||
private func installMacros(in output: URL) async throws {
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
let url = URL(string: """
|
||||
https://github.com/xtool-org/OpenAppleMacros/releases/download/\
|
||||
v\(Self.oamVersion)/OpenAppleMacrosServer-\(arch.rawValue)
|
||||
""")!
|
||||
|
||||
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
|
||||
guard response.status == 200, let body else { throw Console.Error("Could not fetch toolset") }
|
||||
|
||||
let length: Int64? = switch body.length {
|
||||
case .known(let known): known
|
||||
case .unknown: nil
|
||||
}
|
||||
|
||||
let outputPath = output.appendingPathComponent("OpenAppleMacrosServer").path
|
||||
do {
|
||||
let handle = try FileDescriptor.open(
|
||||
FilePath(outputPath),
|
||||
.writeOnly,
|
||||
options: .create,
|
||||
permissions: [.ownerReadWriteExecute, .groupReadExecute, .otherReadExecute]
|
||||
)
|
||||
defer { try? handle.close() }
|
||||
|
||||
var written: Int64 = 0
|
||||
for try await chunk in body {
|
||||
try handle.writeAll(chunk)
|
||||
written += Int64(chunk.count)
|
||||
|
||||
if let length {
|
||||
let progress = Int(Double(written) / Double(length) * 100)
|
||||
print("\r[Downloading OpenAppleMacros] \(progress)%", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}
|
||||
}
|
||||
}
|
||||
print()
|
||||
}
|
||||
|
||||
// swiftlint:disable:next cyclomatic_complexity function_body_length
|
||||
// swiftlint:disable:next cyclomatic_complexity
|
||||
private func installDeveloper(in output: URL) async throws -> URL {
|
||||
let dev = output.appendingPathComponent("Developer")
|
||||
|
||||
let expectedAppDir = output.appendingPathComponent("Xcode.app")
|
||||
let appDir: URL
|
||||
let cleanupStageDir: URL?
|
||||
let wanted: Int?
|
||||
|
||||
switch (input, mode) {
|
||||
case (.xip(let inputPath), .buildSlim):
|
||||
let stage = output.appendingPathComponent("DeveloperStage")
|
||||
try FileManager.default.createDirectory(at: stage, withIntermediateDirectories: false)
|
||||
wanted = try await extractXIP(inputPath: inputPath, outDir: stage.path)
|
||||
switch input {
|
||||
case .xip(let inputPath):
|
||||
let devStage = output.appendingPathComponent("DeveloperStage")
|
||||
try FileManager.default.createDirectory(at: devStage, withIntermediateDirectories: false)
|
||||
// unxip doesn't like cooperative cancellation atm so shield it.
|
||||
// if the user does a ^C during unxip, we'll just wait until extraction
|
||||
// is over before bailing
|
||||
wanted = try await Task {
|
||||
try await extractXIP(inputPath: inputPath, outDir: devStage.path)
|
||||
}.value
|
||||
try Task.checkCancellation()
|
||||
let contents = try FileManager.default.contentsOfDirectory(
|
||||
at: stage,
|
||||
at: devStage,
|
||||
includingPropertiesForKeys: nil
|
||||
)
|
||||
let apps = contents.filter { $0.pathExtension == "app" }
|
||||
@@ -453,39 +283,12 @@ struct SDKBuilder {
|
||||
default:
|
||||
throw Console.Error("Unrecognized xip layout (multiple apps found)")
|
||||
}
|
||||
cleanupStageDir = stage
|
||||
case (.xip(let inputPath), .buildNormal):
|
||||
wanted = try await extractXIP(inputPath: inputPath, outDir: output.path)
|
||||
appDir = expectedAppDir
|
||||
cleanupStageDir = nil
|
||||
case (.xip, .update):
|
||||
throw Console.Error("Can't update with xip input")
|
||||
case (.app(let appPath), .buildSlim), (.app(let appPath), .update):
|
||||
cleanupStageDir = devStage
|
||||
case .app(let appPath):
|
||||
wanted = nil
|
||||
appDir = URL(fileURLWithPath: appPath)
|
||||
wanted = nil
|
||||
cleanupStageDir = nil
|
||||
case (.app(let appPath), .buildNormal):
|
||||
let source = URL(fileURLWithPath: appPath)
|
||||
let sourceContentsDir = source.appendingPathComponent("Contents")
|
||||
let expectedContentsDir = expectedAppDir.appendingPathComponent("Contents")
|
||||
try FileManager.default.createDirectory(at: expectedContentsDir, withIntermediateDirectories: true)
|
||||
print("[Copying Xcode.app] This might take a minute...")
|
||||
for child in ["Info.plist", "version.plist", "Developer"] {
|
||||
let expectedFile = expectedContentsDir.appendingPathComponent(child)
|
||||
let sourceFile = sourceContentsDir.appendingPathComponent(child)
|
||||
guard FileManager.default.fileExists(atPath: sourceFile.path) else {
|
||||
throw Console.Error("""
|
||||
The provided directory at '\(appPath)' does not appear to be a known version of Xcode: \
|
||||
could not read '\(sourceFile.path)'
|
||||
""")
|
||||
}
|
||||
try await FileManager.default.copyItem(at: sourceFile, to: expectedFile, preserveOwner: false)
|
||||
}
|
||||
appDir = expectedAppDir
|
||||
wanted = nil
|
||||
cleanupStageDir = nil
|
||||
}
|
||||
try Task.checkCancellation()
|
||||
|
||||
try FileManager.default.createDirectory(at: dev, withIntermediateDirectories: false)
|
||||
|
||||
@@ -508,7 +311,7 @@ struct SDKBuilder {
|
||||
}
|
||||
if count % 100 == 0 {
|
||||
if wanted == nil {
|
||||
print("\r[Installing SDKs] Installed \(count) files", terminator: "")
|
||||
print("\r[Installing SDKs] Copied \(count) files", terminator: "")
|
||||
fflush(stdoutSafe)
|
||||
}
|
||||
await Task.yield()
|
||||
@@ -521,11 +324,7 @@ struct SDKBuilder {
|
||||
if try child.resourceValues(forKeys: [.isDirectoryKey]).isDirectory == true {
|
||||
toDoDirs.append(path)
|
||||
try FileManager.default.createDirectory(at: dest, withIntermediateDirectories: false)
|
||||
} else if mode.usesHardLinks {
|
||||
// Installed SDKs retain Xcode.app developer dir, so avoid storing their developer files twice.
|
||||
try FileManager.default.linkItem(at: child, to: dest)
|
||||
} else {
|
||||
// Slim SDKs omit Xcode.app and contain independent copies.
|
||||
try FileManager.default.copyItem(at: child, to: dest)
|
||||
}
|
||||
}
|
||||
@@ -537,92 +336,52 @@ struct SDKBuilder {
|
||||
}
|
||||
print()
|
||||
|
||||
print("[Cleaning up]")
|
||||
if let cleanupStageDir {
|
||||
print("[Cleaning up]")
|
||||
try FileManager.default.removeItem(at: cleanupStageDir)
|
||||
try? FileManager.default.removeItem(at: cleanupStageDir)
|
||||
}
|
||||
|
||||
print("[Finalizing SDKs]")
|
||||
|
||||
/*
|
||||
XCTest and Testing.framework are located in *.platform/Developer/{Library/Frameworks,usr/lib} rather than inside
|
||||
the SDK. These search paths are explicitly included when building tests, which presumably ensures that normal
|
||||
applications don't accidentally link against them in production.
|
||||
|
||||
SwiftPM makes no such affordances outside of macOS, so we add the usr/lib path as include/library search paths
|
||||
in the SDK config, and symlink the frameworks into the SDKs (since there's no frameworkSearchPaths option).
|
||||
While this drops a safeguard it's better than not having the testing libs at all.
|
||||
*/
|
||||
|
||||
for platform in ["iPhoneOS", "MacOSX", "iPhoneSimulator"] {
|
||||
let lib = "../../../../../Library"
|
||||
let platformDir = dev.appending(path: "Platforms/\(platform).platform")
|
||||
|
||||
try patchPlatformManifest(path: platformDir.appending(path: "Info.plist"))
|
||||
|
||||
/*
|
||||
XCTest and Testing.framework are located in *.platform/Developer/{Library/Frameworks,usr/lib} rather than inside
|
||||
the SDK. These search paths are explicitly included when building tests, which presumably ensures that normal
|
||||
applications don't accidentally link against them in production.
|
||||
|
||||
SwiftPM makes no such affordances outside of macOS, so we add the usr/lib path as include/library search paths
|
||||
in the SDK config, and symlink the frameworks into the SDKs (since there's no frameworkSearchPaths option).
|
||||
While this drops a safeguard it's better than not having the testing libs at all.
|
||||
*/
|
||||
|
||||
let fwk = platformDir.appending(path: "Developer/SDKs/\(platform).sdk/System/Library/Frameworks").path
|
||||
let dest = platformDir.appending(path: "Developer/SDKs/\(platform).sdk/System/Library/Frameworks").path
|
||||
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: "\(fwk)/Testing.framework",
|
||||
atPath: "\(dest)/Testing.framework",
|
||||
withDestinationPath: "\(lib)/Frameworks/Testing.framework"
|
||||
)
|
||||
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: "\(fwk)/XCTest.framework",
|
||||
atPath: "\(dest)/XCTest.framework",
|
||||
withDestinationPath: "\(lib)/Frameworks/XCTest.framework"
|
||||
)
|
||||
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: "\(fwk)/XCUIAutomation.framework",
|
||||
atPath: "\(dest)/XCUIAutomation.framework",
|
||||
withDestinationPath: "\(lib)/Frameworks/XCUIAutomation.framework"
|
||||
)
|
||||
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: "\(fwk)/XCTestCore.framework",
|
||||
atPath: "\(dest)/XCTestCore.framework",
|
||||
withDestinationPath: "\(lib)/PrivateFrameworks/XCTestCore.framework"
|
||||
)
|
||||
|
||||
/*
|
||||
Apply patches to load OpenAppleMacros as the swift-plugin-server
|
||||
*/
|
||||
|
||||
let bin = platformDir.appendingPathComponent("Developer/usr/bin")
|
||||
let pluginServer = bin.appendingPathComponent("swift-plugin-server")
|
||||
try? FileManager.default.createDirectory(at: bin, withIntermediateDirectories: true)
|
||||
try? FileManager.default.removeItem(at: pluginServer)
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: pluginServer.path,
|
||||
withDestinationPath: "../../../../../../OpenAppleMacrosServer"
|
||||
)
|
||||
|
||||
let hostDir = platformDir.appendingPathComponent("Developer/usr/lib/swift/host")
|
||||
let pluginsDir = hostDir.appendingPathComponent("plugins")
|
||||
|
||||
if platform == "iPhoneSimulator" {
|
||||
// The iPhoneSimulator platform doesn't contain plugins; Xcode seems to be hardcoded
|
||||
// to look at the ones from iPhoneOS.platform. We can symlink the iPhoneOS ones too.
|
||||
try? FileManager.default.createDirectory(at: hostDir, withIntermediateDirectories: true)
|
||||
try? FileManager.default.removeItem(at: pluginsDir)
|
||||
try FileManager.default.createSymbolicLink(
|
||||
atPath: pluginsDir.path,
|
||||
withDestinationPath: "../../../../../../iPhoneOS.platform/Developer/usr/lib/swift/host/plugins"
|
||||
)
|
||||
} else {
|
||||
try? FileManager.default.removeItem(at: pluginsDir)
|
||||
try FileManager.default.createDirectory(at: pluginsDir, withIntermediateDirectories: true)
|
||||
// create a lib*.so file for each macro 'library' that we support.
|
||||
// the files are stubs (empty) because we just need them to convince swiftc that
|
||||
// yes we can handle said modules. the actual logic lives in the OpenAppleMacros
|
||||
// server.
|
||||
for library in Self.oamLibraries {
|
||||
let target = pluginsDir.appendingPathComponent("lib\(library).so")
|
||||
try Data().write(to: target)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// we copy over the host's clang resorurce dir during install, because intrinsics can differ
|
||||
// by LLVM version
|
||||
try FileManager.default.removeItem(
|
||||
at: dev.appending(path: "Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/clang/include")
|
||||
)
|
||||
@@ -630,15 +389,6 @@ struct SDKBuilder {
|
||||
return dev
|
||||
}
|
||||
|
||||
private func extractXIP(inputPath: String, outDir: String) async throws -> Int {
|
||||
// unxip doesn't like cooperative cancellation atm so shield it.
|
||||
// if the user does a ^C during unxip, we'll just wait until extraction
|
||||
// is over before bailing
|
||||
try await Task {
|
||||
try await _extractXIP(inputPath: inputPath, outDir: outDir)
|
||||
}.value
|
||||
}
|
||||
|
||||
private func patchPlatformManifest(path: URL) throws {
|
||||
let data = try Data(contentsOf: path)
|
||||
guard var plist = try PropertyListSerialization.propertyList(from: data, options: [], format: nil) as? [String: Any] else {
|
||||
@@ -648,20 +398,15 @@ struct SDKBuilder {
|
||||
var defaultProperties = (plist["DefaultProperties"] as? [String: Any]) ?? [:]
|
||||
defaultProperties["SWIFT_RESOURCE_DIR"] = "$(PLATFORM_DIR)/../../Toolchains/XcodeDefault.xctoolchain/usr/lib/swift"
|
||||
defaultProperties["CLANG_RESOURCE_DIR"] = "$(SWIFT_RESOURCE_DIR)/clang"
|
||||
defaultProperties["ALTERNATE_LINKER"] = "lld"
|
||||
// stub out codesign as /bin/true (SwiftBuild often emits CodeSign tasks, e.g. when
|
||||
// building for sim). we sign post-build.
|
||||
defaultProperties["CODESIGN"] = "true"
|
||||
plist["DefaultProperties"] = defaultProperties
|
||||
|
||||
let newData = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
|
||||
// a non-atomic write would modify the shared inode that's hard-linked from Xcode.app
|
||||
try newData.write(to: path, options: .atomic)
|
||||
try newData.write(to: path)
|
||||
}
|
||||
|
||||
// returns the number of files we actually want to keep,
|
||||
// useful for computing progress % during fs traversal
|
||||
private func _extractXIP(inputPath: String, outDir: String) async throws -> Int {
|
||||
private func extractXIP(inputPath: String, outDir: String) async throws -> Int {
|
||||
let fd = try FileDescriptor.open(inputPath, .readOnly)
|
||||
defer { try? fd.close() }
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ struct SDKCommand: AsyncParsableCommand {
|
||||
abstract: "Manage the Darwin Swift SDK",
|
||||
subcommands: [
|
||||
DevSDKInstallCommand.self,
|
||||
DevSDKUpdateCommand.self,
|
||||
DevSDKRemoveCommand.self,
|
||||
DevSDKBuildCommand.self,
|
||||
DevSDKStatusCommand.self,
|
||||
@@ -50,7 +49,7 @@ struct DevSDKBuildCommand: AsyncParsableCommand {
|
||||
let builderArch = try arch.sdkBuilderArch
|
||||
let input = try SDKBuilder.Input(path: path)
|
||||
let output = URL(fileURLWithPath: outputDir, isDirectory: true).appending(path: "darwin.xtoolsdk")
|
||||
let builder = SDKBuilder(input: input, output: output, arch: builderArch, mode: .buildSlim)
|
||||
let builder = SDKBuilder(input: input, output: output, arch: builderArch)
|
||||
try await builder.buildSDK()
|
||||
print("Built SDK at \(output.path). You can install it with `xtool sdk install`.")
|
||||
}
|
||||
@@ -91,24 +90,8 @@ struct DevSDKInstallCommand: AsyncParsableCommand {
|
||||
)
|
||||
var path: String
|
||||
|
||||
@Flag(
|
||||
help: "Install a slim SDK (uses less disk space). Slim SDKs cannot be updated in place."
|
||||
)
|
||||
var slim = false
|
||||
|
||||
func run() async throws {
|
||||
try await InstallSDKOperation(path: path, slim: slim).run()
|
||||
}
|
||||
}
|
||||
|
||||
struct DevSDKUpdateCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "update",
|
||||
abstract: "Update the installed Darwin Swift SDK"
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
try await UpdateSDKOperation().run()
|
||||
try await InstallSDKOperation(path: path).run()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,7 +102,7 @@ struct DevSDKRemoveCommand: AsyncParsableCommand {
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
guard let sdk = try DarwinSDK.current() else {
|
||||
guard let sdk = try await DarwinSDK.current() else {
|
||||
throw Console.Error("Cannot remove SDK: no Darwin SDK installed")
|
||||
}
|
||||
try sdk.remove()
|
||||
@@ -134,154 +117,80 @@ struct DevSDKStatusCommand: AsyncParsableCommand {
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
if let sdk = try DarwinSDK.current() {
|
||||
print("Darwin SDK is installed")
|
||||
print(" Path: \(sdk.bundle.path)")
|
||||
print(" Flavor: \(sdk.flavor)")
|
||||
print(" Version: \(sdk.version)")
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Installed at \(sdk.bundle.path)")
|
||||
} else {
|
||||
print("Not installed")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension DarwinSDK {
|
||||
func isUpToDate() -> Bool {
|
||||
version == SDKBuilder.currentSDKVersion
|
||||
}
|
||||
}
|
||||
|
||||
struct EnsureSDKOperation {
|
||||
let quiet: Bool
|
||||
|
||||
func run() async throws {
|
||||
#if os(macOS)
|
||||
if !quiet {
|
||||
print("Skipping Darwin SDK setup since we're on macOS.")
|
||||
private enum SwiftVersion {}
|
||||
extension SwiftVersion {
|
||||
static func current() async throws -> Version {
|
||||
let outputString: String?
|
||||
do {
|
||||
outputString = try await Subprocess.run(
|
||||
.name("swift"),
|
||||
arguments: ["--version"],
|
||||
output: .string(limit: .max)
|
||||
)
|
||||
.checkSuccess()
|
||||
.standardOutput
|
||||
} catch {
|
||||
throw Console.Error("Failed to obtain Swift version")
|
||||
}
|
||||
#else
|
||||
let sdk = try DarwinSDK.current()
|
||||
switch sdk.map({ ($0.isUpToDate(), $0.flavor) }) {
|
||||
case (true, _)?: // swiftlint:disable:this optional_enum_case_matching
|
||||
if !quiet {
|
||||
print("Darwin SDK is up to date.")
|
||||
}
|
||||
case (false, .slim)?: // swiftlint:disable:this optional_enum_case_matching
|
||||
throw Console.Error("""
|
||||
Darwin SDK is out of date, and was installed in 'slim' mode.
|
||||
|
||||
Slim SDKs take less disk space, but can't be auto-updated.
|
||||
Please install a new SDK with
|
||||
xtool sdk install [--slim]
|
||||
""")
|
||||
case (false, .normal)?: // swiftlint:disable:this optional_enum_case_matching
|
||||
print("Darwin SDK is out of date. Rebuilding...")
|
||||
try await UpdateSDKOperation().run()
|
||||
case (false, .legacy)?: // swiftlint:disable:this optional_enum_case_matching
|
||||
print("""
|
||||
Darwin SDK is incompatible: built with an older version of xtool.
|
||||
|
||||
Requesting re-install. This is a one-time rebuild; after this,
|
||||
xtool will be able to resolve incompatibilities automatically.
|
||||
|
||||
""")
|
||||
try await generateSDK()
|
||||
case nil:
|
||||
print("Now generating the Darwin SDK.\n")
|
||||
try await generateSDK()
|
||||
var output = outputString?[...] ?? ""
|
||||
if output.hasPrefix("Apple ") {
|
||||
output = output.dropFirst("Apple ".count)
|
||||
}
|
||||
|
||||
func generateSDK() async throws {
|
||||
let path = try await Console.prompt("""
|
||||
Please download Xcode from http://developer.apple.com/download/all/?q=Xcode
|
||||
and enter the path to the downloaded Xcode.xip.
|
||||
|
||||
Path to Xcode.xip: \("" /* pacify swiftlint trailing_whitespace */)
|
||||
""")
|
||||
|
||||
let expanded = (path as NSString).expandingTildeInPath
|
||||
|
||||
try await InstallSDKOperation(path: expanded).run()
|
||||
guard output.hasPrefix("Swift version ") else {
|
||||
throw Console.Error("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
#endif
|
||||
output = output.dropFirst("Swift version ".count)
|
||||
guard let space = output.firstIndex(of: " ") else {
|
||||
throw Console.Error("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
output = output[..<space]
|
||||
guard let version = Version(tolerant: output) else {
|
||||
throw Console.Error("Could not parse Swift version: '\(output)'")
|
||||
}
|
||||
return version
|
||||
}
|
||||
}
|
||||
|
||||
struct InstallSDKOperation {
|
||||
let path: String
|
||||
let slim: Bool
|
||||
|
||||
init(path: String, slim: Bool = false) {
|
||||
self.path = path
|
||||
self.slim = slim
|
||||
}
|
||||
|
||||
func run() async throws {
|
||||
#if os(macOS)
|
||||
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
|
||||
#else
|
||||
|
||||
let temporaryBundle = try DarwinSDK.prepareTemporaryBundle()
|
||||
let tempDir = try TemporaryDirectory(name: "DarwinSDKBuild")
|
||||
let sdkPath = tempDir.url.appending(path: "darwin.artifactbundle")
|
||||
|
||||
if path.hasSuffix(".xtoolsdk") {
|
||||
print("Installing prebuilt SDK...")
|
||||
try await FileManager.default.copyItem(at: URL(filePath: path), to: temporaryBundle.url, preserveOwner: false)
|
||||
try FileManager.default.copyItem(at: URL(filePath: path), to: sdkPath)
|
||||
} else {
|
||||
// validate input before removing existing SDK
|
||||
let input = try SDKBuilder.Input(path: path)
|
||||
let arch = try ArchSelection.auto.sdkBuilderArch
|
||||
|
||||
let mode: SDKBuilder.Mode = slim ? .buildSlim : .buildNormal
|
||||
let builder = SDKBuilder(input: input, output: temporaryBundle.url, arch: arch, mode: mode)
|
||||
let builder = SDKBuilder(input: input, output: sdkPath, arch: arch)
|
||||
try await builder.buildSDK()
|
||||
}
|
||||
|
||||
if let sdk = try DarwinSDK.current() {
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Removing existing SDK...")
|
||||
try sdk.remove()
|
||||
}
|
||||
|
||||
try await temporaryBundle.install()
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
struct UpdateSDKOperation {
|
||||
func run() async throws {
|
||||
#if os(macOS)
|
||||
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
|
||||
#else
|
||||
guard let existing = try DarwinSDK.current() else {
|
||||
throw Console.Error("Could not locate existing SDK; cannot perform update.")
|
||||
}
|
||||
let xcode = existing.bundle.appendingPathComponent("Xcode.app")
|
||||
guard xcode.dirExists else {
|
||||
// This includes prebuilt .xtoolsdk installs and installs created with --slim.
|
||||
throw Console.Error("""
|
||||
The installed SDK was built in 'slim' mode and cannot be updated in place. \
|
||||
Please install a new copy with `xtool sdk install`.
|
||||
""")
|
||||
}
|
||||
|
||||
let input = try SDKBuilder.Input(path: xcode.path)
|
||||
let arch = try ArchSelection.auto.sdkBuilderArch
|
||||
|
||||
let temporaryBundle = try DarwinSDK.prepareTemporaryBundle()
|
||||
let builder = SDKBuilder(input: input, output: temporaryBundle.url, arch: arch, mode: .update)
|
||||
try await builder.buildSDK()
|
||||
|
||||
guard DarwinSDK(bundle: temporaryBundle.url) != nil else {
|
||||
throw Console.Error("Invalid Darwin SDK at '\(temporaryBundle.url.path)'")
|
||||
}
|
||||
|
||||
try FileManager.default.moveItem(
|
||||
at: xcode,
|
||||
to: temporaryBundle.url.appendingPathComponent("Xcode.app")
|
||||
)
|
||||
try existing.remove()
|
||||
try await temporaryBundle.install()
|
||||
|
||||
print("Updated SDK")
|
||||
try await DarwinSDK.install(from: sdkPath.path)
|
||||
|
||||
// don't destroy tempDir before this point
|
||||
withExtendedLifetime(tempDir) {}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,36 @@ struct SetupOperation {
|
||||
|
||||
func run() async throws {
|
||||
try await AuthOperation(logoutFromExisting: false, quiet: quiet).run()
|
||||
try await EnsureSDKOperation(quiet: quiet).run()
|
||||
|
||||
#if os(macOS)
|
||||
if !quiet {
|
||||
print("Skipping Darwin SDK setup since we're on macOS.")
|
||||
}
|
||||
#else
|
||||
switch try await DarwinSDK.current()?.isUpToDate() {
|
||||
case true?:
|
||||
if !quiet {
|
||||
print("Darwin SDK is up to date.")
|
||||
}
|
||||
case false?:
|
||||
if !quiet {
|
||||
print("Darwin SDK is outdated.")
|
||||
}
|
||||
fallthrough
|
||||
case nil:
|
||||
let path = try await Console.prompt("""
|
||||
Now generating the Darwin SDK.
|
||||
|
||||
Please download Xcode from http://developer.apple.com/download/all/?q=Xcode
|
||||
and enter the path to the downloaded Xcode.xip.
|
||||
|
||||
Path to Xcode.xip: \("" /* pacify swiftlint trailing_whitespace */)
|
||||
""")
|
||||
|
||||
let expanded = (path as NSString).expandingTildeInPath
|
||||
|
||||
try await InstallSDKOperation(path: expanded).run()
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
#if os(macOS)
|
||||
import Subprocess
|
||||
import PackLib
|
||||
import Foundation
|
||||
import XUtils
|
||||
import Dependencies
|
||||
import XKit
|
||||
|
||||
struct SimInstallOperation {
|
||||
var operation: PackOperation
|
||||
var plan: Plan
|
||||
var path: URL
|
||||
|
||||
var watch = false
|
||||
var xLoadLibrary: String?
|
||||
|
||||
// TODO: allow customizing this
|
||||
var simulator = "booted"
|
||||
|
||||
func run() async throws {
|
||||
try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: ["simctl", "install", simulator, path.path],
|
||||
output: .discarded
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
print("Installed to simulator")
|
||||
|
||||
let tmp = URL(filePath: FileManager.default.currentDirectoryPath)
|
||||
.appending(path: "xtool/.xload")
|
||||
try? FileManager.default.removeItem(at: tmp)
|
||||
defer { try? FileManager.default.removeItem(at: tmp) }
|
||||
|
||||
let watchTask: Task<Void, Error>?
|
||||
let envVars: [Environment.Key: String?]
|
||||
if watch {
|
||||
try FileManager.default.createDirectory(at: tmp, withIntermediateDirectories: true)
|
||||
guard let temporaryDirectoryPath = FilePath(tmp) else {
|
||||
throw Console.Error("Bad temporaryDirectory path")
|
||||
}
|
||||
|
||||
let hotReloader = try await HotReloader(
|
||||
configuration: .swiftPM(settings: operation.buildSettings()),
|
||||
scratchDirectory: temporaryDirectoryPath,
|
||||
xLoadLibrary: xLoadLibrary
|
||||
)
|
||||
|
||||
watchTask = Task {
|
||||
do {
|
||||
try await hotReloader.watch()
|
||||
} catch {
|
||||
print("Error: watch task failed: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
envVars = hotReloader.subprocessEnvironment()
|
||||
} else {
|
||||
watchTask = nil
|
||||
envVars = [:]
|
||||
}
|
||||
|
||||
try await Subprocess.run(
|
||||
.path("/usr/bin/xcrun"),
|
||||
arguments: [
|
||||
"simctl", "launch",
|
||||
"--console-pty",
|
||||
simulator, plan.app.bundleID,
|
||||
],
|
||||
environment: .inherit.updating(envVars),
|
||||
platformOptions: .withGracefulShutDown,
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
watchTask?.cancel()
|
||||
try await watchTask?.value
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -0,0 +1,397 @@
|
||||
import Foundation
|
||||
import XUtils
|
||||
import PackLib
|
||||
import BuildServerProtocol
|
||||
import LanguageServerProtocol
|
||||
import LanguageServerProtocolTransport
|
||||
import Subprocess
|
||||
import Dependencies
|
||||
|
||||
actor SwiftWorkspace {
|
||||
private let connection: JSONRPCConnection
|
||||
private let buildDirectory: FilePath
|
||||
private let outDirectory: FilePath
|
||||
private var counter = 0
|
||||
|
||||
struct FileInfo {
|
||||
let file: FilePath
|
||||
let target: BuildTarget
|
||||
let sources: SourcesItem
|
||||
let source: SourceItem
|
||||
|
||||
init?(target: BuildTarget, sources: SourcesItem, source: SourceItem) {
|
||||
guard let path = FilePath(source.uri.arbitrarySchemeURL) else { return nil }
|
||||
self.file = path
|
||||
self.target = target
|
||||
self.sources = sources
|
||||
self.source = source
|
||||
}
|
||||
}
|
||||
|
||||
private var filesToWatch: [FilePath: [FileInfo]] = [:]
|
||||
private var sources: [(BuildTarget, SourcesItem)] {
|
||||
didSet { updateFilesToWatch() }
|
||||
}
|
||||
private var cachedCommands: [FilePath: FrontendCommand] = [:]
|
||||
|
||||
struct FrontendCommand {
|
||||
let commandLine: CommandInvocation
|
||||
let output: FilePath
|
||||
let module: String
|
||||
}
|
||||
|
||||
init(
|
||||
configuration: BuildServerConfiguration,
|
||||
buildDirectory: FilePath,
|
||||
outDirectory: FilePath,
|
||||
) async throws {
|
||||
self.buildDirectory = buildDirectory
|
||||
self.outDirectory = outDirectory
|
||||
|
||||
let handler = StreamingMessageHandler()
|
||||
|
||||
let (connection, _) = try JSONRPCConnection.start(
|
||||
executable: configuration.executable,
|
||||
arguments: configuration.arguments,
|
||||
name: "xtool",
|
||||
protocol: .bspProtocol,
|
||||
stderrLoggingCategory: "xtool-error",
|
||||
client: handler,
|
||||
terminationHandler: { print("Terminated: \($0)") }
|
||||
)
|
||||
self.connection = connection
|
||||
|
||||
_ = try await connection.send(InitializeBuildRequest(
|
||||
displayName: "xtool",
|
||||
version: "1.0.0",
|
||||
bspVersion: "2.2.0",
|
||||
rootUri: .init(URL(filePath: FileManager.default.currentDirectoryPath)),
|
||||
capabilities: BuildClientCapabilities(
|
||||
languageIds: [.swift, .c, .cpp, .objective_c, .objective_cpp],
|
||||
)
|
||||
))
|
||||
|
||||
connection.send(OnBuildInitializedNotification())
|
||||
|
||||
// some BSP servers (eg SourceKit-Bazel-BSP) require an initial build targets request
|
||||
// before they send OnBuildTargetDidChange
|
||||
_ = try await connection.send(WorkspaceBuildTargetsRequest())
|
||||
|
||||
for await case _ as OnBuildTargetDidChangeNotification in handler.notifications { break }
|
||||
|
||||
let result = try await connection.send(WorkspaceBuildTargetsRequest())
|
||||
|
||||
let targets = Dictionary(uniqueKeysWithValues: result.targets.map { ($0.id, $0) })
|
||||
|
||||
let targetInfos = try await connection.send(BuildTargetSourcesRequest(
|
||||
targets: result.targets.map(\.id)
|
||||
))
|
||||
sources = targetInfos.items.compactMap {
|
||||
guard let target = targets[$0.target] else { return nil }
|
||||
return (target, $0)
|
||||
}
|
||||
|
||||
updateFilesToWatch()
|
||||
}
|
||||
|
||||
deinit {
|
||||
connection.close()
|
||||
}
|
||||
|
||||
func updateFilesToWatch() {
|
||||
filesToWatch = Dictionary(
|
||||
grouping: sources.flatMap { target, sources in
|
||||
sources.sources.compactMap { source in
|
||||
// guard !target.id.uri.stringValue.contains("&targetGUID=PACKAGE-TARGET:") else { return nil }
|
||||
FileInfo(target: target, sources: sources, source: source)
|
||||
}
|
||||
},
|
||||
by: \.file
|
||||
)
|
||||
}
|
||||
|
||||
func fileDidChange(_ path: FilePath) async throws {
|
||||
guard filesToWatch[path] != nil else { return }
|
||||
print("Reloading \(path)")
|
||||
_ = try await rebuild(path: path)
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
func rebuild(path: FilePath) async throws -> FilePath {
|
||||
let command = try await frontendCommand(for: path)
|
||||
|
||||
try await Subprocess.run(
|
||||
.path(FilePath(String(command.commandLine.command))),
|
||||
arguments: .init(command.commandLine.arguments.map { String($0) }),
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
let sdk = try command.commandLine.value(for: "-sdk")
|
||||
.orThrow(Console.Error("Could not find -sdk"))
|
||||
|
||||
let target = try command.commandLine.value(for: "-target")
|
||||
.orThrow(Console.Error("Could not find -target"))
|
||||
|
||||
counter += 1
|
||||
|
||||
let outputFile = outDirectory
|
||||
.appending("lib\(path.lastComponent!.stem).\(counter).dylib")
|
||||
|
||||
// link
|
||||
try await Subprocess.run(
|
||||
.path(try await BuildSettings.swiftcURL()),
|
||||
arguments: [
|
||||
command.output.string,
|
||||
"-emit-library",
|
||||
"-sdk", sdk, "-target", target,
|
||||
"-Xlinker", "-undefined", "-Xlinker", "dynamic_lookup",
|
||||
"-o", outputFile.string
|
||||
],
|
||||
output: .standardOutput,
|
||||
error: .standardError,
|
||||
)
|
||||
.checkSuccess()
|
||||
|
||||
return outputFile
|
||||
}
|
||||
|
||||
func frontendCommand(for path: FilePath) async throws -> FrontendCommand {
|
||||
if let cached = cachedCommands[path] {
|
||||
return cached
|
||||
}
|
||||
|
||||
let targets = filesToWatch[path] ?? []
|
||||
|
||||
let target: FileInfo
|
||||
switch targets.count {
|
||||
case 0:
|
||||
throw Console.Error("No targets for file")
|
||||
case 1:
|
||||
target = targets[0]
|
||||
default:
|
||||
print("warning: multiple targets contain this file: \(targets.map(\.target.id.uri))")
|
||||
target = targets[0]
|
||||
}
|
||||
|
||||
guard let fileURL = URL(filePath: path)?.absoluteURL, let lastComponent = path.lastComponent else {
|
||||
throw Console.Error("Bad file path \(path.string)")
|
||||
}
|
||||
|
||||
let options = try await connection.send(TextDocumentSourceKitOptionsRequest(
|
||||
textDocument: .init(target.source.uri),
|
||||
target: target.target.id,
|
||||
language: .swift,
|
||||
))
|
||||
.orThrow(Console.Error("No options"))
|
||||
|
||||
guard let moduleNameIndex = options.compilerArguments.firstIndex(of: "-module-name"),
|
||||
moduleNameIndex < options.compilerArguments.count - 2 else {
|
||||
throw Console.Error("Could not determine module name for file at \(path)")
|
||||
}
|
||||
let moduleName = options.compilerArguments[moduleNameIndex + 1]
|
||||
let moduleBuildDirectory = buildDirectory.appending(moduleName)
|
||||
let moduleBuildDirectoryURL = try URL(filePath: moduleBuildDirectory).orThrow(Console.Error("Bad module name"))
|
||||
try? FileManager.default.createDirectory(at: moduleBuildDirectoryURL, withIntermediateDirectories: true)
|
||||
|
||||
let swiftcOutput = try await Subprocess.run(
|
||||
.path(try await BuildSettings.swiftcURL()),
|
||||
arguments: .init(
|
||||
["-c", "-driver-print-jobs"]
|
||||
+ options.compilerArguments
|
||||
+ ["-working-directory", moduleBuildDirectory.string]
|
||||
),
|
||||
output: .string(limit: .max),
|
||||
error: .standardError
|
||||
).checkSuccess()
|
||||
|
||||
let frontendCommands = (swiftcOutput.standardOutput ?? "").split(separator: "\n")
|
||||
guard let invocation = frontendCommands.lazy.compactMap({ line -> CommandInvocation? in
|
||||
guard let invocation = CommandInvocation(line) else { return nil }
|
||||
guard invocation.value(for: "-primary-file") == fileURL.path else { return nil }
|
||||
return invocation
|
||||
}).first else { throw Console.Error("Could not find frontend command") }
|
||||
|
||||
let command = FrontendCommand(
|
||||
commandLine: invocation,
|
||||
output: moduleBuildDirectory.appending("\(lastComponent.stem).o"),
|
||||
module: moduleName,
|
||||
)
|
||||
cachedCommands[path] = command
|
||||
return command
|
||||
}
|
||||
|
||||
private final class StreamingMessageHandler: MessageHandler {
|
||||
private let (_notifications, onNotification) = AsyncStream<NotificationType>.makeStream()
|
||||
|
||||
var notifications: AsyncStream<NotificationType> { _notifications }
|
||||
|
||||
deinit { onNotification.finish() }
|
||||
|
||||
func handle(_ notification: some NotificationType) {
|
||||
onNotification.yield(notification)
|
||||
}
|
||||
|
||||
func handle<Request: RequestType>(
|
||||
_ request: Request,
|
||||
id: LanguageServerProtocol.RequestID,
|
||||
reply: @escaping @Sendable (LanguageServerProtocol.LSPResult<Request.Response>) -> Void
|
||||
) {
|
||||
fatalError("Can't handle request \(Request.method)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// https://github.com/swiftlang/sourcekit-lsp/blob/3278ca0e3/Sources/BuildServerIntegration/ExternalBuildServerAdapter.swift#L66
|
||||
struct BuildServerConfiguration {
|
||||
var executable: URL
|
||||
var arguments: [String]
|
||||
}
|
||||
|
||||
// https://build-server-protocol.github.io/docs/overview/server-discovery#the-bsp-connection-details
|
||||
struct BuildServerDefinition: Codable {
|
||||
var name: String
|
||||
var version: String
|
||||
var bspVersion: String
|
||||
var languages: [String]
|
||||
var argv: [String]
|
||||
}
|
||||
|
||||
extension BuildServerConfiguration {
|
||||
static func swiftPM(settings: BuildSettings) async throws -> Self {
|
||||
guard let swiftURL = URL(filePath: try await BuildSettings.swiftURL()) else {
|
||||
throw Console.Error("Swift URL invalid")
|
||||
}
|
||||
return BuildServerConfiguration(
|
||||
executable: swiftURL,
|
||||
arguments: settings.buildServerArguments
|
||||
)
|
||||
}
|
||||
|
||||
static func swiftPM(in url: URL) async throws -> Self? {
|
||||
if url.appending(path: "Package.swift").exists {
|
||||
return try await .swiftPM(settings: .init(configuration: .debug, triple: "arm64-apple-ios-simulator"))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
static func external(definition: BuildServerDefinition) async throws -> Self {
|
||||
guard !definition.argv.isEmpty else {
|
||||
throw Console.Error("BSP argv must be non-empty")
|
||||
}
|
||||
var arguments = definition.argv
|
||||
let executable = URL(filePath: arguments.removeFirst())
|
||||
return BuildServerConfiguration(
|
||||
executable: executable,
|
||||
arguments: arguments
|
||||
)
|
||||
}
|
||||
|
||||
static func external(definition url: URL) async throws -> Self {
|
||||
let data = try Data(contentsOf: url)
|
||||
let definition = try JSONDecoder().decode(BuildServerDefinition.self, from: data)
|
||||
return try await .external(definition: definition)
|
||||
}
|
||||
|
||||
static func external(in directory: URL) async throws -> Self? {
|
||||
let bsp = directory.appending(path: ".bsp")
|
||||
let bspContents = (try? FileManager.default.contentsOfDirectory(at: bsp, includingPropertiesForKeys: nil)) ?? []
|
||||
let bspFiles = bspContents.filter { $0.pathExtension == "json" }
|
||||
switch bspFiles.count {
|
||||
case 0:
|
||||
return nil
|
||||
case 1:
|
||||
return try await .external(definition: bspFiles[0])
|
||||
default:
|
||||
throw Console.Error("""
|
||||
Found multiple Build Server definitions in '\(bsp.absoluteURL.path)'.
|
||||
|
||||
Please explicitly specify the one you want to use.
|
||||
""")
|
||||
}
|
||||
}
|
||||
|
||||
static func discover(in directory: URL) async throws -> Self? {
|
||||
if let external = try await external(in: directory) {
|
||||
return external
|
||||
}
|
||||
|
||||
if let swiftPM = try await swiftPM(in: directory) {
|
||||
return swiftPM
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
struct CommandInvocation {
|
||||
var command: String
|
||||
var arguments: [String]
|
||||
|
||||
init?(_ string: some StringProtocol) {
|
||||
guard let all = try? CommandParser.parse(string), !all.isEmpty else { return nil }
|
||||
command = all[0]
|
||||
arguments = Array(all.dropFirst())
|
||||
}
|
||||
|
||||
func value(for option: some StringProtocol) -> String? {
|
||||
guard let optionIndex = arguments.firstIndex(where: { $0 == option }) else { return nil }
|
||||
guard optionIndex < arguments.count - 2 else { return nil }
|
||||
return arguments[optionIndex + 1]
|
||||
}
|
||||
}
|
||||
|
||||
enum CommandParser {
|
||||
enum Errors: Error, Hashable {
|
||||
case unclosedQuote
|
||||
case unpairedEscape
|
||||
}
|
||||
|
||||
static func parse(_ string: some StringProtocol) throws -> [String] {
|
||||
try sequence(
|
||||
state: (
|
||||
current: string[...],
|
||||
isInsideQuote: false,
|
||||
)
|
||||
) { state -> Token? in
|
||||
while !state.current.isEmpty {
|
||||
switch state.current.removeFirst() {
|
||||
case "'":
|
||||
state.isInsideQuote.toggle()
|
||||
case "\\" where !state.isInsideQuote:
|
||||
guard !state.current.isEmpty else { return .error(.unpairedEscape) }
|
||||
let actual = state.current.removeFirst()
|
||||
return .value(actual)
|
||||
case " " where !state.isInsideQuote:
|
||||
return .sentinelSpace
|
||||
case let value:
|
||||
return .value(value)
|
||||
}
|
||||
}
|
||||
guard !state.isInsideQuote else {
|
||||
state.isInsideQuote = false
|
||||
return .error(.unclosedQuote)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
.lazy
|
||||
.split(separator: .sentinelSpace)
|
||||
.map {
|
||||
let characters = try $0.compactMap { token -> Character? in
|
||||
switch token {
|
||||
case .sentinelSpace: nil
|
||||
case .error(let error): throw error
|
||||
case .value(let value): value
|
||||
}
|
||||
}
|
||||
return String(characters)
|
||||
}
|
||||
}
|
||||
|
||||
private enum Token: Hashable {
|
||||
case sentinelSpace
|
||||
case value(Character)
|
||||
case error(Errors)
|
||||
}
|
||||
}
|
||||
@@ -30,6 +30,7 @@ private struct XToolCommand: AsyncParsableCommand {
|
||||
NewCommand.self,
|
||||
DevCommand.self,
|
||||
DSCommand.self,
|
||||
HotReloadCommand.self,
|
||||
]
|
||||
),
|
||||
CommandGroup(
|
||||
|
||||
@@ -1,7 +1,4 @@
|
||||
import Foundation
|
||||
#if canImport(Subprocess)
|
||||
import Subprocess
|
||||
#endif
|
||||
|
||||
extension Data {
|
||||
// AsyncBytes is Darwin-only :/
|
||||
@@ -23,37 +20,6 @@ extension Data {
|
||||
}
|
||||
}
|
||||
|
||||
extension FileManager {
|
||||
/// Like `copyItem(at:to:)` but allows opting out of preserving the owner
|
||||
package func copyItem(
|
||||
at srcURL: URL,
|
||||
to dstURL: URL,
|
||||
preserveOwner: Bool,
|
||||
) async throws {
|
||||
// why this is needed: https://github.com/xtool-org/xtool/issues/254
|
||||
|
||||
#if canImport(Subprocess)
|
||||
if !preserveOwner {
|
||||
let result = try await Subprocess.run(
|
||||
.name("cp"),
|
||||
arguments: ["-R", srcURL.path, dstURL.path],
|
||||
output: .discarded,
|
||||
error: .string(limit: .max, encoding: UTF8.self),
|
||||
)
|
||||
do {
|
||||
try result.checkSuccess()
|
||||
} catch {
|
||||
print("Error copying \(srcURL.path) to \(dstURL.path): \(result.standardError ?? "unknown")")
|
||||
throw error
|
||||
}
|
||||
return
|
||||
}
|
||||
#endif
|
||||
|
||||
try self.copyItem(at: srcURL, to: dstURL)
|
||||
}
|
||||
}
|
||||
|
||||
package func stderrPrint(_ message: String, terminator: String = "\n") {
|
||||
try? FileHandle.standardError.write(contentsOf: Data("\(message)\(terminator)".utf8))
|
||||
}
|
||||
|
||||
@@ -2,7 +2,15 @@
|
||||
import Subprocess
|
||||
import Foundation
|
||||
|
||||
extension ExecutionResult {
|
||||
extension ExecutionRecord {
|
||||
@discardableResult
|
||||
public func checkSuccess() throws(SubprocessFailure) -> Self {
|
||||
try terminationStatus.checkSuccess()
|
||||
return self
|
||||
}
|
||||
}
|
||||
|
||||
extension ExecutionOutcome {
|
||||
@discardableResult
|
||||
public func checkSuccess() throws(SubprocessFailure) -> Self {
|
||||
try terminationStatus.checkSuccess()
|
||||
|
||||
@@ -4,7 +4,6 @@ package struct TemporaryDirectory: ~Copyable {
|
||||
private static let debugTmp = ProcessInfo.processInfo.environment["XTL_DEBUG_TMP"] != nil
|
||||
|
||||
private var shouldDelete: Bool
|
||||
private let base: URL
|
||||
package let url: URL
|
||||
|
||||
/// Prepares a fresh tmpdir root.
|
||||
@@ -20,19 +19,15 @@ package struct TemporaryDirectory: ~Copyable {
|
||||
/// To save the contents, move them elsewhere with ``persist(at:)``.
|
||||
package init(name: String) throws {
|
||||
do {
|
||||
let basename = name
|
||||
.replacingOccurrences(of: ".", with: "_")
|
||||
.replacingOccurrences(of: "/", with: "_")
|
||||
.prefix(32)
|
||||
self.base = try TemporaryDirectoryRoot.shared.url
|
||||
let basename = name.replacingOccurrences(of: ".", with: "_")
|
||||
self.url = try TemporaryDirectoryRoot.shared.url
|
||||
// ensures uniqueness
|
||||
.appendingPathComponent("dir-\(basename)-\(UUID().uuidString)")
|
||||
self.url = base.appendingPathComponent(name, isDirectory: true)
|
||||
.appendingPathComponent("tmp-\(basename)-\(UUID().uuidString)")
|
||||
.appendingPathComponent(name, isDirectory: true)
|
||||
self.shouldDelete = true
|
||||
} catch {
|
||||
// non-copyable types can't be partially initialized so we need a stub value
|
||||
self.base = URL(fileURLWithPath: "")
|
||||
self.url = base
|
||||
self.url = URL(fileURLWithPath: "")
|
||||
self.shouldDelete = false
|
||||
throw error
|
||||
}
|
||||
@@ -45,12 +40,11 @@ package struct TemporaryDirectory: ~Copyable {
|
||||
|
||||
private func _delete() {
|
||||
guard !Self.debugTmp else { return }
|
||||
try? FileManager.default.removeItem(at: base)
|
||||
try? FileManager.default.removeItem(at: url)
|
||||
}
|
||||
|
||||
package consuming func persist(at location: URL) throws {
|
||||
try FileManager.default.moveItem(at: url, to: location)
|
||||
_delete()
|
||||
// we do this after moving, so that if the move fails we clean up
|
||||
shouldDelete = false
|
||||
}
|
||||
@@ -101,40 +95,30 @@ private struct TemporaryDirectoryRoot {
|
||||
}
|
||||
|
||||
private static func claimDirectory(in url: URL) throws -> URL {
|
||||
// create a lockfile + tmpdir. while we hold the lock, other instaces of
|
||||
// xtool will not delete the directory during their prune step.
|
||||
|
||||
try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true)
|
||||
|
||||
let pid = ProcessInfo.processInfo.processIdentifier
|
||||
|
||||
for i in 0..<10 {
|
||||
let random = "pid-\(pid)-\(i == 0 ? "0" : UUID().uuidString)"
|
||||
// #if os(macOS)
|
||||
// let random = UUID().uuidString
|
||||
// let lockFile = url.appending(path: "\(random).lock")
|
||||
// print("Locking")
|
||||
// _ = try FileDescriptor.open(FilePath(lockFile.path), .readWrite, options: [.create, .exclusiveLock])
|
||||
// print("Locked")
|
||||
// return url.appending(path: random)
|
||||
// #else
|
||||
for _ in 0..<10 {
|
||||
let random = UUID().uuidString
|
||||
let lockFile = url.appending(path: "\(random).lock")
|
||||
#if os(macOS)
|
||||
let fd = try FileDescriptor.open(
|
||||
FilePath(lockFile.path),
|
||||
.writeOnly,
|
||||
options: [.create, .exclusiveLock],
|
||||
permissions: [.ownerReadWrite, .groupRead, .otherRead],
|
||||
)
|
||||
#else
|
||||
let fd = try FileDescriptor.open(
|
||||
FilePath(lockFile.path),
|
||||
.writeOnly,
|
||||
options: [.create],
|
||||
permissions: [.ownerReadWrite, .groupRead, .otherRead],
|
||||
)
|
||||
FileManager.default.createFile(atPath: lockFile.path, contents: nil)
|
||||
let fd = try FileDescriptor.open(FilePath(lockFile.path), .writeOnly, options: [])
|
||||
guard try fd.tryLock(mode: .exclusive) else {
|
||||
// someone else raced us and claimed the right to prune between when we created the file and
|
||||
// when we tried to lock it
|
||||
continue
|
||||
}
|
||||
#endif
|
||||
// leak the file descriptor so that the lock is held until the process exits
|
||||
return url.appending(path: random)
|
||||
}
|
||||
throw Errors.tmpdirClaimFailed(url)
|
||||
// #endif
|
||||
}
|
||||
|
||||
private static func pruneOrphans(in url: URL) {
|
||||
@@ -143,12 +127,7 @@ private struct TemporaryDirectoryRoot {
|
||||
for lock in children {
|
||||
do {
|
||||
let basename = lock.lastPathComponent
|
||||
if basename.hasPrefix("tmp-") {
|
||||
// legacy tmpdir, remove it
|
||||
try? FileManager.default.removeItem(at: lock)
|
||||
continue
|
||||
}
|
||||
guard basename.hasPrefix("pid-") && basename.hasSuffix(".lock") else { continue }
|
||||
guard basename.hasSuffix(".lock") && basename != ".lock" else { continue }
|
||||
let lockFD = try FileDescriptor.open(FilePath(lock.path), .readWrite)
|
||||
defer { try? lockFD.close() }
|
||||
if try lockFD.tryLock(mode: .exclusive) {
|
||||
|
||||
@@ -8,7 +8,7 @@ import Dependencies
|
||||
enum XToolMain {
|
||||
static func main() async throws {
|
||||
prepareDependencies { _ in
|
||||
// TODO: Improve persistence mechanism
|
||||
#warning("Improve persistence mechanism")
|
||||
// for Windows, we could use dpapi.h or wincred.h.
|
||||
// for Linux, maybe use libsecret?
|
||||
// see https://github.com/atom/node-keytar
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
import Testing
|
||||
@testable import XToolSupport
|
||||
|
||||
@Test func commandParser() throws {
|
||||
func sut(_ string: some StringProtocol) throws -> [String] {
|
||||
try CommandParser.parse(string)
|
||||
}
|
||||
|
||||
#expect(try sut(#""#).isEmpty)
|
||||
#expect(try sut(#"foo"#) == ["foo"])
|
||||
#expect(try sut(#"foo "#) == ["foo"])
|
||||
#expect(try sut(#"foo one two"#) == ["foo", "one", "two"])
|
||||
#expect(try sut(#"foo 'one two' three"#) == ["foo", "one two", "three"])
|
||||
#expect(try sut(#"foo 'one!two' three"#) == ["foo", "one!two", "three"])
|
||||
#expect(try sut(#"foo one\!two three"#) == ["foo", "one!two", "three"])
|
||||
#expect(try sut(#"foo one\'two three"#) == ["foo", "one'two", "three"])
|
||||
#expect(try sut(#"foo one'two three'four five"#) == ["foo", "onetwo threefour", "five"])
|
||||
|
||||
#expect(throws: CommandParser.Errors.unclosedQuote) {
|
||||
try sut(#"foo one two' three"#)
|
||||
}
|
||||
#expect(throws: CommandParser.Errors.unpairedEscape) {
|
||||
try sut(#"foo a b \"#)
|
||||
}
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
import Foundation
|
||||
import Testing
|
||||
@testable import PackLib
|
||||
|
||||
@Test func swiftPMDirectoryUsesXDGConfigHome() throws {
|
||||
let directory = try DarwinSDK.swiftPMDirectory(
|
||||
environment: ["XDG_CONFIG_HOME": "/xdg/config"],
|
||||
homeDirectory: URL(fileURLWithPath: "/home/test")
|
||||
)
|
||||
|
||||
#expect(directory.path == "/xdg/config/swiftpm")
|
||||
}
|
||||
|
||||
@Test func swiftPMDirectoryFallsBackToHomeDirectory() throws {
|
||||
let directory = try DarwinSDK.swiftPMDirectory(
|
||||
environment: [:],
|
||||
homeDirectory: URL(fileURLWithPath: "/home/test")
|
||||
)
|
||||
|
||||
#expect(directory.path == "/home/test/.swiftpm")
|
||||
}
|
||||
|
||||
@Test func swiftPMDirectoryRejectsRelativeXDGConfigHome() {
|
||||
#expect(throws: StringError.self) {
|
||||
try DarwinSDK.swiftPMDirectory(
|
||||
environment: ["XDG_CONFIG_HOME": "relative/config"],
|
||||
homeDirectory: URL(fileURLWithPath: "/home/test")
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Test func temporaryDarwinSDKBundleUsesSwiftSDKsDirectory() throws {
|
||||
let configDirectory = FileManager.default.temporaryDirectory
|
||||
.appendingPathComponent("DarwinSDKTests-\(UUID().uuidString)", isDirectory: true)
|
||||
defer { try? FileManager.default.removeItem(at: configDirectory) }
|
||||
|
||||
let environment = ["XDG_CONFIG_HOME": configDirectory.path]
|
||||
let sdksDirectory = configDirectory.appending(path: "swiftpm/swift-sdks")
|
||||
let temporaryURL = sdksDirectory.appendingPathComponent("darwin.artifactbundle.tmp", isDirectory: true)
|
||||
let installedBundle = sdksDirectory.appending(path: "darwin.artifactbundle")
|
||||
try FileManager.default.createDirectory(at: installedBundle, withIntermediateDirectories: true)
|
||||
try FileManager.default.createDirectory(at: temporaryURL, withIntermediateDirectories: false)
|
||||
|
||||
do {
|
||||
let temporaryBundle = try DarwinSDK.prepareTemporaryBundle(environment: environment)
|
||||
#expect(temporaryBundle.url == temporaryURL)
|
||||
#expect(!FileManager.default.fileExists(atPath: temporaryURL.path))
|
||||
|
||||
try FileManager.default.createDirectory(at: temporaryBundle.url, withIntermediateDirectories: false)
|
||||
#expect(DarwinSDK(bundle: temporaryBundle.url)?.version == "develop")
|
||||
}
|
||||
|
||||
#expect(!FileManager.default.fileExists(atPath: temporaryURL.path))
|
||||
#expect(FileManager.default.fileExists(atPath: installedBundle.path))
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
import Foundation
|
||||
import Testing
|
||||
import Subprocess
|
||||
|
||||
enum TestXcode {
|
||||
/// A path to a copy of Xcode.app.
|
||||
///
|
||||
/// Tests that use this must be annotated with `Trait.requiresXcode`.
|
||||
static func current(sourceLocation: SourceLocation = #_sourceLocation) -> URL {
|
||||
guard let url = TestXcode._current else {
|
||||
Issue.record(
|
||||
"TestXcode.current was used without Trait.requiresXcode()",
|
||||
sourceLocation: sourceLocation
|
||||
)
|
||||
return URL(filePath: "/dev/null")
|
||||
}
|
||||
return url
|
||||
}
|
||||
|
||||
@TaskLocal fileprivate static var _current: URL?
|
||||
|
||||
fileprivate static let resolved = Task<URL?, Error> {
|
||||
if let xcode = ProcessInfo.processInfo.environment["XTL_TEST_XCODE_APP"], !xcode.isEmpty {
|
||||
return URL(filePath: xcode)
|
||||
}
|
||||
#if os(macOS)
|
||||
if
|
||||
let output = try await Subprocess.run(
|
||||
.path("/usr/bin/xcode-select"),
|
||||
arguments: ["-p"],
|
||||
output: .string(limit: .max, encoding: UTF8.self),
|
||||
).standardOutput?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||
output.hasSuffix(".app/Contents/Developer") {
|
||||
return URL(filePath: output).deletingLastPathComponent().deletingLastPathComponent()
|
||||
}
|
||||
#endif
|
||||
let candidate = URL(filePath: "/usr/local/share/Xcode.app")
|
||||
if FileManager.default.fileExists(atPath: candidate.path) {
|
||||
return candidate
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
struct RequiresXcodeTrait: TestTrait, SuiteTrait, TestScoping {
|
||||
func provideScope(
|
||||
for test: Test,
|
||||
testCase: Test.Case?,
|
||||
performing function: () async throws -> Void
|
||||
) async throws {
|
||||
guard let xcode = try? await TestXcode.resolved.value else {
|
||||
try Test.cancel("Could not resolve Xcode.app path. Set XTL_TEST_XCODE_APP.")
|
||||
}
|
||||
return try await TestXcode.$_current.withValue(xcode) {
|
||||
try await function()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension Trait where Self == RequiresXcodeTrait {
|
||||
static var requiresXcode: Self {
|
||||
Self()
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
import Foundation
|
||||
import Testing
|
||||
@testable import XKit
|
||||
|
||||
@Test func wifiAwareEntitlementMapsToDeveloperCapability() throws {
|
||||
let plist = """
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.developer.wifi-aware</key>
|
||||
<array>
|
||||
<string>Publish</string>
|
||||
<string>Subscribe</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
"""
|
||||
|
||||
let entitlements = try PropertyListDecoder().decode(
|
||||
Entitlements.self,
|
||||
from: Data(plist.utf8)
|
||||
)
|
||||
let wifiAware = try #require(
|
||||
entitlements.entitlements().compactMap { $0 as? WiFiAwareEntitlement }.first
|
||||
)
|
||||
|
||||
#expect(wifiAware.rawValue == ["Publish", "Subscribe"])
|
||||
#expect(wifiAware.capability.capabilityType.value1 == nil)
|
||||
#expect(wifiAware.capability.capabilityType.value2 == "WIFI_AWARE")
|
||||
#expect(wifiAware.capability.settings == nil)
|
||||
#expect(!wifiAware.capability.isFree)
|
||||
|
||||
let encoded = try PropertyListEncoder().encode(entitlements)
|
||||
let dictionary = try #require(
|
||||
PropertyListSerialization.propertyList(from: encoded, format: nil) as? [String: Any]
|
||||
)
|
||||
#expect(dictionary[WiFiAwareEntitlement.identifier] as? [String] == ["Publish", "Subscribe"])
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
import Testing
|
||||
import Foundation
|
||||
|
||||
@Test(.requiresXcode) func validateXcode() {
|
||||
let xcode = TestXcode.current()
|
||||
let swift = xcode.appending(path: "Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift")
|
||||
#expect(
|
||||
FileManager.default.fileExists(atPath: swift.path),
|
||||
"Invalid or unrecognized layout for Xcode.app at \(xcode.path)"
|
||||
)
|
||||
}
|
||||
+2
-7
@@ -2,10 +2,8 @@ services:
|
||||
xtool:
|
||||
build:
|
||||
context: .
|
||||
target: dev
|
||||
volumes:
|
||||
- .:/xtool
|
||||
- .build/linux:/xtool/.build
|
||||
container_name: xtool
|
||||
stdin_open: true
|
||||
tty: true
|
||||
@@ -15,9 +13,6 @@ services:
|
||||
- seccomp:unconfined
|
||||
extra_hosts:
|
||||
# host.docker.internal doesn't exist by default on Linux hosts
|
||||
# TODO: Does this conflict with the default host on macOS?
|
||||
# we could rename this
|
||||
- "host.docker.internal:host-gateway"
|
||||
xtool-test:
|
||||
extends:
|
||||
service: xtool
|
||||
build:
|
||||
target: dev-test
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
xcode_path="${XTL_TEST_XCODE_APP:-}"
|
||||
|
||||
if [[ -z "$xcode_path" && $(uname -s) == "Darwin" ]]; then
|
||||
xcode_path="$(dirname $(dirname $(/usr/bin/xcode-select -p)))"
|
||||
fi
|
||||
|
||||
if [[ -z "$xcode_path" && -d /usr/local/share/Xcode.app ]]; then
|
||||
xcode_path="/usr/local/share/Xcode.app"
|
||||
fi
|
||||
|
||||
if [[ -z "$xcode_path" ]]; then
|
||||
echo "Xcode.app not found. Please set XTL_TEST_XCODE_APP."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
export XTL_TEST_XCODE_APP="$xcode_path"
|
||||
|
||||
if [[ -z "${XTL_TEST_ENV:-}" ]]; then
|
||||
[[ -t 1 ]] && tty_flag="-it" || tty_flag=""
|
||||
|
||||
echo "Running"
|
||||
|
||||
exec docker compose run --build --rm -e XTL_CI=1 -v "$xcode_path":/usr/local/share/Xcode.app:ro \
|
||||
xtool-test bash -c \
|
||||
"./integration-tests/run.sh"
|
||||
fi
|
||||
|
||||
cd "$(dirname "$0")/.."
|
||||
|
||||
project_dir="$PWD"
|
||||
|
||||
swift build --product xtool
|
||||
swift test
|
||||
ln -fs $PWD/.build/debug/xtool /usr/local/bin/xtool
|
||||
hash -r
|
||||
|
||||
mkdir /testroot
|
||||
cd /testroot
|
||||
export XDG_CONFIG_HOME="/testroot/config"
|
||||
|
||||
echo "Installing SDK"
|
||||
xtool sdk install --slim "$XTL_TEST_XCODE_APP"
|
||||
|
||||
echo "Running tests..."
|
||||
bats "$project_dir/integration-tests/suite"
|
||||
@@ -1,21 +0,0 @@
|
||||
setup() {
|
||||
bats_require_minimum_version 1.5.0
|
||||
bats_load_library bats-support
|
||||
bats_load_library bats-assert
|
||||
}
|
||||
|
||||
@test "can run xtool" {
|
||||
xtool --version
|
||||
}
|
||||
|
||||
@test "can build a fresh app" {
|
||||
xtool new --skip-setup MyApp
|
||||
cd MyApp
|
||||
xtool dev build
|
||||
llvm-objdump -p ./xtool/MyApp.app/MyApp | grep "\bcmd LC_BUILD_VERSION\b" -a2 | grep "\bplatform ios\b"
|
||||
}
|
||||
|
||||
@test "slim sdk cannot be updated" {
|
||||
run ! xtool sdk update
|
||||
assert_output --partial "cannot be updated in place"
|
||||
}
|
||||
@@ -2,8 +2,6 @@
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
|
||||
<true/>
|
||||
<key>keychain-access-groups</key>
|
||||
<array>
|
||||
<string>$(AppIdentifierPrefix)sh.xtool.keychain</string>
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ targets:
|
||||
XToolMac:
|
||||
type: application
|
||||
platform: macOS
|
||||
deploymentTarget: "13.0"
|
||||
deploymentTarget: "14.0"
|
||||
sources:
|
||||
- path: XToolMac
|
||||
- path: Resources/xtool
|
||||
|
||||
Reference in New Issue
Block a user