macOS installer: cosmetical changes
parent
cc9102248c
commit
bb3aa0a206
|
@ -18,6 +18,7 @@
|
||||||
# along with Dynare. If not, see <https://www.gnu.org/licenses/>.
|
# along with Dynare. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
#exec > >(tee build-logfile.log) 2>&1 # uncomment for debugging
|
||||||
|
|
||||||
ROOTDIR=$(pwd)/..
|
ROOTDIR=$(pwd)/..
|
||||||
##
|
##
|
||||||
|
@ -37,9 +38,9 @@ else
|
||||||
path_remove PATH /opt/homebrew/bin
|
path_remove PATH /opt/homebrew/bin
|
||||||
MATLAB_ARCH=maci64
|
MATLAB_ARCH=maci64
|
||||||
# On x86_64 we need to differentiate between older and newer MATLAB versions
|
# 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
|
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
|
# Append texbin to PATH to access latexmk and friends
|
||||||
path_prepend PATH /Library/TeX/texbin
|
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)
|
--native-file scripts/homebrew-native-$PKG_ARCH.ini)
|
||||||
|
|
||||||
# Build for MATLAB ⩾ R2018a (x86_64) and MATLAB ⩾ R2023b (arm64)
|
# 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
|
arch -$PKG_ARCH meson compile -v -C build-matlab
|
||||||
|
|
||||||
if [[ $PKG_ARCH == x86_64 ]]; then
|
if [[ $PKG_ARCH == x86_64 ]]; then
|
||||||
# Build for MATLAB < R2018a
|
# 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
|
arch -$PKG_ARCH meson compile -v -C build-old-matlab
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<title>Postinstallation Recommendations</title>
|
<title>Recommendations</title>
|
||||||
<style>
|
<style>
|
||||||
.center-text {
|
.center-text {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header class="center-text">
|
<header class="center-text">
|
||||||
<h1>Postinstallation Recommendations</h1>
|
<h1>Recommendations</h1>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<main>
|
<main>
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<choices-outline>
|
<choices-outline>
|
||||||
<line choice="default" />
|
<line choice="default" />
|
||||||
</choices-outline>
|
</choices-outline>
|
||||||
<choice id="default" title="Dynare" description="Dynare Required Files" start_enabled="false" enabled="false" customLocation="/Applications/Dynare/dynare-LOCATION">
|
<choice id="default" title="Dynare" description="Dynare Required Files" start_enabled="false" enabled="false" customLocation="/Applications/Dynare/LOCATION">
|
||||||
<pkg-ref id="org.dynare.VERSION_NO_SPACE" />
|
<pkg-ref id="org.dynare.VERSION_NO_SPACE" />
|
||||||
</choice>
|
</choice>
|
||||||
<pkg-ref id="org.dynare.VERSION_NO_SPACE" version="VERSION_NO_SPACE">dynare-VERSION_NO_SPACE.pkg</pkg-ref>
|
<pkg-ref id="org.dynare.VERSION_NO_SPACE" version="VERSION_NO_SPACE">dynare-VERSION_NO_SPACE.pkg</pkg-ref>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Meson native file for compiling under Homebrew arm64
|
# Meson native file for compiling under Homebrew for arm64 architecture
|
||||||
|
|
||||||
[binaries]
|
[binaries]
|
||||||
cpp = '/opt/homebrew/bin/g++-13'
|
cpp = '/opt/homebrew/bin/g++-13'
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Meson native file for compiling under Homebrew / x86_64
|
# Meson native file for compiling under Homebrew for x86_64 architecture
|
||||||
|
|
||||||
[binaries]
|
[binaries]
|
||||||
cpp = '/usr/local/bin/g++-13'
|
cpp = '/usr/local/bin/g++-13'
|
||||||
|
|
Loading…
Reference in New Issue