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

Provisions for MATLAB R2021b

pac-components
Sébastien Villemot 2021-09-24 15:44:14 +02:00
parent 24c4e86a95
commit 6669e55b97
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4/ax_matlab_version.m4
View File

@ -44,6 +44,9 @@ fi
if test -n "$MATLAB_VERSION"; then if test -n "$MATLAB_VERSION"; then
dnl Convert a release number (Rnnnnx) into a version number (x.y) dnl Convert a release number (Rnnnnx) into a version number (x.y)
case $MATLAB_VERSION in case $MATLAB_VERSION in
*2021b | *2021B)
MATLAB_VERSION="9.11"
;;
*2021a | *2021A) *2021a | *2021A)
MATLAB_VERSION="9.10" MATLAB_VERSION="9.10"
;; ;;

4
macOS/build.sh
View File

@ -112,7 +112,7 @@ PKGFILES="$ROOTDIR"/macOS/pkg/"$NAME"
mkdir -p \ mkdir -p \
"$PKGFILES"/preprocessor \ "$PKGFILES"/preprocessor \
"$PKGFILES"/mex/matlab/maci64-8.3-9.3 \ "$PKGFILES"/mex/matlab/maci64-8.3-9.3 \
"$PKGFILES"/mex/matlab/maci64-9.4-9.10 \ "$PKGFILES"/mex/matlab/maci64-9.4-9.11 \
"$PKGFILES"/doc/dynare++ \ "$PKGFILES"/doc/dynare++ \
"$PKGFILES"/dynare++ \ "$PKGFILES"/dynare++ \
"$PKGFILES"/scripts \ "$PKGFILES"/scripts \
@ -176,7 +176,7 @@ make clean
--with-slicot="$LIB64"/Slicot/with-underscore \ --with-slicot="$LIB64"/Slicot/with-underscore \
--with-matlab=/Applications/MATLAB_R2019b.app --with-matlab=/Applications/MATLAB_R2019b.app
make -j"$NTHREADS" make -j"$NTHREADS"
cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.10 cp -L "$ROOTDIR"/mex/matlab/* "$PKGFILES"/mex/matlab/maci64-9.4-9.11
## ##

4
matlab/add_path_to_mex_files.m
View File

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

4
windows/build.sh
View File

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

6
windows/dynare.nsi
View File

@ -90,9 +90,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 File ..\mex\matlab\win64-8.3-9.3\*.mexw64
SectionEnd SectionEnd
Section "MEX files for MATLAB 64-bit, version 9.4 to 9.10 (R2018a to R2021a)" Section "MEX files for MATLAB 64-bit, version 9.4 to 9.10 (R2018a to R2021b)"
SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.10 SetOutPath $INSTDIR\mex\matlab\win64-9.4-9.11
File ..\mex\matlab\win64-9.4-9.10\*.mexw64 File ..\mex\matlab\win64-9.4-9.11\*.mexw64
SectionEnd SectionEnd
Section "MinGW compiler for MATLAB 64-bit" Section "MinGW compiler for MATLAB 64-bit"