From bb3aa0a206d3ef023206f7cf38334c6a05059160 Mon Sep 17 00:00:00 2001 From: Willi Mutschler Date: Wed, 27 Sep 2023 12:15:11 +0200 Subject: [PATCH] macOS installer: cosmetical changes --- macOS/build.sh | 9 +++++---- macOS/conclusion_template.html | 4 ++-- macOS/distribution_template.xml | 2 +- scripts/homebrew-native-arm64.ini | 2 +- scripts/homebrew-native-x86_64.ini | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/macOS/build.sh b/macOS/build.sh index 10fcf8964..28357a90a 100755 --- a/macOS/build.sh +++ b/macOS/build.sh @@ -18,6 +18,7 @@ # along with Dynare. If not, see . set -ex +#exec > >(tee build-logfile.log) 2>&1 # uncomment for debugging ROOTDIR=$(pwd)/.. ## @@ -37,9 +38,9 @@ else path_remove PATH /opt/homebrew/bin MATLAB_ARCH=maci64 # On x86_64 we need to differentiate between older and newer MATLAB versions - MATLAB_PATH_OLD=/Applications/MATLAB_R2016b.app + OLD_MATLAB_PATH=/Applications/MATLAB_R2016b.app fi -MATLAB_PATH_NEW=/Applications/"$PKG_ARCH"/MATLAB_R2023b.app +MATLAB_PATH=/Applications/"$PKG_ARCH"/MATLAB_R2023b.app # Append texbin to PATH to access latexmk and friends path_prepend PATH /Library/TeX/texbin @@ -71,12 +72,12 @@ common_meson_opts=(-Dbuild_for=matlab -Dbuildtype=release -Dprefer_static=true - --native-file scripts/homebrew-native-$PKG_ARCH.ini) # Build for MATLAB ⩾ R2018a (x86_64) and MATLAB ⩾ R2023b (arm64) -arch -$PKG_ARCH meson setup "${common_meson_opts[@]}" -Dmatlab_path="$MATLAB_PATH_NEW" build-matlab --wipe +arch -"$PKG_ARCH" meson setup "${common_meson_opts[@]}" -Dmatlab_path="$MATLAB_PATH" build-matlab --wipe arch -$PKG_ARCH meson compile -v -C build-matlab if [[ $PKG_ARCH == x86_64 ]]; then # Build for MATLAB < R2018a - arch -$PKG_ARCH meson setup "${common_meson_opts[@]}" -Dmatlab_path="$MATLAB_PATH_OLD" build-old-matlab --wipe + arch -"$PKG_ARCH" meson setup "${common_meson_opts[@]}" -Dmatlab_path="$OLD_MATLAB_PATH" build-old-matlab --wipe arch -$PKG_ARCH meson compile -v -C build-old-matlab fi diff --git a/macOS/conclusion_template.html b/macOS/conclusion_template.html index 5f88c45be..4952a9063 100644 --- a/macOS/conclusion_template.html +++ b/macOS/conclusion_template.html @@ -2,7 +2,7 @@ - Postinstallation Recommendations + Recommendations