mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-05-17 08:01:14 -03:00
081c469f6f
The problem worked around by commit e4674cd7b5 (.cargo/config.toml:
exclude from tarball, 2025-01-12) is as follows:
our OBS packages are built by doing something like
tar xf $tarball && tar xf $vendor_tarball
except that the tool apparently break when a file is present in
both tarballs.
Our workaround is to not include .cargo/config.toml in the tarball.
The workaround seems too broad. It need not affect all tarballs
but only the ones used by OBS. We want to add xtask aliases to
.cargo/config.toml. They will be used by CMake targets (sphinx-doc),
so they should be available to tarball consumers.
Restrict the scope of the workaround: add back .cargo/config.toml
to the export, and allow opting in to this behavioer by passing a
negative pathspec
build_tools/make_tarball.sh :/!.cargo/config.toml
62 lines
1.7 KiB
Bash
Executable File
62 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# Script to generate a tarball of vendored (downloaded) Rust dependencies
|
|
# and the cargo configuration to ensure they are used
|
|
# This tarball should be unpacked into a fish source directory
|
|
# Outputs to $FISH_ARTEFACT_PATH or ~/fish_built by default
|
|
|
|
# Exit on error
|
|
set -e
|
|
|
|
# We need GNU tar as that supports the --mtime and --transform options
|
|
TAR=notfound
|
|
for try in tar gtar gnutar; do
|
|
if $try -Pcf /dev/null --mtime now /dev/null >/dev/null 2>&1; then
|
|
TAR=$try
|
|
break
|
|
fi
|
|
done
|
|
|
|
if [ "$TAR" = "notfound" ]; then
|
|
echo 'No suitable tar (supporting --mtime) found as tar/gtar/gnutar in PATH'
|
|
exit 1
|
|
fi
|
|
|
|
# Get the current directory, which we'll use for telling Cargo where to find the sources
|
|
wd="$PWD"
|
|
|
|
# Get the version from git-describe
|
|
VERSION=$(build_tools/git_version_gen.sh)
|
|
|
|
# The name of the prefix, which is the directory that you get when you untar
|
|
prefix="fish-$VERSION"
|
|
|
|
# The path where we will output the tar file
|
|
# Defaults to ~/fish_built
|
|
path=${FISH_ARTEFACT_PATH:-~/fish_built}/$prefix-vendor.tar
|
|
|
|
# Clean up stuff we've written before
|
|
rm -f "$path" "$path".xz
|
|
|
|
# Work in a temporary directory to avoid clobbering the source directory
|
|
PREFIX_TMPDIR=$(mktemp -d)
|
|
cd "$PREFIX_TMPDIR"
|
|
|
|
# Add .cargo/config.toml. This means that the caller may need to remove that file from the tarball.
|
|
# See e4674cd7b5f (.cargo/config.toml: exclude from tarball, 2025-01-12)
|
|
|
|
mkdir .cargo
|
|
{
|
|
cat "$wd"/.cargo/config.toml
|
|
cargo vendor --manifest-path "$wd/Cargo.toml"
|
|
} > .cargo/config.toml
|
|
|
|
tar cfvJ "$path".xz vendor .cargo
|
|
|
|
cd -
|
|
rm -r "$PREFIX_TMPDIR"
|
|
|
|
# Output what we did, and the sha256 hash
|
|
echo "Tarball written to $path".xz
|
|
openssl dgst -sha256 "$path".xz
|