From 7afbdf04d9b4e1cf7a936467c69b8118c4c4279d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Fri, 22 Sep 2023 10:49:27 +0200
Subject: [PATCH] Provisions for MATLAB R2023b
(manually cherry picked from commit 7eb1959f66649a44ceee964610bb8ee36b9c7fcc)
---
doc/manual/source/installation-and-configuration.rst | 2 +-
m4/ax_matlab_version.m4 | 3 +++
macOS/build.sh | 8 ++++----
matlab/add_path_to_mex_files.m | 4 ++--
windows/README.txt | 4 ++--
windows/build.sh | 4 ++--
windows/dynare.nsi | 6 +++---
7 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/doc/manual/source/installation-and-configuration.rst b/doc/manual/source/installation-and-configuration.rst
index 9a11f72f98..de6a8fa630 100644
--- a/doc/manual/source/installation-and-configuration.rst
+++ b/doc/manual/source/installation-and-configuration.rst
@@ -14,7 +14,7 @@ compilation steps are necessary in that case.
In order to run Dynare, you need one of the following:
-* MATLAB, any version ranging from 8.3 (R2014a) to 9.14 (R2023a);
+* MATLAB, any version ranging from 8.3 (R2014a) to 23.2 (R2023b);
* GNU Octave, any version ranging from 5.2.0 to 8.3.0, with the statistics
package from `Octave-Forge`_. Note however that the Dynare installer for
Windows requires a more specific version of Octave, as indicated on the
diff --git a/m4/ax_matlab_version.m4 b/m4/ax_matlab_version.m4
index 98f3145620..8c534754da 100644
--- a/m4/ax_matlab_version.m4
+++ b/m4/ax_matlab_version.m4
@@ -44,6 +44,9 @@ fi
if test -n "$MATLAB_VERSION"; then
dnl Convert a release number (Rnnnnx) into a version number (x.y)
case $MATLAB_VERSION in
+ *2023b | *2023B)
+ MATLAB_VERSION="23.2"
+ ;;
*2023a | *2023A)
MATLAB_VERSION="9.14"
;;
diff --git a/macOS/build.sh b/macOS/build.sh
index 2e93578372..0671f52356 100755
--- a/macOS/build.sh
+++ b/macOS/build.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright © 2019-2022 Dynare Team
+# Copyright © 2019-2023 Dynare Team
#
# This file is part of Dynare.
#
@@ -112,7 +112,7 @@ PKGFILES="$ROOTDIR"/macOS/pkg/"$NAME"
mkdir -p \
"$PKGFILES"/preprocessor \
"$PKGFILES"/mex/matlab/maci64-8.3-9.3 \
- "$PKGFILES"/mex/matlab/maci64-9.4-9.14 \
+ "$PKGFILES"/mex/matlab/maci64-9.4-23.2 \
"$PKGFILES"/doc/dynare++ \
"$PKGFILES"/dynare++ \
"$PKGFILES"/scripts \
@@ -174,9 +174,9 @@ make clean
--with-gsl="$LIB64"/gsl \
--with-matio="$LIB64"/matio \
--with-slicot="$LIB64"/Slicot/with-underscore \
- --with-matlab=/Applications/MATLAB_R2022b.app
+ --with-matlab=/Applications/x86_64/MATLAB_R2023b.app
make -j"$NTHREADS"
-cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.14
+cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-23.2
##
diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m
index 2a352d82fc..60cb760eeb 100644
--- a/matlab/add_path_to_mex_files.m
+++ b/matlab/add_path_to_mex_files.m
@@ -60,7 +60,7 @@ else
end
end
else
- tmp = [dynareroot '../mex/matlab/win64-9.4-9.14/'];
+ tmp = [dynareroot '../mex/matlab/win64-9.4-23.2/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
@@ -80,7 +80,7 @@ else
end
end
else
- tmp = [dynareroot '../mex/matlab/maci64-9.4-9.14/'];
+ tmp = [dynareroot '../mex/matlab/maci64-9.4-23.2/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
diff --git a/windows/README.txt b/windows/README.txt
index 8fd9ee7470..df7207bba3 100644
--- a/windows/README.txt
+++ b/windows/README.txt
@@ -21,8 +21,8 @@ Note: Dynare comes with an automated uninstaller, which you can run from the
Using Dynare with MATLAB®
─────────────────────────
-Dynare works on top of MATLAB®, any version ranging from 8.3 (R2014a) to 9.14
-(R2023a). Only 64-bit versions are supported.
+Dynare works on top of MATLAB®, any version ranging from 8.3 (R2014a) to 23.2
+(R2023b). Only 64-bit versions are supported.
To use Dynare, you just have to add the ‘matlab’ subdirectory of your Dynare
installation to MATLAB® path. You have two options for doing that:
diff --git a/windows/build.sh b/windows/build.sh
index 5789cabeb5..f2bc41e700 100755
--- a/windows/build.sh
+++ b/windows/build.sh
@@ -121,8 +121,8 @@ build_windows_matlab_mex_64_b ()
PACKAGE_STRING="dynare $VERSION"
make -j"$NTHREADS" all
x86_64-w64-mingw32-strip -- **/*.mexw64
- mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.14
- mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.14
+ mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-23.2
+ mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-23.2
}
# Create Windows DLL binaries for Octave/MinGW (64bit)
diff --git a/windows/dynare.nsi b/windows/dynare.nsi
index bdc889e770..cb6b11b30c 100644
--- a/windows/dynare.nsi
+++ b/windows/dynare.nsi
@@ -99,9 +99,9 @@ Section "MEX files for MATLAB 64-bit, version 8.3 to 9.3 (R2014a to R2017b)"
File ..\mex\matlab\win64-8.3-9.3\*.mexw64
SectionEnd
-Section "MEX files for MATLAB 64-bit, version 9.4 to 9.14 (R2018a to R2023a)"
- SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.14
- File ..\mex\matlab\win64-9.4-9.14\*.mexw64
+Section "MEX files for MATLAB 64-bit, version 9.4 to 23.2 (R2018a to R2023b)"
+ SetOutPath $INSTDIR\mex\matlab\win64-9.4-23.2
+ File ..\mex\matlab\win64-9.4-23.2\*.mexw64
SectionEnd
Section "MinGW compiler for MATLAB 64-bit"
--
GitLab