stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump MATLAB version requirement to 7.0

time-shift
Sébastien Villemot 2011-04-27 11:55:16 +02:00
parent f027679045
commit 7b67f40a11
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/dynare.texi
View File

@ -334,7 +334,8 @@ In order to run Dynare, you need at least one of the following:
@itemize @itemize
@item @item
MATLAB version 6.5 or above; note that no toolbox is needed by Dynare, MATLAB version 7.0 (R14) or above; note that no toolbox is needed by
Dynare,
@item @item
GNU Octave version 3.0.0 or above. GNU Octave version 3.0.0 or above.

11
m4/ax_matlab_version.m4
View File

@ -1,4 +1,4 @@
dnl Copyright (C) 2009-2010 Dynare Team dnl Copyright (C) 2009-2011 Dynare Team
dnl dnl
dnl This file is part of Dynare. dnl This file is part of Dynare.
dnl dnl
@ -67,15 +67,6 @@ if test "x$MATLAB_VERSION" != "x"; then
R14 | r14) R14 | r14)
MATLAB_VERSION="7.0.0" MATLAB_VERSION="7.0.0"
;; ;;
*13SP2 | *13sp2)
MATLAB_VERSION="6.5.2"
;;
*13SP1 | *13sp1)
MATLAB_VERSION="6.5.1"
;;
R13 | r13)
MATLAB_VERSION="6.5"
;;
esac esac
AC_MSG_RESULT([${MATLAB_VERSION}]) AC_MSG_RESULT([${MATLAB_VERSION}])
ax_matlab_version_ok="yes" ax_matlab_version_ok="yes"

6
matlab/dynare.m
View File

@ -16,7 +16,7 @@ function dynare(fname, varargin)
% SPECIAL REQUIREMENTS % SPECIAL REQUIREMENTS
% none % none
% Copyright (C) 2001-2010 Dynare Team % Copyright (C) 2001-2011 Dynare Team
% %
% This file is part of Dynare. % This file is part of Dynare.
% %
@ -63,8 +63,8 @@ if exist('OCTAVE_VERSION')
warning('This version of Dynare has only been tested on Octave 3.0.0 and above. Since your Octave version is older than that, Dynare may fail to run, or give unexpected results. Consider upgrading your Octave installation.'); warning('This version of Dynare has only been tested on Octave 3.0.0 and above. Since your Octave version is older than that, Dynare may fail to run, or give unexpected results. Consider upgrading your Octave installation.');
end end
else else
if matlab_ver_less_than('6.5') if matlab_ver_less_than('7.0')
warning('This version of Dynare has only been tested on Matlab 6.5 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.0 (R14) 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.');
end end
end end

2
matlab/dynare_config.m
View File

@ -84,7 +84,7 @@ 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')
if matlab_ver_less_than('7.5') if matlab_ver_less_than('7.5')
mexpath = [dynareroot '../mex/matlab/win32-6.5-7.4']; mexpath = [dynareroot '../mex/matlab/win32-7.0-7.4'];
if exist(mexpath, 'dir') if exist(mexpath, 'dir')
addpath(mexpath) addpath(mexpath)
end end

6
windows/dynare.nsi
View File

@ -75,9 +75,9 @@ SectionEnd
SectionGroup "MEX files for MATLAB" SectionGroup "MEX files for MATLAB"
Section "MEX files for MATLAB 32-bit, version 6.5 to 7.4 (R13 to R2007a)" Section "MEX files for MATLAB 32-bit, version 7.0 to 7.4 (R14 to R2007a)"
SetOutPath $INSTDIR\mex\matlab\win32-6.5-7.4 SetOutPath $INSTDIR\mex\matlab\win32-7.0-7.4
File ..\mex\matlab\win32-6.5-7.4\*.dll File ..\mex\matlab\win32-7.0-7.4\*.dll
SectionEnd SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.5 to 7.12 (R2007b to R2011a)" Section "MEX files for MATLAB 32-bit, version 7.5 to 7.12 (R2007b to R2011a)"