Compare commits
32 Commits
@@ -0,0 +1,37 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Report a bug
|
||||
title: ''
|
||||
labels: bug
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
## Description
|
||||
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
## Environment
|
||||
|
||||
Please provide as much of the following information as is relevant.
|
||||
|
||||
Host OS (macOS/Linux/WSL):
|
||||
|
||||
Host OS version:
|
||||
<!-- macOS: Apple Logo > About this Mac -->
|
||||
<!-- Linux: -->
|
||||
<!-- cat /etc/*-release -->
|
||||
<!-- Windows: -->
|
||||
<!-- Get-WinVer; wsl -l -v -->
|
||||
|
||||
iOS device version:
|
||||
<!-- Settings > General > About > iOS Version -->
|
||||
|
||||
Swift version:
|
||||
<!-- swift --version -->
|
||||
|
||||
SDK version:
|
||||
<!-- macOS: -->
|
||||
<!-- xcodebuild -version; xcrun -sdk iphoneos -show-sdk-version -->
|
||||
<!-- Linux/WSL: -->
|
||||
<!-- swift sdk configure darwin arm64-apple-ios --show-configuration | grep -o 'iPhoneOS[0-9.]*\.sdk$' -->
|
||||
@@ -0,0 +1,10 @@
|
||||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea
|
||||
title: ''
|
||||
labels: enhancement
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
tags:
|
||||
- "*"
|
||||
|
||||
jobs:
|
||||
build-linux:
|
||||
@@ -19,12 +21,16 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: |
|
||||
docker compose run --build --rm xtool bash -c "Linux/build.sh && mv Linux/packages/xtool{,-${{ matrix.host.arch }}}.AppImage"
|
||||
docker compose run --build \
|
||||
-e XTOOL_VERSION=${{ github.ref_name }} \
|
||||
--rm xtool Linux/build.sh
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: xtool-${{ matrix.host.arch }}
|
||||
path: Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
|
||||
path: |
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage
|
||||
Linux/packages/xtool-${{ matrix.host.arch }}.AppImage.zsync
|
||||
build-mac:
|
||||
runs-on: macos-15
|
||||
permissions:
|
||||
@@ -44,6 +50,7 @@ jobs:
|
||||
APP_STORE_CONNECT_API_KEY_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY }}
|
||||
IDENTITY_P12: ${{ secrets.IDENTITY_P12 }}
|
||||
DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
|
||||
XTOOL_VERSION: ${{ github.ref_name }}
|
||||
run: |
|
||||
cd macOS
|
||||
bundle exec fastlane package
|
||||
@@ -70,6 +77,6 @@ jobs:
|
||||
path: output
|
||||
- name: Create and publish release
|
||||
run: |
|
||||
TAG="${GITHUB_REF##*/}-${GITHUB_SHA:0:7}"
|
||||
gh release create "$TAG" --draft --title "Draft Release"
|
||||
gh release upload "$TAG" output/**/*.{AppImage,app.zip,app.dSYM.zip}
|
||||
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}
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
version: 1
|
||||
builder:
|
||||
configs:
|
||||
- scheme: xtool
|
||||
platform: macosSpm
|
||||
documentation_targets:
|
||||
- xtool
|
||||
- scheme: xtool
|
||||
platform: macosXcodebuild
|
||||
- scheme: xtool
|
||||
platform: linux
|
||||
image: kabiroberai/xtool-dev:latest
|
||||
- scheme: XKit
|
||||
platform: ios
|
||||
@@ -0,0 +1,128 @@
|
||||
# Contributor Covenant Code of Conduct
|
||||
|
||||
## Our Pledge
|
||||
|
||||
We as members, contributors, and leaders pledge to make participation in our
|
||||
community a harassment-free experience for everyone, regardless of age, body
|
||||
size, visible or invisible disability, ethnicity, sex characteristics, gender
|
||||
identity and expression, level of experience, education, socio-economic status,
|
||||
nationality, personal appearance, race, religion, or sexual identity
|
||||
and orientation.
|
||||
|
||||
We pledge to act and interact in ways that contribute to an open, welcoming,
|
||||
diverse, inclusive, and healthy community.
|
||||
|
||||
## Our Standards
|
||||
|
||||
Examples of behavior that contributes to a positive environment for our
|
||||
community include:
|
||||
|
||||
* Demonstrating empathy and kindness toward other people
|
||||
* Being respectful of differing opinions, viewpoints, and experiences
|
||||
* Giving and gracefully accepting constructive feedback
|
||||
* Accepting responsibility and apologizing to those affected by our mistakes,
|
||||
and learning from the experience
|
||||
* Focusing on what is best not just for us as individuals, but for the
|
||||
overall community
|
||||
|
||||
Examples of unacceptable behavior include:
|
||||
|
||||
* The use of sexualized language or imagery, and sexual attention or
|
||||
advances of any kind
|
||||
* Trolling, insulting or derogatory comments, and personal or political attacks
|
||||
* Public or private harassment
|
||||
* Publishing others' private information, such as a physical or email
|
||||
address, without their explicit permission
|
||||
* Other conduct which could reasonably be considered inappropriate in a
|
||||
professional setting
|
||||
|
||||
## Enforcement Responsibilities
|
||||
|
||||
Community leaders are responsible for clarifying and enforcing our standards of
|
||||
acceptable behavior and will take appropriate and fair corrective action in
|
||||
response to any behavior that they deem inappropriate, threatening, offensive,
|
||||
or harmful.
|
||||
|
||||
Community leaders have the right and responsibility to remove, edit, or reject
|
||||
comments, commits, code, wiki edits, issues, and other contributions that are
|
||||
not aligned to this Code of Conduct, and will communicate reasons for moderation
|
||||
decisions when appropriate.
|
||||
|
||||
## Scope
|
||||
|
||||
This Code of Conduct applies within all community spaces, and also applies when
|
||||
an individual is officially representing the community in public spaces.
|
||||
Examples of representing our community include using an official e-mail address,
|
||||
posting via an official social media account, or acting as an appointed
|
||||
representative at an online or offline event.
|
||||
|
||||
## Enforcement
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
reported to the community leaders responsible for enforcement at
|
||||
conduct@xtool.sh.
|
||||
All complaints will be reviewed and investigated promptly and fairly.
|
||||
|
||||
All community leaders are obligated to respect the privacy and security of the
|
||||
reporter of any incident.
|
||||
|
||||
## Enforcement Guidelines
|
||||
|
||||
Community leaders will follow these Community Impact Guidelines in determining
|
||||
the consequences for any action they deem in violation of this Code of Conduct:
|
||||
|
||||
### 1. Correction
|
||||
|
||||
**Community Impact**: Use of inappropriate language or other behavior deemed
|
||||
unprofessional or unwelcome in the community.
|
||||
|
||||
**Consequence**: A private, written warning from community leaders, providing
|
||||
clarity around the nature of the violation and an explanation of why the
|
||||
behavior was inappropriate. A public apology may be requested.
|
||||
|
||||
### 2. Warning
|
||||
|
||||
**Community Impact**: A violation through a single incident or series
|
||||
of actions.
|
||||
|
||||
**Consequence**: A warning with consequences for continued behavior. No
|
||||
interaction with the people involved, including unsolicited interaction with
|
||||
those enforcing the Code of Conduct, for a specified period of time. This
|
||||
includes avoiding interactions in community spaces as well as external channels
|
||||
like social media. Violating these terms may lead to a temporary or
|
||||
permanent ban.
|
||||
|
||||
### 3. Temporary Ban
|
||||
|
||||
**Community Impact**: A serious violation of community standards, including
|
||||
sustained inappropriate behavior.
|
||||
|
||||
**Consequence**: A temporary ban from any sort of interaction or public
|
||||
communication with the community for a specified period of time. No public or
|
||||
private interaction with the people involved, including unsolicited interaction
|
||||
with those enforcing the Code of Conduct, is allowed during this period.
|
||||
Violating these terms may lead to a permanent ban.
|
||||
|
||||
### 4. Permanent Ban
|
||||
|
||||
**Community Impact**: Demonstrating a pattern of violation of community
|
||||
standards, including sustained inappropriate behavior, harassment of an
|
||||
individual, or aggression toward or disparagement of classes of individuals.
|
||||
|
||||
**Consequence**: A permanent ban from any sort of public interaction within
|
||||
the community.
|
||||
|
||||
## Attribution
|
||||
|
||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
||||
version 2.0, available at
|
||||
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
|
||||
|
||||
Community Impact Guidelines were inspired by [Mozilla's code of conduct
|
||||
enforcement ladder](https://github.com/mozilla/diversity).
|
||||
|
||||
[homepage]: https://www.contributor-covenant.org
|
||||
|
||||
For answers to common questions about this code of conduct, see the FAQ at
|
||||
https://www.contributor-covenant.org/faq. Translations are available at
|
||||
https://www.contributor-covenant.org/translations.
|
||||
@@ -0,0 +1,31 @@
|
||||
# Contributing to xtool
|
||||
|
||||
## Bug reports and feature requests
|
||||
|
||||
We welcome all bug reports and feature requests! Please create a [new issue](https://github.com/xtool-org/xtool/issues/new/choose) via GitHub.
|
||||
|
||||
## 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.
|
||||
|
||||
## 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.
|
||||
@@ -0,0 +1,25 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
rm -rf docs
|
||||
|
||||
if type -p xcrun &>/dev/null; then
|
||||
docc="$(xcrun -f docc)"
|
||||
else
|
||||
docc="docc"
|
||||
fi
|
||||
|
||||
if [[ $# == 0 ]]; then
|
||||
command="convert"
|
||||
elif [[ $# == 1 && ( "$1" == "preview" || "$1" == "convert" ) ]]; then
|
||||
command="$1"
|
||||
else
|
||||
echo "Usage: $0 [convert|preview]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
"$docc" "$command" xtool.docc \
|
||||
--experimental-enable-custom-templates
|
||||
@@ -21,7 +21,7 @@ You can update your app's bundle ID by editing the `bundleID` field in `xtool.ym
|
||||
|
||||
> Note:
|
||||
>
|
||||
> xtool adds a prefix to your bundle ID when signing and installing the app on a real device. For example, it may update the above bundle id to `SC-1234.com.example.Hello`. This is because, at least with free accounts (those not enrolled in the Apple Developer Program), two accounts cannot use the same bundle ID. Prefixing ensures that if you share your app with someone else, they won't run into a bundle ID conflict when installing it.
|
||||
> xtool adds a prefix to your bundle ID when signing and installing the app on a real device. For example, it may update the above bundle id to `XTL-1234.com.example.Hello`. This is because, at least with free accounts (those not enrolled in the Apple Developer Program), two accounts cannot use the same bundle ID. Prefixing ensures that if you share your app with someone else, they won't run into a bundle ID conflict when installing it.
|
||||
>
|
||||
> With additional engineering effort, this limitation could be lifted for paid Developer Program users by leveraging wildcard provisioning profiles. If you have a concrete use case for this and/or wish to contribute, please [file an issue](https://github.com/xtool-org/xtool/issues/new).
|
||||
|
||||
@@ -29,27 +29,19 @@ swift --version
|
||||
|
||||
## Installation
|
||||
|
||||
### 1. Build xtool
|
||||
### 1. Download xtool
|
||||
|
||||
You currently have to build xtool from source on macOS, via Swift Package Manager.
|
||||
If you have [Homebrew](https://brew.sh), you can install xtool with
|
||||
|
||||
```bash
|
||||
git clone https://github.com/xtool-org/xtool
|
||||
# Cloning into 'xtool'...
|
||||
# Resolving deltas: 100% (1795/1795), done.
|
||||
cd xtool
|
||||
swift build -c release --product xtool
|
||||
# Building for production...
|
||||
# [503/503] Linking xtool
|
||||
# Build of product 'xtool' complete! (67.64s)
|
||||
sudo ln -s "$PWD/.build/release/xtool" /usr/local/bin/xtool
|
||||
brew install xtool-org/tap/xtool
|
||||
```
|
||||
|
||||
> Important:
|
||||
Otherwise, you can download `xtool.app` from the [latest GitHub release](https://github.com/xtool-org/xtool/releases/latest). After moving it into `/Applications`, launch it and run the suggested script to add the `xtool` command to your `PATH`.
|
||||
|
||||
> Note:
|
||||
>
|
||||
> The SwiftPM build currently references relative libraries and resources. This means you can't just `mv` the built `xtool` binary, hence the usage of `ln` to symlink instead. Make sure you **don't delete the directory where you cloned xtool**.
|
||||
>
|
||||
> The plan is to make macOS installation easier and more self-contained in the future by shipping xtool as a `.app`, Homebrew Cask, etc. If you would like to contribute, feel free to reach out via [GitHub Issues](https://github.com/xtool-org/xtool/issues/new).
|
||||
> If you install xtool manually, you'll also need to check for new GitHub releases and update it yourself. If you're interested in contributing support for auto-updates through Sparkle, pull requests are appreciated. See [issue #34 on GitHub](https://github.com/xtool-org/xtool/issues/34).
|
||||
|
||||
Confirm that xtool is installed correctly:
|
||||
|
||||
|
Before Width: | Height: | Size: 286 KiB After Width: | Height: | Size: 286 KiB |
|
Before Width: | Height: | Size: 948 KiB After Width: | Height: | Size: 948 KiB |
|
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 5.0 MiB After Width: | Height: | Size: 5.0 MiB |
|
Before Width: | Height: | Size: 222 KiB After Width: | Height: | Size: 222 KiB |
|
Before Width: | Height: | Size: 316 KiB After Width: | Height: | Size: 316 KiB |
|
Before Width: | Height: | Size: 232 KiB After Width: | Height: | Size: 232 KiB |
|
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 142 KiB |
|
Before Width: | Height: | Size: 2.3 MiB After Width: | Height: | Size: 2.3 MiB |
|
Before Width: | Height: | Size: 127 KiB After Width: | Height: | Size: 127 KiB |
@@ -0,0 +1,19 @@
|
||||
<style>
|
||||
footer {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
padding: 0.5rem 0.8rem;
|
||||
background-color: var(--color-fill-secondary);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
a, a:visited {
|
||||
color: var(--color-text);
|
||||
}
|
||||
</style>
|
||||
|
||||
<footer>
|
||||
<span>
|
||||
© xtool maintainers. This site is powered by <a href="https://www.netlify.com">Netlify</a>.
|
||||
</span>
|
||||
</footer>
|
||||
@@ -1,4 +1,10 @@
|
||||
# ``xtool``
|
||||
# xtool
|
||||
|
||||
@Metadata {
|
||||
@TechnologyRoot
|
||||
@TitleHeading("Command-line Tool")
|
||||
@CallToAction(url: "https://github.com/xtool-org/xtool", label: "View on GitHub")
|
||||
}
|
||||
|
||||
Cross-platform Xcode replacement.
|
||||
|
||||
@@ -5,9 +5,6 @@ shopt -s nullglob
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
# installer version
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="1.0.0"
|
||||
|
||||
if ! command -v fusermount &>/dev/null; then
|
||||
# Docker doesn't support FUSE
|
||||
export APPIMAGE_EXTRACT_AND_RUN=1
|
||||
@@ -21,6 +18,7 @@ bin="$(swift build --package-path .. -c release --show-bin-path)"
|
||||
strip "${bin}/xtool"
|
||||
|
||||
curr_git_info="$(curl -fsSL https://api.github.com/repos/linuxdeploy/linuxdeploy/git/refs/tags/continuous)"
|
||||
curr_arch="$(uname -m)"
|
||||
|
||||
if [[ -f staging/linuxdeploy/git.json ]]; then
|
||||
if ! cmp -s staging/linuxdeploy/git.json <(echo "$curr_git_info"); then
|
||||
@@ -33,7 +31,7 @@ else
|
||||
fi
|
||||
|
||||
if [[ ! -f staging/linuxdeploy/linuxdeploy.AppImage ]]; then
|
||||
curl -fsSL "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-$(arch).AppImage" \
|
||||
curl -fsSL "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${curr_arch}.AppImage" \
|
||||
-o staging/linuxdeploy/linuxdeploy.AppImage
|
||||
chmod +x staging/linuxdeploy/linuxdeploy.AppImage
|
||||
echo "$curr_git_info" > staging/linuxdeploy/git.json
|
||||
@@ -42,14 +40,17 @@ fi
|
||||
mkdir -p staging/tmp/AppDir/usr/bin
|
||||
find "${bin}"/ -name '*.resources' -print0 | xargs -0 -I {} cp -a {} "${PWD}/staging/tmp/AppDir/usr/bin/"
|
||||
|
||||
LDAI_OUTPUT="staging/tmp/xtool.AppImage" ./staging/linuxdeploy/linuxdeploy.AppImage \
|
||||
export LINUXDEPLOY_OUTPUT_VERSION="${XTOOL_VERSION:-unversioned}"
|
||||
export LDAI_OUTPUT="staging/tmp/xtool-${curr_arch}.AppImage"
|
||||
export LDAI_UPDATE_INFORMATION="gh-releases-zsync|xtool-org|xtool|latest|xtool-${curr_arch}.AppImage.zsync"
|
||||
./staging/linuxdeploy/linuxdeploy.AppImage \
|
||||
--appdir staging/tmp/AppDir \
|
||||
--output appimage \
|
||||
-e "${bin}/xtool" \
|
||||
-d xtool.desktop \
|
||||
-i xtool.png
|
||||
mkdir -p packages
|
||||
mv -f staging/tmp/xtool.AppImage packages/xtool.AppImage
|
||||
mv -f "staging/tmp/xtool-${curr_arch}.AppImage" "./xtool-${curr_arch}.AppImage.zsync" packages/
|
||||
|
||||
rm -rf staging/tmp
|
||||
|
||||
|
||||
@@ -1,7 +1,135 @@
|
||||
ifeq ($(shell uname -s),Darwin)
|
||||
|
||||
IS_MAC = 1
|
||||
|
||||
ifneq ($(VERBOSE),1)
|
||||
ifeq ($(shell type -p xcbeautify &>/dev/null && echo 1),1)
|
||||
XC_FORMAT = | xcbeautify
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(RELEASE),1)
|
||||
INTERNAL_SWIFTFLAGS = -c release
|
||||
INTERNAL_XCFLAGS = -configuration Release
|
||||
else
|
||||
INTERNAL_SWIFTFLAGS = -c debug
|
||||
INTERNAL_XCFLAGS = -configuration Debug
|
||||
endif
|
||||
|
||||
ALL_SWIFTFLAGS = $(INTERNAL_SWIFTFLAGS) $(SWIFTFLAGS)
|
||||
ALL_XCFLAGS = $(INTERNAL_XCFLAGS) $(XCFLAGS)
|
||||
|
||||
TEAM_CONFIG = macOS/Support/Private-Team.xcconfig
|
||||
|
||||
.PHONY: all
|
||||
# dev build for the current platform
|
||||
all:
|
||||
ifeq ($(IS_MAC),1)
|
||||
@+$(MAKE) mac
|
||||
else
|
||||
@+$(MAKE) linux
|
||||
endif
|
||||
|
||||
.PHONY: clean
|
||||
# clean build artifacts
|
||||
clean:
|
||||
ifeq ($(IS_MAC),1)
|
||||
@+$(MAKE) mac-clean
|
||||
else
|
||||
@+$(MAKE) linux-clean
|
||||
endif
|
||||
|
||||
.PHONY: linux
|
||||
# dev build for Linux
|
||||
linux:
|
||||
swift build --product xtool $(ALL_SWIFTFLAGS)
|
||||
|
||||
.PHONY: linux-clean
|
||||
# clean build artifacts for Linux
|
||||
linux-clean:
|
||||
rm -rf .build
|
||||
|
||||
.PHONY: linux-dist
|
||||
# dist build for Linux
|
||||
linux-dist:
|
||||
docker compose run --build --rm xtool Linux/build.sh
|
||||
|
||||
.PHONY: mac
|
||||
# dev build for macOS
|
||||
mac: project
|
||||
@rm -rf macOS/Build/XcodeInstall
|
||||
@set -o pipefail && cd macOS && \
|
||||
xcodebuild install \
|
||||
-skipMacroValidation -skipPackagePluginValidation \
|
||||
-scheme XToolMac -destination generic/platform=macOS \
|
||||
-derivedDataPath Build/DerivedData \
|
||||
DSTROOT="$$PWD"/Build/XcodeInstall INSTALL_PATH=/ \
|
||||
$(ALL_XCFLAGS) $(XC_FORMAT)
|
||||
@ln -fs XcodeInstall/xtool.app/Contents/Resources/bin/xtool macOS/Build/xtool
|
||||
@echo "Output: ./macOS/Build/xtool"
|
||||
|
||||
.PHONY: mac-clean
|
||||
# clean build artifacts for macOS
|
||||
mac-clean:
|
||||
rm -rf macOS/Build
|
||||
|
||||
.PHONY: mac-dist
|
||||
# dist build for macOS
|
||||
# requires a few secrets in the env (see .github/workflows/release.yml)
|
||||
mac-dist:
|
||||
@echo "bundle exec fastlane package"
|
||||
@cd macOS && bundle exec fastlane package
|
||||
|
||||
.PHONY: reload
|
||||
# update Xcode project and restart Xcode
|
||||
reload:
|
||||
killall Xcode || :
|
||||
@+$(MAKE) project
|
||||
xed macOS/XToolMac.xcodeproj
|
||||
|
||||
.PHONY: project
|
||||
# update Xcode project
|
||||
project: $(TEAM_CONFIG)
|
||||
@echo "xcodegen"
|
||||
@cd macOS && xcodegen
|
||||
|
||||
.PHONY: team
|
||||
# update development team
|
||||
team:
|
||||
@+$(MAKE) -B $(TEAM_CONFIG)
|
||||
|
||||
# update development team if needed.
|
||||
#
|
||||
# will prompt interactively if there are multiple valid options.
|
||||
# set DEVELOPMENT_TEAM=... to force a specific value.
|
||||
$(TEAM_CONFIG):
|
||||
ifeq ($(DEVELOPMENT_TEAM),)
|
||||
@mkdir -p macOS/Support
|
||||
@team=$$(./scripts/select-identity.sh); \
|
||||
echo "echo \"DEVELOPMENT_TEAM = $$team\" > $@"; \
|
||||
echo "DEVELOPMENT_TEAM = $$team" > $@
|
||||
else
|
||||
@mkdir -p macOS/Support
|
||||
echo "DEVELOPMENT_TEAM = $(DEVELOPMENT_TEAM)" > $@
|
||||
.PHONY: $(TEAM_CONFIG)
|
||||
endif
|
||||
|
||||
.PHONY: docs
|
||||
# build documentation
|
||||
docs:
|
||||
./Documentation/build.sh
|
||||
|
||||
.PHONY: docs-preview
|
||||
# preview documentation
|
||||
docs-preview:
|
||||
./Documentation/build.sh preview
|
||||
|
||||
SPEC_URL = https://developer.apple.com/sample-code/app-store-connect/app-store-connect-openapi-specification.zip
|
||||
|
||||
.PHONY: api update-api
|
||||
|
||||
.PHONY: api
|
||||
# Regenerate the OpenAPI client code
|
||||
api: openapi/openapi.json
|
||||
swift run swift-openapi-generator generate \
|
||||
openapi/openapi.json \
|
||||
@@ -11,6 +139,8 @@ api: openapi/openapi.json
|
||||
sed -i '' -e 's/[[:<:]]Client[[:>:]]/DeveloperAPIClient/g' $$file; \
|
||||
done
|
||||
|
||||
.PHONY: update-api
|
||||
# Update OpenAPI spec and regenerate the client code
|
||||
update-api:
|
||||
@+$(MAKE) -B api
|
||||
|
||||
|
||||
@@ -2,6 +2,19 @@
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let xtoolVersion: String? = {
|
||||
if let explicitVersion = Context.environment["XTOOL_VERSION"] {
|
||||
return explicitVersion
|
||||
} else if let info = Context.gitInformation {
|
||||
let gitCommit = info.currentCommit
|
||||
let gitTag = info.currentTag
|
||||
let gitRef = gitTag ?? "commit \(gitCommit)"
|
||||
return "\(gitRef)\(info.hasUncommittedChanges ? " (dirty)" : "")"
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}()
|
||||
|
||||
let cSettings: [CSetting] = [
|
||||
.define("_GNU_SOURCE", .when(platforms: [.linux])),
|
||||
]
|
||||
@@ -64,7 +77,11 @@ let package = Package(
|
||||
dependencies: [
|
||||
.product(name: "OpenSSL", package: "xtool-core")
|
||||
],
|
||||
cSettings: cSettings
|
||||
cSettings: cSettings + (
|
||||
xtoolVersion
|
||||
.map { [.define("XTOOL_VERSION", to: "\"\($0)\"")] }
|
||||
?? []
|
||||
)
|
||||
),
|
||||
.target(
|
||||
name: "DeveloperAPI",
|
||||
|
||||
@@ -15,15 +15,15 @@ xtool is a cross-platform (Linux/WSL/macOS) tool that replicates Xcode functiona
|
||||
## Getting Started
|
||||
|
||||
1. Follow the guide to install `xtool`
|
||||
- [Installation (Linux/Windows)](https://swiftpackageindex.com/xtool-org/xtool/documentation/xtool/installation-linux)
|
||||
- [Installation (macOS)](https://swiftpackageindex.com/xtool-org/xtool/documentation/xtool/installation-macos)
|
||||
2. Create and run your first xtool-powered app by following the [tutorial](https://swiftpackageindex.com/xtool-org/xtool/tutorials/xtool/first-app)!
|
||||
- [Installation (Linux/Windows)](https://xtool.sh/documentation/xtooldocs/installation-linux)
|
||||
- [Installation (macOS)](https://xtool.sh/documentation/xtooldocs/installation-macos)
|
||||
2. Create and run your first xtool-powered app by following the [tutorial](https://xtool.sh/tutorials/xtooldocs/first-app)!
|
||||
|
||||
## Examples
|
||||
|
||||
### Screenshot
|
||||
|
||||

|
||||

|
||||
|
||||
### Command line interface
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# Security Policy
|
||||
|
||||
## Reporting a Vulnerability
|
||||
|
||||
To report a vulnerability, please use GitHub's ["Report a Vulnerability"](https://github.com/xtool-org/xtool/security/advisories/new) tab. We'll be in touch regarding next steps.
|
||||
@@ -0,0 +1 @@
|
||||
const char * _Nonnull xtl_version(void);
|
||||
@@ -0,0 +1,9 @@
|
||||
#include "version.h"
|
||||
|
||||
const char *xtl_version(void) {
|
||||
#ifdef XTOOL_VERSION
|
||||
return XTOOL_VERSION;
|
||||
#else
|
||||
return "unversioned";
|
||||
#endif
|
||||
}
|
||||
@@ -1299,7 +1299,6 @@ public enum Components {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/appAvailabilityV2`.
|
||||
public var appAvailabilityV2: Components.Schemas.App.RelationshipsPayload.AppAvailabilityV2Payload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/inAppPurchases`.
|
||||
@available(*, deprecated)
|
||||
public struct InAppPurchasesPayload: Codable, Hashable, Sendable {
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/inAppPurchases/links`.
|
||||
public var links: Components.Schemas.RelationshipLinks?
|
||||
@@ -1358,7 +1357,6 @@ public enum Components {
|
||||
}
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/inAppPurchases`.
|
||||
@available(*, deprecated)
|
||||
public var inAppPurchases: Components.Schemas.App.RelationshipsPayload.InAppPurchasesPayload?
|
||||
/// - Remark: Generated from `#/components/schemas/App/relationships/subscriptionGroups`.
|
||||
public struct SubscriptionGroupsPayload: Codable, Hashable, Sendable {
|
||||
@@ -5021,6 +5019,8 @@ public enum Components {
|
||||
case ios = "IOS"
|
||||
case macOs = "MAC_OS"
|
||||
case universal = "UNIVERSAL"
|
||||
case services = "SERVICES"
|
||||
case macos = "MACOS"
|
||||
}
|
||||
/// - Remark: Generated from `#/components/schemas/CapabilityOption`.
|
||||
public struct CapabilityOption: Codable, Hashable, Sendable {
|
||||
|
||||
@@ -3,6 +3,7 @@ info:
|
||||
title: Overlay for App Store Connect API
|
||||
version: 1.0.0
|
||||
actions:
|
||||
# this field is required when using the private Xcode API
|
||||
- target: '$.components.schemas.BundleIdCapabilityCreateRequest.properties.data.properties.relationships'
|
||||
update:
|
||||
properties:
|
||||
@@ -20,6 +21,22 @@ actions:
|
||||
required: [id, type]
|
||||
required: [data]
|
||||
required: [capability]
|
||||
# we don't use this but it triggers a deprecation warning. see:
|
||||
# https://github.com/apple/swift-openapi-generator/issues/715
|
||||
- target: '$.components.schemas.App.properties.relationships.properties.inAppPurchases'
|
||||
update:
|
||||
deprecated: false
|
||||
# openapi-generator expects response enums to be exhaustive. Apple's ASC OpenAPI spec
|
||||
# misses some cases that they do, actually, return.
|
||||
- target: '$.components.schemas.Device.properties.attributes.properties.deviceClass'
|
||||
update:
|
||||
enum: ["APPLE_VISION_PRO"]
|
||||
enum:
|
||||
- APPLE_VISION_PRO
|
||||
- target: '$.components.schemas.BundleIdPlatform'
|
||||
update:
|
||||
enum:
|
||||
- SERVICES
|
||||
# the spec already declares MAC_OS but ASC sometimes seems to
|
||||
# spell this as MACOS instead. see:
|
||||
# https://github.com/xtool-org/xtool/issues/64
|
||||
- MACOS
|
||||
|
||||
@@ -15,15 +15,14 @@ public struct BuildSettings: Sendable {
|
||||
|
||||
public init(
|
||||
configuration: BuildConfiguration,
|
||||
triple: String,
|
||||
packagePath: String = ".",
|
||||
options: [String] = []
|
||||
) async throws {
|
||||
self.packagePath = packagePath
|
||||
self.configuration = configuration
|
||||
self.options = options
|
||||
|
||||
// TODO: allow customizing?
|
||||
self.triple = "arm64-apple-ios"
|
||||
self.triple = triple
|
||||
|
||||
// on macOS we don't explicitly install a Swift SDK but
|
||||
// SwiftPM vends "implicit" Darwin SDKs as of Swift 6.1,
|
||||
|
||||
@@ -17,7 +17,8 @@ extension DeveloperAPIClient {
|
||||
),
|
||||
transport: httpClient.asOpenAPITransport,
|
||||
middlewares: [
|
||||
auth.middleware
|
||||
auth.middleware,
|
||||
LoggingMiddleware(),
|
||||
]
|
||||
)
|
||||
}
|
||||
@@ -219,3 +220,39 @@ public struct DeveloperAPIASCAuthMiddleware: ClientMiddleware {
|
||||
return try await next(request, body, baseURL)
|
||||
}
|
||||
}
|
||||
|
||||
struct LoggingMiddleware: ClientMiddleware {
|
||||
static let regex: NSRegularExpression? = {
|
||||
guard let pat = ProcessInfo.processInfo.environment["XTL_DEV_LOG"] else { return nil }
|
||||
return try? NSRegularExpression(pattern: pat)
|
||||
}()
|
||||
|
||||
func intercept(
|
||||
_ request: HTTPRequest,
|
||||
body: HTTPBody?,
|
||||
baseURL: URL,
|
||||
operationID: String,
|
||||
next: (HTTPRequest, HTTPBody?, URL) async throws -> (HTTPResponse, HTTPBody?)
|
||||
) async throws -> (HTTPResponse, HTTPBody?) {
|
||||
var (response, body) = try await next(request, body, baseURL)
|
||||
|
||||
guard Self.regex?.firstMatch(
|
||||
in: operationID,
|
||||
range: NSRange(operationID.startIndex..., in: operationID)
|
||||
) != nil
|
||||
else { return (response, body) }
|
||||
|
||||
print("\n\(operationID) response status -> \(response.status)")
|
||||
|
||||
if let unwrapped = body {
|
||||
let data = try await Data(collecting: unwrapped, upTo: .max)
|
||||
// body may only be consumable once, replace it with the collected data
|
||||
body = .init(data)
|
||||
|
||||
let text = String(decoding: data, as: UTF8.self)
|
||||
print("\(operationID) response body -> \(text)")
|
||||
}
|
||||
|
||||
return (response, body)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ public struct DeveloperServicesFetchProfileOperation: DeveloperServicesOperation
|
||||
data: .init(
|
||||
_type: .profiles,
|
||||
attributes: .init(
|
||||
name: "SC profile \(bundleID.id)",
|
||||
name: "XTL profile \(bundleID.id)",
|
||||
profileType: .iosAppDevelopment
|
||||
),
|
||||
relationships: .init(
|
||||
|
||||
@@ -129,6 +129,15 @@ public actor XADIProvider: RawADIProvider {
|
||||
}
|
||||
})
|
||||
let file = adiDirectory.appending(path: "adi.pb")
|
||||
// adi saves the file as 0o034 (group wx, public r) by default
|
||||
// which is a... strange choice that prevents us from reading
|
||||
// or writing by default. Since we're the owner, we can easily
|
||||
// change this though.
|
||||
try FileManager.default.setAttributes(
|
||||
// rw for owner
|
||||
[.posixPermissions: 0o600],
|
||||
ofItemAtPath: file.path
|
||||
)
|
||||
return try Data(contentsOf: file)
|
||||
}
|
||||
}
|
||||
@@ -148,9 +157,6 @@ public actor XADIProvider: RawADIProvider {
|
||||
let adiDirectory = directory.appending(path: "adi")
|
||||
try? FileManager.default.createDirectory(at: adiDirectory, withIntermediateDirectories: true)
|
||||
let adiFile = adiDirectory.appending(path: "adi.pb")
|
||||
// this file may be saved as write-protected, but we can still remove it
|
||||
// and then overwrite it.
|
||||
try? FileManager.default.removeItem(at: adiFile)
|
||||
try provisioningInfo.write(to: adiFile)
|
||||
|
||||
try check(xadi_OTPRequest(
|
||||
|
||||
@@ -18,6 +18,9 @@ struct PackOperation {
|
||||
}
|
||||
}
|
||||
|
||||
static let defaultTriple = "arm64-apple-ios"
|
||||
|
||||
var triple: String?
|
||||
var buildOptions = BuildOptions(configuration: .debug)
|
||||
var xcode = false
|
||||
|
||||
@@ -39,6 +42,7 @@ struct PackOperation {
|
||||
|
||||
let buildSettings = try await BuildSettings(
|
||||
configuration: buildOptions.configuration,
|
||||
triple: triple ?? Self.defaultTriple,
|
||||
options: []
|
||||
)
|
||||
|
||||
@@ -90,8 +94,16 @@ struct DevBuildCommand: AsyncParsableCommand {
|
||||
help: "Output a .ipa file instead of a .app"
|
||||
) var ipa = false
|
||||
|
||||
@Option(
|
||||
help: ArgumentHelp(
|
||||
"Custom target triple to build for",
|
||||
discussion: "Defaults to '\(PackOperation.defaultTriple)'"
|
||||
)
|
||||
) var triple: String?
|
||||
|
||||
func run() async throws {
|
||||
let url = try await PackOperation(
|
||||
triple: triple,
|
||||
buildOptions: packOptions
|
||||
).run()
|
||||
|
||||
@@ -136,10 +148,39 @@ struct DevRunCommand: AsyncParsableCommand {
|
||||
|
||||
@OptionGroup var packOptions: PackOperation.BuildOptions
|
||||
|
||||
#if os(macOS)
|
||||
@Flag(
|
||||
name: .shortAndLong,
|
||||
help: "Target the iOS Simulator"
|
||||
) var simulator = false
|
||||
|
||||
var triple: String? {
|
||||
if simulator {
|
||||
#if arch(arm64)
|
||||
return "arm64-apple-ios-simulator"
|
||||
#elseif arch(x86_64)
|
||||
return "x86_64-apple-ios-simulator"
|
||||
#else
|
||||
#error("Unsupported architecture")
|
||||
#endif
|
||||
}
|
||||
return nil
|
||||
}
|
||||
#else
|
||||
var triple: String? { nil }
|
||||
#endif
|
||||
|
||||
@OptionGroup var connectionOptions: ConnectionOptions
|
||||
|
||||
func run() async throws {
|
||||
let output = try await PackOperation(buildOptions: packOptions).run()
|
||||
let output = try await PackOperation(triple: triple, buildOptions: packOptions).run()
|
||||
|
||||
#if os(macOS)
|
||||
if simulator {
|
||||
try await SimInstallOperation(path: output).run()
|
||||
return
|
||||
}
|
||||
#endif
|
||||
|
||||
let token = try AuthToken.saved()
|
||||
|
||||
@@ -175,3 +216,20 @@ struct DevCommand: AsyncParsableCommand {
|
||||
}
|
||||
|
||||
extension BuildConfiguration: ExpressibleByArgument {}
|
||||
|
||||
#if os(macOS)
|
||||
struct SimInstallOperation {
|
||||
var path: URL
|
||||
|
||||
// TODO: allow customizing this
|
||||
var simulator = "booted"
|
||||
|
||||
func run() async throws {
|
||||
let process = Process()
|
||||
process.executableURL = URL(fileURLWithPath: "/usr/bin/xcrun")
|
||||
process.arguments = ["simctl", "install", simulator, path.path]
|
||||
try await process.runUntilExit()
|
||||
print("Installed to simulator")
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -149,7 +149,7 @@ struct SDKBuilder {
|
||||
}
|
||||
|
||||
private func installToolset(in output: URL) async throws {
|
||||
// tag from https://github.com/kabiroberai/darwin-tools-linux-llvm
|
||||
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
|
||||
let darwinToolsVersion = "1.0.1"
|
||||
|
||||
let toolsetDir = output.appendingPathComponent("toolset")
|
||||
@@ -169,7 +169,7 @@ struct SDKBuilder {
|
||||
|
||||
@Dependency(\.httpClient) var httpClient
|
||||
let url = URL(string: """
|
||||
https://github.com/kabiroberai/darwin-tools-linux-llvm/releases/download/\
|
||||
https://github.com/xtool-org/darwin-tools-linux-llvm/releases/download/\
|
||||
v\(darwinToolsVersion)/toolset-\(arch.rawValue).tar.gz
|
||||
""")!
|
||||
let (response, body) = try await httpClient.send(HTTPRequest(url: url))
|
||||
|
||||
@@ -13,6 +13,7 @@ struct SDKCommand: AsyncParsableCommand {
|
||||
DevSDKInstallCommand.self,
|
||||
DevSDKRemoveCommand.self,
|
||||
DevSDKBuildCommand.self,
|
||||
DevSDKStatusCommand.self,
|
||||
],
|
||||
defaultSubcommand: DevSDKInstallCommand.self
|
||||
)
|
||||
@@ -98,7 +99,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()
|
||||
@@ -106,11 +107,22 @@ struct DevSDKRemoveCommand: AsyncParsableCommand {
|
||||
}
|
||||
}
|
||||
|
||||
struct DarwinSDK {
|
||||
private static let sdksDir = URL(fileURLWithPath: NSHomeDirectory())
|
||||
.appendingPathComponent(".swiftpm/swift-sdks")
|
||||
.resolvingSymlinksInPath()
|
||||
struct DevSDKStatusCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "status",
|
||||
abstract: "Get the status of the Darwin Swift SDK"
|
||||
)
|
||||
|
||||
func run() async throws {
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Installed at \(sdk.bundle.path)")
|
||||
} else {
|
||||
print("Not installed")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct DarwinSDK {
|
||||
let bundle: URL
|
||||
let version: String
|
||||
|
||||
@@ -126,36 +138,55 @@ struct DarwinSDK {
|
||||
}
|
||||
}
|
||||
|
||||
@discardableResult
|
||||
static func install(movingFrom path: String) throws -> DarwinSDK {
|
||||
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 Console.Error("Invalid Darwin SDK at '\(path)'")}
|
||||
let targetURL = sdksDir.appendingPathComponent("darwin.artifactbundle")
|
||||
if targetURL.exists {
|
||||
throw Console.Error("Darwin SDK is already installed at '\(targetURL.path)'. Please remove it first.")
|
||||
}
|
||||
try? FileManager.default.createDirectory(at: sdksDir, withIntermediateDirectories: true)
|
||||
try FileManager.default.moveItem(at: url, to: targetURL)
|
||||
guard let sdk = DarwinSDK(bundle: targetURL) else {
|
||||
throw Console.Error("Darwin SDK failed to install")
|
||||
}
|
||||
return sdk
|
||||
|
||||
let process = Process()
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
process.arguments = ["sdk", "install", url.path]
|
||||
try await process.runUntilExit()
|
||||
}
|
||||
|
||||
static func current() throws -> DarwinSDK? {
|
||||
let sdks = (try? FileManager.default.contentsOfDirectory(at: sdksDir, includingPropertiesForKeys: nil)) ?? []
|
||||
let darwinSDKs = sdks.compactMap { DarwinSDK(bundle: $0) }
|
||||
switch darwinSDKs.count {
|
||||
case 0:
|
||||
static func current() async throws -> DarwinSDK? {
|
||||
let output = Pipe()
|
||||
|
||||
let process = Process()
|
||||
process.executableURL = try await ToolRegistry.locate("swift")
|
||||
process.arguments = ["sdk", "configure", "darwin", "arm64-apple-ios", "--show-configuration"]
|
||||
process.standardOutput = output
|
||||
process.standardError = FileHandle.nullDevice
|
||||
|
||||
async let outputData = Data(reading: output.fileHandleForReading)
|
||||
|
||||
do {
|
||||
try await process.runUntilExit()
|
||||
} catch Process.Failure.exit {
|
||||
return nil
|
||||
case 1:
|
||||
return darwinSDKs[0]
|
||||
default:
|
||||
throw Console.Error("""
|
||||
You have multiple copies of the Darwin SDK installed. Please delete all but one to continue.
|
||||
\(darwinSDKs.map { "- \($0.bundle.path) (version '\($0.version)')" }.joined(separator: "\n"))
|
||||
""")
|
||||
}
|
||||
|
||||
// should be something like
|
||||
// swiftResourcesPath: /home/user/.swiftpm/swift-sdks/darwin.artifactbundle/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
|
||||
let resourcesPathPrefix = "swiftResourcesPath: "
|
||||
let outputString = String(decoding: try await outputData, as: UTF8.self)
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
func isUpToDate() -> Bool {
|
||||
@@ -210,7 +241,7 @@ struct InstallSDKOperation {
|
||||
#if os(macOS)
|
||||
print("Skipping SDK install; the iOS SDK ships with Xcode on macOS")
|
||||
#else
|
||||
if let sdk = try DarwinSDK.current() {
|
||||
if let sdk = try await DarwinSDK.current() {
|
||||
print("Removing existing SDK...")
|
||||
try sdk.remove()
|
||||
}
|
||||
@@ -222,12 +253,10 @@ struct InstallSDKOperation {
|
||||
let builder = SDKBuilder(input: input, outputPath: tempDir.url.path, arch: arch)
|
||||
let sdkPath = try await builder.buildSDK()
|
||||
|
||||
try DarwinSDK.install(movingFrom: sdkPath)
|
||||
try await DarwinSDK.install(from: sdkPath)
|
||||
|
||||
// don't destroy tempDir before this point
|
||||
withExtendedLifetime(tempDir) {}
|
||||
|
||||
print("Installed darwin.artifactbundle")
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ struct SetupOperation {
|
||||
print("Skipping Darwin SDK setup since we're on macOS.")
|
||||
}
|
||||
#else
|
||||
switch try DarwinSDK.current()?.isUpToDate() {
|
||||
switch try await DarwinSDK.current()?.isUpToDate() {
|
||||
case true?:
|
||||
if !quiet {
|
||||
print("Darwin SDK is up to date.")
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
import CXKit
|
||||
|
||||
extension XTool {
|
||||
public static let version = String(cString: xtl_version())
|
||||
}
|
||||
@@ -8,10 +8,11 @@ public enum XTool {
|
||||
}
|
||||
}
|
||||
|
||||
struct XToolCommand: AsyncParsableCommand {
|
||||
private struct XToolCommand: AsyncParsableCommand {
|
||||
static let configuration = CommandConfiguration(
|
||||
commandName: "xtool",
|
||||
abstract: "Cross-platform Xcode replacement",
|
||||
version: "xtool \(XTool.version)",
|
||||
groupedSubcommands: [
|
||||
CommandGroup(
|
||||
name: "Configuration",
|
||||
@@ -6,4 +6,7 @@ ENABLE_HARDENED_RUNTIME = YES
|
||||
PRODUCT_NAME = xtool
|
||||
PRODUCT_MODULE_NAME = XToolMac
|
||||
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = public.app-category.developer-tools
|
||||
|
||||
#include? "Private-Team.xcconfig"
|
||||
#include? "Private.xcconfig"
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
[build]
|
||||
# by setting a custom base directory, we prevent Netlify from running
|
||||
# `swift build` in the root directory, which builds more targets than
|
||||
# we need.
|
||||
base = "Documentation/"
|
||||
publish = "xtool.docc/.docc-build"
|
||||
command = "./build.sh"
|
||||
environment = { SWIFT_VERSION = "6.1" }
|
||||
ignore = "git -C .. diff --quiet $CACHED_COMMIT_REF $COMMIT_REF -- Documentation netlify.toml"
|
||||
|
||||
[[redirects]]
|
||||
from = "/"
|
||||
to = "/documentation/xtool/"
|
||||
status = 302
|
||||
force = true
|
||||
|
||||
[[redirects]]
|
||||
from = "/documentation"
|
||||
to = "/documentation/xtool/"
|
||||
status = 302
|
||||
force = true
|
||||
|
||||
[[redirects]]
|
||||
from = "/tutorials"
|
||||
to = "/tutorials/xtool"
|
||||
status = 302
|
||||
force = true
|
||||
|
||||
# --- Backwards compatibility ---
|
||||
|
||||
[[redirects]]
|
||||
from = "/tutorials/toc"
|
||||
to = "/tutorials/xtool"
|
||||
status = 302
|
||||
|
||||
[[redirects]]
|
||||
from = "/documentation/xtooldocs/*"
|
||||
to = "/documentation/xtool/:splat"
|
||||
status = 302
|
||||
|
||||
[[redirects]]
|
||||
from = "/tutorials/xtooldocs/*"
|
||||
to = "/tutorials/xtool/:splat"
|
||||
status = 302
|
||||
@@ -0,0 +1,31 @@
|
||||
#!/bin/bash
|
||||
|
||||
# we can't simply extract the portion in brackets because some times the Organizational Unit is different from that
|
||||
# so extract that info from the certificate
|
||||
function get_team {
|
||||
security find-certificate -pc "$1" | openssl x509 -noout -subject | grep -o 'OU=[A-Z0-9]*' | cut -d= -f2
|
||||
}
|
||||
|
||||
IFS=$'\n' names=($(security find-identity -vp codesigning | grep -E '(?:iPhone Developer|Apple Development):' | cut -d'"' -f2 | uniq))
|
||||
if [[ "${#names[@]}" -eq 1 ]]; then
|
||||
identity="${names[0]}"
|
||||
else
|
||||
echo "Select identity" >&2
|
||||
for i in "${!names[@]}"; do
|
||||
cur_identity="${names[$i]}"
|
||||
cur_team="$(get_team "$cur_identity")"
|
||||
printf "%s. %s '%s'\n" $((i + 1)) "$cur_team" "$cur_identity" >&2
|
||||
done
|
||||
# ask for choice until the user supplies a valid answer
|
||||
function select_identity {
|
||||
read -p "Choice (enter number): " identity_idx >&2
|
||||
if [[ "$identity_idx" -lt 1 || "$identity_idx" -gt "${#names[@]}" ]]; then
|
||||
select_identity
|
||||
else
|
||||
identity="${names[$((identity_idx - 1))]}"
|
||||
fi
|
||||
}
|
||||
select_identity
|
||||
fi
|
||||
|
||||
get_team "$identity"
|
||||