Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix mac bundling errors (#9848)

Browse source 
Based on
https://github.com/zed-industries/zed/pull/8952#issuecomment-2021693384
and
https://github.com/zed-industries/zed/pull/8952#issuecomment-2022241455

Fixes `./script/bundle-mac -l` workflow errors

* Use proper WebRTC.framework location path (without the arch name dir
in its path)

* Fix `./script/bundle-mac -l` behavior that unconditionally installed
the app and broke it on rerun.
Now the installation is done with `-i` flag only and always cleans up
the target dir (always using `-f` flag logic, hence removed it).


Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2024-03-27 12:04:32 +01:00 • committed by GitHub
parent 140b8418c1
commit 63f17c50b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
script/bundle-mac
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euxo pipefail set -euo pipefail
source script/lib/blob-store.sh source script/lib/blob-store.sh
build_flag="--release" build_flag="--release"
@ -8,7 +8,7 @@ target_dir="release"
open_result=false open_result=false
local_arch=false local_arch=false
local_only=false local_only=false
overwrite_local_app=false local_install=false
bundle_name="" bundle_name=""
zed_crate="zed" zed_crate="zed"
binary_name="Zed" binary_name="Zed"
@ -25,13 +25,13 @@ Build the application bundle for macOS.
Options: Options:
-d Compile in debug mode -d Compile in debug mode
-l Compile for local architecture and copy bundle to /Applications, implies -d. -l Compile for local architecture and copy bundle to /Applications, implies -d.
-o Open the resulting DMG or the app itself in local mode. -o Open dir with the resulting DMG or launch the app itself in local mode.
-f Overwrite the local app bundle if it exists. -i Install the resulting DMG into /Applications in local mode. Noop without -l.
-h Display this help and exit. -h Display this help and exit.
" "
} }
while getopts 'dlfoh' flag while getopts 'dloih' flag
do do
case "${flag}" in case "${flag}" in
o) open_result=true;; o) open_result=true;;
@ -49,7 +49,7 @@ do
local_only=true local_only=true
target_dir="debug" target_dir="debug"
;; ;;
f) overwrite_local_app=true;; i) local_install=true;;
h) h)
help_info help_info
exit 0 exit 0
@ -152,8 +152,8 @@ function sign_binaries() {
if [ "$local_arch" = false ]; then if [ "$local_arch" = false ]; then
cp -R target/${local_target_triple}/${target_dir}/WebRTC.framework "${app_path}/Contents/Frameworks/" cp -R target/${local_target_triple}/${target_dir}/WebRTC.framework "${app_path}/Contents/Frameworks/"
else else
cp -R target/${architecture_dir}/${target_dir}/WebRTC.framework "${app_path}/Contents/Frameworks/" cp -R target/${target_dir}/WebRTC.framework "${app_path}/Contents/Frameworks/"
cp -R target/${architecture_dir}/${target_dir}/cli "${app_path}/Contents/MacOS/" cp -R target/${target_dir}/cli "${app_path}/Contents/MacOS/"
fi fi
# Note: The app identifier for our development builds is the same as the app identifier for nightly. # Note: The app identifier for our development builds is the same as the app identifier for nightly.
@ -218,16 +218,19 @@ function sign_binaries() {
fi fi
if [ "$local_only" = true ]; then if [ "$local_only" = true ]; then
if [ "$overwrite_local_app" = true ]; then if [ "$local_install" = true ]; then
rm -rf "/Applications/$bundle_name" rm -rf "/Applications/$bundle_name"
fi mv "$app_path" "/Applications/$bundle_name"
mv "$app_path" "/Applications/$bundle_name" echo "Installed application bundle: /Applications/$bundle_name"
if [ "$open_result" = true ]; then
if [ "$open_result" = true ]; then echo "Opening /Applications/$bundle_name"
open "/Applications/$bundle_name" open "/Applications/$bundle_name"
fi
else else
echo "Installed application bundle:" if [ "$open_result" = true ]; then
echo "/Applications/$bundle_name" echo "Opening $app_path"
open "$app_path"
fi
fi fi
else else
dmg_target_directory="target/${architecture_dir}/${target_dir}" dmg_target_directory="target/${architecture_dir}/${target_dir}"