Skip to content
Snippets Groups Projects
Verified Commit 7eb1959f authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Provisions for MATLAB R2023b

parent 491c8785
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ compilation steps are necessary in that case. ...@@ -14,7 +14,7 @@ compilation steps are necessary in that case.
In order to run Dynare, you need one of the following: 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 6.2.0 to 8.3.0, with the statistics package * GNU Octave, any version ranging from 6.2.0 to 8.3.0, with the statistics package
from `Octave-Forge`_. Note however that the Dynare installer for Windows from `Octave-Forge`_. Note however that the Dynare installer for Windows
requires a more specific version of Octave, as indicated on the download requires a more specific version of Octave, as indicated on the download
......
...@@ -46,7 +46,7 @@ common_meson_opts=(-Dbuild_for=matlab -Dbuildtype=release -Dprefer_static=true - ...@@ -46,7 +46,7 @@ common_meson_opts=(-Dbuild_for=matlab -Dbuildtype=release -Dprefer_static=true -
--native-file scripts/homebrew-native.ini) --native-file scripts/homebrew-native.ini)
# Build for MATLAB ⩾ R2018a # Build for MATLAB ⩾ R2018a
meson setup "${common_meson_opts[@]}" -Dmatlab_path=/Applications/MATLAB_R2022b.app build-matlab meson setup "${common_meson_opts[@]}" -Dmatlab_path=/Applications/x86_64/MATLAB_R2023b.app build-matlab
meson compile -v -C build-matlab meson compile -v -C build-matlab
# Build for MATLAB < R2018a # Build for MATLAB < R2018a
...@@ -91,7 +91,7 @@ PKGFILES="$ROOTDIR"/macOS/pkg/"$NAME" ...@@ -91,7 +91,7 @@ PKGFILES="$ROOTDIR"/macOS/pkg/"$NAME"
mkdir -p \ mkdir -p \
"$PKGFILES"/preprocessor \ "$PKGFILES"/preprocessor \
"$PKGFILES"/mex/matlab/maci64-8.3-9.3 \ "$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 \ "$PKGFILES"/doc \
"$PKGFILES"/scripts \ "$PKGFILES"/scripts \
"$PKGFILES"/contrib/ms-sbvar/TZcode "$PKGFILES"/contrib/ms-sbvar/TZcode
...@@ -111,7 +111,7 @@ cp -p "$ROOTDIR"/build-matlab/preprocessor/src/dynare-preprocessor "$PKGFILES" ...@@ -111,7 +111,7 @@ cp -p "$ROOTDIR"/build-matlab/preprocessor/src/dynare-preprocessor "$PKGFILES"
mkdir -p "$PKGFILES"/matlab/preprocessor64 mkdir -p "$PKGFILES"/matlab/preprocessor64
ln -sf ../../preprocessor/dynare-preprocessor "$PKGFILES"/matlab/preprocessor64/dynare_m ln -sf ../../preprocessor/dynare-preprocessor "$PKGFILES"/matlab/preprocessor64/dynare_m
cp -L "$ROOTDIR"/build-matlab/*.mexmaci64 "$PKGFILES"/mex/matlab/maci64-9.4-9.14 cp -L "$ROOTDIR"/build-matlab/*.mexmaci64 "$PKGFILES"/mex/matlab/maci64-9.4-23.2
cp -L "$ROOTDIR"/build-old-matlab/*.mexmaci64 "$PKGFILES"/mex/matlab/maci64-8.3-9.3 cp -L "$ROOTDIR"/build-old-matlab/*.mexmaci64 "$PKGFILES"/mex/matlab/maci64-8.3-9.3
cp -p "$ROOTDIR"/scripts/dynare.el "$PKGFILES"/scripts cp -p "$ROOTDIR"/scripts/dynare.el "$PKGFILES"/scripts
......
...@@ -67,7 +67,7 @@ else ...@@ -67,7 +67,7 @@ else
end end
end end
else else
tmp = [dynareroot '../mex/matlab/win64-9.4-9.14/']; tmp = [dynareroot '../mex/matlab/win64-9.4-23.2/'];
if exist(tmp, 'dir') if exist(tmp, 'dir')
mexpath = tmp; mexpath = tmp;
if modifypath if modifypath
...@@ -87,7 +87,7 @@ else ...@@ -87,7 +87,7 @@ else
end end
end end
else else
tmp = [dynareroot '../mex/matlab/maci64-9.4-9.14/']; tmp = [dynareroot '../mex/matlab/maci64-9.4-23.2/'];
if exist(tmp, 'dir') if exist(tmp, 'dir')
mexpath = tmp; mexpath = tmp;
if modifypath if modifypath
...@@ -97,7 +97,7 @@ else ...@@ -97,7 +97,7 @@ else
end end
end end
if strcmp(computer, 'MACA64') if strcmp(computer, 'MACA64')
tmp = [dynareroot '../mex/matlab/maca64-9.14/']; tmp = [dynareroot '../mex/matlab/maca64-23.2/'];
if exist(tmp, 'dir') if exist(tmp, 'dir')
mexpath = tmp; mexpath = tmp;
if modifypath if modifypath
......
...@@ -58,6 +58,9 @@ fi ...@@ -58,6 +58,9 @@ fi
# If needed, convert a release number (Rnnnnx) into a version number (x.y) # If needed, convert a release number (Rnnnnx) into a version number (x.y)
case ${MATLAB_VERSION} in case ${MATLAB_VERSION} in
*2023[bB])
MATLAB_VERSION="23.2"
;;
*2023[aA]) *2023[aA])
MATLAB_VERSION="9.14" MATLAB_VERSION="9.14"
;; ;;
......
...@@ -21,8 +21,8 @@ Note: Dynare comes with an automated uninstaller, which you can run from the ...@@ -21,8 +21,8 @@ Note: Dynare comes with an automated uninstaller, which you can run from the
Using Dynare with MATLAB® Using Dynare with MATLAB®
───────────────────────── ─────────────────────────
Dynare works on top of MATLAB®, any version ranging from 8.3 (R2014a) to 9.14 Dynare works on top of MATLAB®, any version ranging from 8.3 (R2014a) to 23.2
(R2023a). Only 64-bit versions are supported. (R2023b). Only 64-bit versions are supported.
To use Dynare, you just have to add the ‘matlab’ subdirectory of your Dynare 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: installation to MATLAB® path. You have two options for doing that:
......
...@@ -130,8 +130,8 @@ mkdir -p "$ZIPDIR"/contrib/jsonlab ...@@ -130,8 +130,8 @@ mkdir -p "$ZIPDIR"/contrib/jsonlab
cp -pr contrib/jsonlab/* "$ZIPDIR"/contrib/jsonlab cp -pr contrib/jsonlab/* "$ZIPDIR"/contrib/jsonlab
mkdir -p "$ZIPDIR"/mex/matlab/win64-8.3-9.3 mkdir -p "$ZIPDIR"/mex/matlab/win64-8.3-9.3
cp -p build-win-old-matlab/*.mexw64 "$ZIPDIR"/mex/matlab/win64-8.3-9.3 cp -p build-win-old-matlab/*.mexw64 "$ZIPDIR"/mex/matlab/win64-8.3-9.3
mkdir -p "$ZIPDIR"/mex/matlab/win64-9.4-9.14 mkdir -p "$ZIPDIR"/mex/matlab/win64-9.4-23.2
cp -p build-win-matlab/*.mexw64 "$ZIPDIR"/mex/matlab/win64-9.4-9.14 cp -p build-win-matlab/*.mexw64 "$ZIPDIR"/mex/matlab/win64-9.4-23.2
mkdir -p "$ZIPDIR"/mex/octave/win64 mkdir -p "$ZIPDIR"/mex/octave/win64
cp -p build-win-octave/*.mex "$ZIPDIR"/mex/octave/win64 cp -p build-win-octave/*.mex "$ZIPDIR"/mex/octave/win64
mkdir "$ZIPDIR"/preprocessor mkdir "$ZIPDIR"/preprocessor
......
...@@ -95,8 +95,8 @@ Section "MEX files for MATLAB 64-bit, version 8.3 to 9.3 (R2014a to R2017b)" ...@@ -95,8 +95,8 @@ Section "MEX files for MATLAB 64-bit, version 8.3 to 9.3 (R2014a to R2017b)"
File ..\build-win-old-matlab\*.mexw64 File ..\build-win-old-matlab\*.mexw64
SectionEnd SectionEnd
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.14 (R2018a to R2023a)" Section "MEX files for MATLAB 64-bit, version 9.4 to 23.2 (R2018a to R2023b)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.14 SetOutPath $INSTDIR\mex\matlab\win64-9.4-23.2
File ..\build-win-matlab\*.mexw64 File ..\build-win-matlab\*.mexw64
SectionEnd SectionEnd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment