From b0c5fe6509f07bc8effe56987b45ff70860792f0 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 18 Apr 2023 18:57:33 +0200 Subject: [PATCH] Make some further minor improvements to Mac build script --- setup/macos/build.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/setup/macos/build.sh b/setup/macos/build.sh index f0497848..f84c00ea 100755 --- a/setup/macos/build.sh +++ b/setup/macos/build.sh @@ -20,13 +20,14 @@ cleanup () { trap cleanup EXIT echo "Script Dir: $SCRIPT_DIR" -echo "Building in: $BUILD_DIR" - -# --- Prepare Files ----------------------------------------------------------------------------- # +echo "Build Dir: $BUILD_DIR" pushd "$SRC_DIR" || exit 1 VERSION="$(python3 setup.py version)" +echo "novelWriter Version: $VERSION" + +# --- Prepare Files ----------------------------------------------------------------------------- # echo "Generating Info.plist" python3 setup.py gen-plist @@ -72,16 +73,15 @@ bash Miniconda3-latest-MacOSX-x86_64.sh -b -p ~/miniconda -f rm Miniconda3-latest-MacOSX-x86_64.sh export PATH="$HOME/miniconda/bin:$PATH" -echo "Creating conda env ..." - +echo "Creating Conda env ..." conda create -n novelWriter -c conda-forge python=3.10 --yes source activate novelWriter -echo "installing dictionaries ..." +echo "Installing dictionaries ..." conda install -c conda-forge enchant hunspell-en --yes # Install dependencies -echo "installing python dependencies ..." +echo "Installing Python dependencies ..." pip install -r "$SRC_DIR/requirements.txt" # Leave conda env @@ -89,7 +89,7 @@ conda deactivate # --- Build App --------------------------------------------------------------------------------- # -echo "Building app bundle ..." +echo "Building App bundle ..." # Create .app Framework mkdir -p novelWriter.app/Contents/ @@ -128,7 +128,6 @@ chmod a+x novelWriter.app/Contents/MacOS/novelWriter # echo "Signing bundle ..." # sudo codesign --sign - --deep --force --entitlements "$SCRIPT_DIR/../macos/App.entitlements" --options runtime "novelWriter.app/Contents/MacOS/novelWriter" - # --- Cleanup ----------------------------------------------------------------------------------- # echo "Cleaning unused files from bundle ..."