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

Provisions for MATLAB 8.1 (R2013a) 

(cherry picked from commit 3bbdbf83)
parent ef9bbca7
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
m4/ax_matlab_version.m4
+ 4
− 1
View file @ b3fffef2
dnl Copyright (C) 2009-2012 Dynare Team dnl Copyright (C) 2009-2013 Dynare Team
dnl dnl
dnl This file is part of Dynare. dnl This file is part of Dynare.
dnl dnl
...@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB]) ...@@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
AC_MSG_CHECKING([for MATLAB version]) AC_MSG_CHECKING([for MATLAB version])
if test "x$MATLAB_VERSION" != "x"; then if test "x$MATLAB_VERSION" != "x"; then
case $MATLAB_VERSION in case $MATLAB_VERSION in
*2013a | *2013A)
MATLAB_VERSION="8.1"
;;
*2012b | *2012B) *2012b | *2012B)
MATLAB_VERSION="8.0" MATLAB_VERSION="8.0"
;; ;;
......
matlab/dynare_config.m
+ 4
− 4
View file @ b3fffef2
...@@ -15,7 +15,7 @@ function dynareroot = dynare_config(path_to_dynare,verbose) ...@@ -15,7 +15,7 @@ function dynareroot = dynare_config(path_to_dynare,verbose)
% SPECIAL REQUIREMENTS % SPECIAL REQUIREMENTS
% none % none
% Copyright (C) 2001-2012 Dynare Team % Copyright (C) 2001-2013 Dynare Team
% %
% This file is part of Dynare. % This file is part of Dynare.
% %
...@@ -110,7 +110,7 @@ else ...@@ -110,7 +110,7 @@ else
addpath(mexpath) addpath(mexpath)
end end
else else
mexpath = [dynareroot '../mex/matlab/win32-7.5-8.0']; mexpath = [dynareroot '../mex/matlab/win32-7.5-8.1'];
if exist(mexpath, 'dir') if exist(mexpath, 'dir')
addpath(mexpath) addpath(mexpath)
end end
...@@ -135,7 +135,7 @@ else ...@@ -135,7 +135,7 @@ else
addpath(mexpath) addpath(mexpath)
end end
else else
mexpath = [dynareroot '../mex/matlab/win64-7.8-8.0']; mexpath = [dynareroot '../mex/matlab/win64-7.8-8.1'];
if exist(mexpath, 'dir') if exist(mexpath, 'dir')
addpath(mexpath) addpath(mexpath)
end end
...@@ -149,7 +149,7 @@ else ...@@ -149,7 +149,7 @@ else
addpath(mexpath) addpath(mexpath)
end end
else else
mexpath = [dynareroot '../mex/matlab/osx32-7.5-8.0']; mexpath = [dynareroot '../mex/matlab/osx32-7.5-8.1'];
if exist(mexpath, 'dir') if exist(mexpath, 'dir')
addpath(mexpath) addpath(mexpath)
end end
......
osx/createOsxFolderForPkg.sh
+ 12
− 12
View file @ b3fffef2
...@@ -29,7 +29,7 @@ mkdir -p "$INSTALLDIR/contrib/ms-sbvar/TZcode" ...@@ -29,7 +29,7 @@ mkdir -p "$INSTALLDIR/contrib/ms-sbvar/TZcode"
mkdir -p "$INSTALLDIR/mex/octave" mkdir -p "$INSTALLDIR/mex/octave"
mkdir -p "$INSTALLDIR/mex/matlab/osx64" mkdir -p "$INSTALLDIR/mex/matlab/osx64"
mkdir "$INSTALLDIR/mex/matlab/osx32-7.4" mkdir "$INSTALLDIR/mex/matlab/osx32-7.4"
mkdir "$INSTALLDIR/mex/matlab/osx32-7.5-8.0" mkdir "$INSTALLDIR/mex/matlab/osx32-7.5-8.1"
# top level # top level
...@@ -122,17 +122,17 @@ cd $TOP_DYN_DIR/mex/build/matlab ...@@ -122,17 +122,17 @@ cd $TOP_DYN_DIR/mex/build/matlab
make make
# Matlab # Matlab
cp $TOP_DYN_DIR/mex/build/matlab/block_kalman_filter/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/block_kalman_filter/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/bytecode/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/bytecode/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/dynare_simul_/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/dynare_simul_/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/gensylv/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/gensylv/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/k_order_perturbation/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/k_order_perturbation/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/kalman_steady_state/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/kalman_steady_state/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/kronecker/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/kronecker/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/local_state_space_iterations/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/local_state_space_iterations/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/mjdgges/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/mjdgges/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/ms_sbvar/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/ms_sbvar/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
cp $TOP_DYN_DIR/mex/build/matlab/sobol/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.0 cp $TOP_DYN_DIR/mex/build/matlab/sobol/*.mexmaci $INSTALLDIR/mex/matlab/osx32-7.5-8.1
##################################### #####################################
......
windows/dynare.nsi
+ 6
− 6
View file @ b3fffef2
...@@ -93,9 +93,9 @@ Section "MEX files for MATLAB 32-bit, version 7.3 to 7.4 (R2006b to R2007a)" ...@@ -93,9 +93,9 @@ Section "MEX files for MATLAB 32-bit, version 7.3 to 7.4 (R2006b to R2007a)"
File ..\mex\matlab\win32-7.3-7.4\*.mexw32 File ..\mex\matlab\win32-7.3-7.4\*.mexw32
SectionEnd SectionEnd
Section "MEX files for MATLAB 32-bit, version 7.5 to 8.0 (R2007b to R2012b)" Section "MEX files for MATLAB 32-bit, version 7.5 to 8.1 (R2007b to R2013a)"
SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.0 SetOutPath $INSTDIR\mex\matlab\win32-7.5-8.1
File ..\mex\matlab\win32-7.5-8.0\*.mexw32 File ..\mex\matlab\win32-7.5-8.1\*.mexw32
SectionEnd SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.2 (R2006a)" Section "MEX files for MATLAB 64-bit, version 7.2 (R2006a)"
...@@ -113,9 +113,9 @@ Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)" ...@@ -113,9 +113,9 @@ Section "MEX files for MATLAB 64-bit, version 7.5 to 7.7 (R2007b to R2008b)"
File ..\mex\matlab\win64-7.5-7.7\*.mexw64 File ..\mex\matlab\win64-7.5-7.7\*.mexw64
SectionEnd SectionEnd
Section "MEX files for MATLAB 64-bit, version 7.8 to 8.0 (R2009a to R2012b)" Section "MEX files for MATLAB 64-bit, version 7.8 to 8.1 (R2009a to R2013a)"
SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.0 SetOutPath $INSTDIR\mex\matlab\win64-7.8-8.1
File ..\mex\matlab\win64-7.8-8.0\*.mexw64 File ..\mex\matlab\win64-7.8-8.1\*.mexw64
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment