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

Provisions for MATLAB R2020b 

(cherry picked from commit fa12e5abfc)
time-shift
Sébastien Villemot 2020-09-24 15:43:06 +02:00
parent d8ddd9ef61
commit 2b17a711e0
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -1,7 +1,7 @@
variables:
GIT_SUBMODULE_STRATEGY: recursive
TERM: linux
MATLAB_VERSION: R2020a
MATLAB_VERSION: R2020b
OLD_MATLAB_VERSION: R2014a
# The next stanza creates the version number used for the source tarball and the

5
m4/ax_matlab_version.m4
View File

@ -1,4 +1,4 @@
dnl Copyright © 2009-2019 Dynare Team
dnl Copyright © 2009-2020 Dynare Team
dnl
dnl This file is part of Dynare.
dnl
@ -22,6 +22,9 @@ AC_REQUIRE([AX_MATLAB])
AC_MSG_CHECKING([for MATLAB version])
if test -n "$MATLAB_VERSION"; then
case $MATLAB_VERSION in
*2020b | *2020B)
MATLAB_VERSION="9.9"
;;
*2020a | *2020A)
MATLAB_VERSION="9.8"
;;

4
macOS/build.sh
View File

@ -89,7 +89,7 @@ NAME=dynare-"$VERSION"
PKGFILES="$ROOTDIR"/macOS/pkg/"$NAME"
mkdir -p \
"$PKGFILES"/mex/matlab/maci64-8.3-9.3 \
"$PKGFILES"/mex/matlab/maci64-9.4-9.8 \
"$PKGFILES"/mex/matlab/maci64-9.4-9.9 \
"$PKGFILES"/mex/octave \
"$PKGFILES"/doc/dynare++ \
"$PKGFILES"/dynare++ \
@ -146,7 +146,7 @@ CC=$CC CXX=$CXX ./configure \
--with-slicot="$LIB64"/Slicot/with-underscore \
--with-matlab=/Applications/MATLAB_R2019b.app MATLAB_VERSION=R2019b
make -j"$NTHREADS"
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.8
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.9
##

4
matlab/add_path_to_mex_files.m
View File

@ -60,7 +60,7 @@ else
end
end
else
tmp = [dynareroot '../mex/matlab/win64-9.4-9.8/'];
tmp = [dynareroot '../mex/matlab/win64-9.4-9.9/'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath
@ -80,7 +80,7 @@ else
end
end
else
tmp = [dynareroot '../mex/matlab/maci64-9.4-9.8'];
tmp = [dynareroot '../mex/matlab/maci64-9.4-9.9'];
if exist(tmp, 'dir')
mexpath = tmp;
if modifypath

4
windows/build.sh
View File

@ -122,8 +122,8 @@ build_windows_matlab_mex_64_b ()
PACKAGE_STRING="dynare $VERSION"
make -j"$NTHREADS" all
x86_64-w64-mingw32-strip -- **/*.mexw64
mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.8
mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.8
mkdir -p "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.9
mv -- **/*.mexw64 "$ROOT_DIRECTORY"/../mex/matlab/win64-9.4-9.9
}
# Create Windows DLL binaries for Octave/MinGW (64bit)

6
windows/dynare.nsi
View File

@ -87,9 +87,9 @@ Section "MEX files for MATLAB 64-bit, version 8.3 to 9.3 (R2014a to R2017b)"
File ..\mex\matlab\win64-8.3-9.3\*.mexw64
SectionEnd
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.8 (R2018a to R2020a)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.8
File ..\mex\matlab\win64-9.4-9.8\*.mexw64
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.9 (R2018a to R2020b)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.9
File ..\mex\matlab\win64-9.4-9.9\*.mexw64
SectionEnd
Section "MinGW compiler for MATLAB 64-bit"