diff --git a/doc/dynare.texi b/doc/dynare.texi index 356e4d280d73a317a1dc8ff953169d1aca2b132d..3e308a9073abf2f5ccc7ff5ab8323e567a3445e3 100644 --- a/doc/dynare.texi +++ b/doc/dynare.texi @@ -466,7 +466,7 @@ In order to run Dynare, you need one of the following: @itemize @item -MATLAB version 7.5 (R2007b) or above (MATLAB R2009b 64-bit for macOS); +MATLAB version 7.9 (R2009b) or above; @item GNU Octave version 4.2.1 or above. diff --git a/matlab/add_path_to_mex_files.m b/matlab/add_path_to_mex_files.m index f40257cbf89bd747d4fde984ea6c97fe9b400c28..b83166d1a1fb92d738d958912bb40a050f7a3426 100644 --- a/matlab/add_path_to_mex_files.m +++ b/matlab/add_path_to_mex_files.m @@ -33,7 +33,7 @@ if isoctave else % Add win32 specific paths for Dynare Windows package if strcmp(computer, 'PCWIN') - tmp = [dynareroot '../mex/matlab/win32-7.5-8.6/']; + tmp = [dynareroot '../mex/matlab/win32-7.9-8.6/']; if exist(tmp, 'dir') mexpath = tmp; if modifypath @@ -43,16 +43,8 @@ else end % Add win64 specific paths for Dynare Windows package if strcmp(computer, 'PCWIN64') - if matlab_ver_less_than('7.8') - tmp = [dynareroot '../mex/matlab/win64-7.5-7.7/']; - if exist(tmp, 'dir') - mexpath = tmp; - if modifypath - addpath(mexpath); - end - end - elseif matlab_ver_less_than('9.4') - tmp = [dynareroot '../mex/matlab/win64-7.8-9.3/']; + if matlab_ver_less_than('9.4') + tmp = [dynareroot '../mex/matlab/win64-7.9-9.3/']; if exist(tmp, 'dir') mexpath = tmp; if modifypath diff --git a/matlab/dynare.m b/matlab/dynare.m index 4e347f1a0b97012fff96d7b51231f4b702bdb784..fa38088034ad18c854ceac8677d451e0f47b7220 100644 --- a/matlab/dynare.m +++ b/matlab/dynare.m @@ -87,9 +87,9 @@ if isoctave skipline() end else - if matlab_ver_less_than('7.5') % Should match the test in mex/build/matlab/configure.ac + if matlab_ver_less_than('7.9') % Should match the test in mex/build/matlab/configure.ac skipline() - warning('This version of Dynare has only been tested on MATLAB 7.5 (R2007b) and above. Since your MATLAB version is older than that, Dynare may fail to run, or give unexpected results. Consider upgrading your MATLAB installation, or switch to Octave.'); + warning('This version of Dynare has only been tested on MATLAB 7.9 (R2009b) and above. Since your MATLAB version is older than that, Dynare may fail to run, or give unexpected results. Consider upgrading your MATLAB installation, or switch to Octave.'); skipline() end end diff --git a/mex/build/matlab/configure.ac b/mex/build/matlab/configure.ac index 3999c6e8bd64bac3108a88b8cb6288aff206c8aa..b95039d758a91ff5cce4edb38cebd83f89aead37 100644 --- a/mex/build/matlab/configure.ac +++ b/mex/build/matlab/configure.ac @@ -34,7 +34,7 @@ if test "x$ax_enable_matlab" = "xyes"; then if test "x$ax_matlab_version_ok" = "xyes"; then AX_MEXOPTS - AX_COMPARE_VERSION([$MATLAB_VERSION], [lt], [7.5], [AC_MSG_ERROR([Your MATLAB is too old, please upgrade to version 7.5 (R2007b) at least.])]) + AX_COMPARE_VERSION([$MATLAB_VERSION], [lt], [7.9], [AC_MSG_ERROR([Your MATLAB is too old, please upgrade to version 7.9 (R2009b) at least.])]) fi CFLAGS="$MATLAB_CFLAGS" diff --git a/windows/dynare.nsi b/windows/dynare.nsi index 7ad7126b7bd08b428ee10476b2512d0b383fe18b..aee97f89fcc443315baa4b7641c25bbfc91e6721 100644 --- a/windows/dynare.nsi +++ b/windows/dynare.nsi @@ -88,19 +88,14 @@ SectionEnd SectionGroup "MEX files for MATLAB" -Section "MEX files for MATLAB 32-bit, version 7.5 to 8.6 (R2007b to R2015b)" - SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.6 - File ..\mex\matlab\win32-7.5-8.6\*.mexw32 +Section "MEX files for MATLAB 32-bit, version 7.9 to 8.6 (R2009b to R2015b)" + SetOutPath $INSTDIR\mex\matlab\win32-7.9-8.6 + File ..\mex\matlab\win32-7.9-8.6\*.mexw32 SectionEnd -Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)" - SetOutPath $INSTDIR\mex\matlab\win64-7.5-7.7 - File ..\mex\matlab\win64-7.5-7.7\*.mexw64 -SectionEnd - -Section "MEX files for MATLAB 64-bit, version 7.8 to 9.3 (R2009a to R2017b)" - SetOutPath $INSTDIR\mex\matlab\win64-7.8-9.3 - File ..\mex\matlab\win64-7.8-9.3\*.mexw64 +Section "MEX files for MATLAB 64-bit, version 7.9 to 9.3 (R2009b to R2017b)" + SetOutPath $INSTDIR\mex\matlab\win64-7.9-9.3 + File ..\mex\matlab\win64-7.9-9.3\*.mexw64 SectionEnd Section "MEX files for MATLAB 64-bit, version 9.4 to 9.5 (R2018a to R2018b)"