Bump minimal MATLAB version requirement to 7.9 (R2009b)
parent
abc8431698
commit
736d43c4e6
|
@ -466,7 +466,7 @@ In order to run Dynare, you need one of the following:
|
||||||
@itemize
|
@itemize
|
||||||
|
|
||||||
@item
|
@item
|
||||||
MATLAB version 7.5 (R2007b) or above (MATLAB R2009b 64-bit for macOS);
|
MATLAB version 7.9 (R2009b) or above;
|
||||||
|
|
||||||
@item
|
@item
|
||||||
GNU Octave version 4.2.1 or above.
|
GNU Octave version 4.2.1 or above.
|
||||||
|
|
|
@ -33,7 +33,7 @@ if isoctave
|
||||||
else
|
else
|
||||||
% Add win32 specific paths for Dynare Windows package
|
% Add win32 specific paths for Dynare Windows package
|
||||||
if strcmp(computer, 'PCWIN')
|
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')
|
if exist(tmp, 'dir')
|
||||||
mexpath = tmp;
|
mexpath = tmp;
|
||||||
if modifypath
|
if modifypath
|
||||||
|
@ -43,16 +43,8 @@ else
|
||||||
end
|
end
|
||||||
% Add win64 specific paths for Dynare Windows package
|
% Add win64 specific paths for Dynare Windows package
|
||||||
if strcmp(computer, 'PCWIN64')
|
if strcmp(computer, 'PCWIN64')
|
||||||
if matlab_ver_less_than('7.8')
|
if matlab_ver_less_than('9.4')
|
||||||
tmp = [dynareroot '../mex/matlab/win64-7.5-7.7/'];
|
tmp = [dynareroot '../mex/matlab/win64-7.9-9.3/'];
|
||||||
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 exist(tmp, 'dir')
|
if exist(tmp, 'dir')
|
||||||
mexpath = tmp;
|
mexpath = tmp;
|
||||||
if modifypath
|
if modifypath
|
||||||
|
|
|
@ -87,9 +87,9 @@ if isoctave
|
||||||
skipline()
|
skipline()
|
||||||
end
|
end
|
||||||
else
|
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()
|
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()
|
skipline()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -34,7 +34,7 @@ if test "x$ax_enable_matlab" = "xyes"; then
|
||||||
|
|
||||||
if test "x$ax_matlab_version_ok" = "xyes"; then
|
if test "x$ax_matlab_version_ok" = "xyes"; then
|
||||||
AX_MEXOPTS
|
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
|
fi
|
||||||
|
|
||||||
CFLAGS="$MATLAB_CFLAGS"
|
CFLAGS="$MATLAB_CFLAGS"
|
||||||
|
|
|
@ -88,19 +88,14 @@ SectionEnd
|
||||||
|
|
||||||
SectionGroup "MEX files for MATLAB"
|
SectionGroup "MEX files for MATLAB"
|
||||||
|
|
||||||
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.6 (R2007b to R2015b)"
|
Section "MEX files for MATLAB 32-bit, version 7.9 to 8.6 (R2009b to R2015b)"
|
||||||
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.6
|
SetOutPath $INSTDIR\mex\matlab\win32-7.9-8.6
|
||||||
File ..\mex\matlab\win32-7.5-8.6\*.mexw32
|
File ..\mex\matlab\win32-7.9-8.6\*.mexw32
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
|
Section "MEX files for MATLAB 64-bit, version 7.9 to 9.3 (R2009b to R2017b)"
|
||||||
SetOutPath $INSTDIR\mex\matlab\win64-7.5-7.7
|
SetOutPath $INSTDIR\mex\matlab\win64-7.9-9.3
|
||||||
File ..\mex\matlab\win64-7.5-7.7\*.mexw64
|
File ..\mex\matlab\win64-7.9-9.3\*.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
|
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.5 (R2018a to R2018b)"
|
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.5 (R2018a to R2018b)"
|
||||||
|
|
Loading…
Reference in New Issue