zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-06 10:57:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

linux scripts: Respect $CARGO_TARGET_DIR (#13830)

Browse Source 
https://doc.rust-lang.org/cargo/reference/environment-variables.html

Some people (myself included) set this variable to have a single
directory to clean up (or whatever reason one might have for having a
single `target` directory). This changes the linux scripts to respect
that

Release Notes:

- N/A
This commit is contained in:
Chinmay Dalal 2024-07-05 16:49:05 +05:30 committed by GitHub
parent fc8749ffd7
commit 1260b52c82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
script/bundle-linux
View File

@ -26,6 +26,7 @@ done
export ZED_BUNDLE=true
channel=$(<crates/zed/RELEASE_CHANNEL)
target_dir="${CARGO_TARGET_DIR:-target}"
version="$(script/get-crate-version zed)"
# Set RELEASE_VERSION so it's compiled into GPUI and it knows about the version.
@ -43,8 +44,8 @@ cargo build --release --target "${target_triple}" --package zed --package cli
# Strip the binary of all debug symbols
# Later, we probably want to do something like this: https://github.com/GabrielMajeri/separate-symbols
strip --strip-debug "target/${target_triple}/release/zed"
strip --strip-debug "target/${target_triple}/release/cli"
strip --strip-debug "${target_dir}/${target_triple}/release/zed"
strip --strip-debug "${target_dir}/${target_triple}/release/cli"
suffix=""
if [ "$channel" != "stable" ]; then
@ -58,12 +59,12 @@ zed_dir="${temp_dir}/zed$suffix.app"
# Binary
mkdir -p "${zed_dir}/bin" "${zed_dir}/libexec"
cp "target/${target_triple}/release/zed" "${zed_dir}/libexec/zed-editor"
cp "target/${target_triple}/release/cli" "${zed_dir}/bin/zed"
cp "${target_dir}/${target_triple}/release/zed" "${zed_dir}/libexec/zed-editor"
cp "${target_dir}/${target_triple}/release/cli" "${zed_dir}/bin/zed"
# Libs
find_libs() {
ldd target/${target_triple}/release/zed |\
ldd ${target_dir}/${target_triple}/release/zed |\
cut -d' ' -f3 |\
grep -v '\<\(libstdc++.so\|libc.so\|libgcc_s.so\|libm.so\|libpthread.so\|libdl.so\)'
}
@ -109,5 +110,5 @@ fi
rm -rf "${archive}"
remove_match="zed(-[a-zA-Z0-9]+)?-linux-$(uname -m)\.tar\.gz"
ls target/release | grep -E ${remove_match} | xargs -d "\n" -I {} rm -f target/release/{} || true
tar -czvf target/release/$archive -C ${temp_dir} "zed$suffix.app"
ls "${target_dir}/release" | grep -E ${remove_match} | xargs -d "\n" -I {} rm -f "${target_dir}/release/{}" || true
tar -czvf "${target_dir}/release/$archive" -C ${temp_dir} "zed$suffix.app"

2
script/install-linux
View File

@ -22,5 +22,5 @@ if [[ "$ZED_CHANNEL" == "dev" ]]; then
else
archive="zed-${target}.tar.gz"
fi
export ZED_BUNDLE_PATH="target/release/${archive}"
export ZED_BUNDLE_PATH="${CARGO_TARGET_DIR:-target}/release/${archive}"
script/install.sh