diff --git a/doc/manual/source/installation-and-configuration.rst b/doc/manual/source/installation-and-configuration.rst index 9a11f72f9810d1102e568324f9b48c877bc7f752..de6a8fa630dfe512be19dca4802c36831213622d 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 98f31456203b697a470d2105b9980e19a3721f2f..8c534754dab704724df56816237889cf43efd5ad 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 2e93578372a5879ca7ea63c7bd57ee9f9de2d5f2..0671f52356e8b0f0833149e450a1dfeae5e0a62d 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 2a352d82fcd7389869628550c97147718e011111..60cb760eebea47020d64899f7cc9b936859321ee 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 8fd9ee74702bfc169b3d4bfb3103471cc6ded6ac..df7207bba3ddfbcd31a6d6163b3fe3dd6a703e8b 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 5789cabeb5d41ba3e87cf29e8c519972f6d53b47..f2bc41e700d4983621f149ae3b52b2eb9b68bd91 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 bdc889e7706e0cc747b55c663244b504628ad460..cb6b11b30c31761eb0529bbe81d5662e392c11e1 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"