please work

This commit is contained in:
Mikayla 2023-11-18 10:46:35 -08:00
parent 461fa8d71e
commit ede7656f02
No known key found for this signature in database
4 changed files with 8 additions and 7 deletions

3
Cargo.lock generated
View File

@ -4538,7 +4538,7 @@ dependencies = [
"anyhow",
"chrono",
"dirs 4.0.0",
"editor",
"editor2",
"gpui2",
"log",
"schemars",
@ -11625,7 +11625,6 @@ dependencies = [
"isahc",
"journal2",
"language2",
"language_tools",
"lazy_static",
"libc",
"log",

View File

@ -9,7 +9,7 @@ path = "src/journal2.rs"
doctest = false
[dependencies]
editor = { path = "../editor" }
editor = { package = "editor2", path = "../editor2" }
gpui = { package = "gpui2", path = "../gpui2" }
util = { path = "../util" }
workspace2 = { path = "../workspace2" }
@ -24,4 +24,4 @@ log.workspace = true
shellexpand = "2.1.0"
[dev-dependencies]
editor = { path = "../editor", features = ["test-support"] }
editor = { package="editor2", path = "../editor2", features = ["test-support"] }

View File

@ -48,7 +48,7 @@ language = { package = "language2", path = "../language2" }
# language_selector = { path = "../language_selector" }
lsp = { package = "lsp2", path = "../lsp2" }
menu = { package = "menu2", path = "../menu2" }
language_tools = { path = "../language_tools" }
# language_tools = { path = "../language_tools" }
node_runtime = { path = "../node_runtime" }
# assistant = { path = "../assistant" }
# outline = { path = "../outline" }

View File

@ -112,13 +112,15 @@ mv Cargo.toml.backup Cargo.toml
popd
echo "Bundled ${app_path}"
zed_app_name=$(basename "${app_path}")
if [ "$local_arch" = false ]; then
echo "Creating fat binaries"
lipo \
-create \
target/{x86_64-apple-darwin,aarch64-apple-darwin}/${target_dir}/Zed \
target/{x86_64-apple-darwin,aarch64-apple-darwin}/${target_dir}/$zed_app_name \
-output \
"${app_path}/Contents/MacOS/zed"
"${app_path}/Contents/MacOS/${zed_crate}"
lipo \
-create \
target/{x86_64-apple-darwin,aarch64-apple-darwin}/${target_dir}/cli \