stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS installer: cosmetical changes

kalman-mex
Willi Mutschler 2023-09-27 12:15:11 +02:00
parent cc9102248c
commit bb3aa0a206
No known key found for this signature in database
GPG Key ID: 91E724BF17A73F6D
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
macOS/build.sh
View File

@ -18,6 +18,7 @@
# along with Dynare. If not, see <https://www.gnu.org/licenses/>.
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

4
macOS/conclusion_template.html
View File

@ -2,7 +2,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Postinstallation Recommendations</title>
<title>Recommendations</title>
<style>
.center-text {
text-align: center;
@ -22,7 +22,7 @@
<body>
<header class="center-text">
<h1>Postinstallation Recommendations</h1>
<h1>Recommendations</h1>
</header>
<main>

2
macOS/distribution_template.xml
View File

@ -12,7 +12,7 @@
<choices-outline>
<line choice="default" />
</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" />
</choice>
<pkg-ref id="org.dynare.VERSION_NO_SPACE" version="VERSION_NO_SPACE">dynare-VERSION_NO_SPACE.pkg</pkg-ref>

2
scripts/homebrew-native-arm64.ini
View File

@ -1,4 +1,4 @@
# Meson native file for compiling under Homebrew arm64
# Meson native file for compiling under Homebrew for arm64 architecture
[binaries]
cpp = '/opt/homebrew/bin/g++-13'

2
scripts/homebrew-native-x86_64.ini
View File

@ -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]
cpp = '/usr/local/bin/g++-13'