mirror of
https://github.com/kuraeow/ultratears.git
synced 2026-11-07 10:16:00 -10:00
The release's inputs (the Linux kit, the AppImage runtime, linux-used.txt) in dev-local/release-inputs: release/ holds only the two files to attach
Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
7c3e226f3c
commit
a7543b5dda
5 files changed
+12
-11
No files matched your search
+3
-2
@@ -117,8 +117,9 @@ Then, on Linux (under WSL on an ext4 file system: `/mnt/c` and `/mnt/d` lose the
|
||||
python3 tools/make_package_linux.py --xlate <ultrs-shaders> --launcher <ultratears-launcher> # release/*.AppImage
|
||||
```
|
||||
|
||||
It takes from `release\` the Linux kit (`ultrs-linux-kit.zip`, `tools/make_linux_kit.py`), `linux-used.txt` and the
|
||||
AppImage runtime with this project's patch (`runtime-x86_64`, [tools/appimage_runtime](tools/appimage_runtime/README.md)).
|
||||
It takes from `dev-local\release-inputs\` the Linux kit (`ultrs-linux-kit.zip`, `tools/make_linux_kit.py`),
|
||||
`linux-used.txt` and the AppImage runtime with this project's patch (`runtime-x86_64`,
|
||||
[tools/appimage_runtime](tools/appimage_runtime/README.md)), so `release\` holds only the two files of the release.
|
||||
|
||||
And back on Windows:
|
||||
|
||||
|
||||
@@ -25,5 +25,5 @@ starts it, with `--play` as the only launch option.
|
||||
Its own build: `scripts/chroot/chroot_build.sh` of type2-runtime with `ALPINE_ARCH=x86_64` (an Alpine minirootfs chroot,
|
||||
verified with Alpine's key, builds static libfuse 3.15.0 and squashfuse 0.5.2 by their pinned hashes, then the runtime).
|
||||
It needs root (chroot, mounts) and gpg2. In this project's development setup: `dev-local/wsl/runtime.sh` in WSL, inside
|
||||
the ext4 image `dev-local/wsl/stage.img`, gives `release/runtime-x86_64`; `tools/make_package_linux.py --runtime`
|
||||
the ext4 image `dev-local/wsl/stage.img`, gives `dev-local/release-inputs/runtime-x86_64`; `tools/make_package_linux.py --runtime`
|
||||
takes it (the default path).
|
||||
+2
-2
@@ -8,7 +8,7 @@ encoder's sources (tools/bc7_build.py builds it on Linux too; clang -M with the
|
||||
links the game and the encoder (--verbose). The result is a list of paths: linux/<path in deps/linux> and
|
||||
clang/include/<header> (clang's resource headers, whatever its version).
|
||||
|
||||
usage: python tools/linux_used.py --home ../release-test [--out release/linux-used.txt]
|
||||
usage: python tools/linux_used.py --home ../release-test [--out dev-local/release-inputs/linux-used.txt]
|
||||
"""
|
||||
import argparse
|
||||
import pathlib
|
||||
@@ -148,7 +148,7 @@ def trim(top, prefix, used):
|
||||
def main():
|
||||
ap = argparse.ArgumentParser()
|
||||
ap.add_argument('--home', type=pathlib.Path, required=True, help='a game folder that built the game for Linux')
|
||||
ap.add_argument('--out', type=pathlib.Path, default=ROOT / 'release/linux-used.txt')
|
||||
ap.add_argument('--out', type=pathlib.Path, default=ROOT / 'dev-local/release-inputs/linux-used.txt')
|
||||
a = ap.parse_args()
|
||||
used = measure(a.home.resolve())
|
||||
a.out.parent.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
@@ -207,9 +207,9 @@ def main():
|
||||
ap.add_argument('--python', type=pathlib.Path, default=pathlib.Path(sys.base_prefix))
|
||||
ap.add_argument('--no-zip', action='store_true')
|
||||
ap.add_argument('--home', type=pathlib.Path, default=ROOT / 'build') # tools/setup.py's default output
|
||||
ap.add_argument('--linux-kit', type=pathlib.Path, default=ROOT / 'release/ultrs-linux-kit.zip',
|
||||
ap.add_argument('--linux-kit', type=pathlib.Path, default=ROOT / 'dev-local/release-inputs/ultrs-linux-kit.zip',
|
||||
help='the Linux kit (tools/make_linux_kit.py) the package carries in deps/linux')
|
||||
ap.add_argument('--used', type=pathlib.Path, default=ROOT / 'release/linux-used.txt',
|
||||
ap.add_argument('--used', type=pathlib.Path, default=ROOT / 'dev-local/release-inputs/linux-used.txt',
|
||||
help='what a build for Linux reads of the Linux kit (tools/linux_used.py)')
|
||||
ap.add_argument('--linux-package', type=pathlib.Path, default=ROOT / 'release',
|
||||
help="the folder with this release's AppImage (tools/make_package_linux.py): named with its hash in "
|
||||
|
||||
@@ -3,7 +3,7 @@ from the Linux builder package folder release/UltraTears-builder-<version>-linux
|
||||
dev-local/wsl/build_test.sh; not published: the release is the Windows zip and this AppImage).
|
||||
|
||||
usage: python3 tools/make_package_linux.py --xlate <linux ultrs-shaders> --launcher <linux ultratears-launcher>
|
||||
[--linux-kit release/ultrs-linux-kit.zip] [--test] [--no-appimage]
|
||||
[--linux-kit dev-local/release-inputs/ultrs-linux-kit.zip] [--test] [--no-appimage]
|
||||
The same as the Windows builder package (tools/make_package.py) with the Linux tools: the source (the public tree of
|
||||
HEAD, without NOT_IN_PACKAGE), deps/python (python-build-standalone with the build's wheels) and deps/llvm (clang, lld,
|
||||
the clang resource headers for x86, ninja) from the pins of tools/deps.json "linux_host"
|
||||
@@ -152,12 +152,12 @@ def main():
|
||||
ap = argparse.ArgumentParser()
|
||||
ap.add_argument('--xlate', type=pathlib.Path, required=True)
|
||||
ap.add_argument('--launcher', type=pathlib.Path, required=True)
|
||||
ap.add_argument('--linux-kit', type=pathlib.Path, default=ROOT / 'release/ultrs-linux-kit.zip')
|
||||
ap.add_argument('--linux-kit', type=pathlib.Path, default=ROOT / 'dev-local/release-inputs/ultrs-linux-kit.zip')
|
||||
ap.add_argument('--test', action='store_true', help='a package of an untagged commit (for testing, never released)')
|
||||
ap.add_argument('--no-appimage', action='store_true')
|
||||
ap.add_argument('--used', type=pathlib.Path, default=ROOT / 'release/linux-used.txt',
|
||||
ap.add_argument('--used', type=pathlib.Path, default=ROOT / 'dev-local/release-inputs/linux-used.txt',
|
||||
help='what a build for Linux reads of the Linux kit (tools/linux_used.py)')
|
||||
ap.add_argument('--runtime', type=pathlib.Path, default=ROOT / 'release/runtime-x86_64',
|
||||
ap.add_argument('--runtime', type=pathlib.Path, default=ROOT / 'dev-local/release-inputs/runtime-x86_64',
|
||||
help='the AppImage runtime built with tools/appimage_runtime (see its README.md)')
|
||||
a = ap.parse_args()
|
||||
if not sys.platform.startswith('linux'):
|
||||
|
||||
Reference in new issue
Block a user